Preparing the Base - Quick clean up

Complete and Continue