Minor Code "optimization"

Clarified TODOs
Reduced compile warnings
Also serves as a test to see if my new Eclipse synced with Git
correctly.