Whitespace, getattr()
Remove unused variable
Remove commented code