Code: Cleanup and formatting