CleanUp and formatting