remove cruft; fix indentation