Improved formatting and added Clean Up