more cleanup, fix indentation