Comment/Whitespace cleanup