removing unused code
fixing parens on methods with params
fixing indentation
more refactoring on indentation