Remove commented out code, fix indentation