Small cleanup of comments and constants