Code Cleanup

Removed old commented code and fixed some capitalization issues.