indentation
cleaned up some code