Preparing the Base - Quick clean up