Remove unnecessary comments and fix indentation