cleaned up some whitespace and comments