Remove debug statements, goto shorthand if