remove debug statements, fix indentation