Some cleanup with whitespace and comments