Code Cleanup & Formatting