Cleanup of some commented code and whitespace