Codestyle in previous commit, get rid of commented out code and cross an item off the TODO.txt