code clean up, indentation, getting rid of miscallaneous lines