fix indention
even more indention fixes
more cleanup