Remove comments, fix indentation