Source Code Cleanup