Code Cleanup Part 2