Some cleanup of comments and spacing