Cleanup and Formatting - Final folder