A little bit of cleanup of comments and layout