Clean up indentation and remove commented code.