Whitespace cleanup
Add stripComments