Code Cleanup Part 3