Code Cleanup...