removed some whitespace and comments