removing some whitespace and comments