Refactor to make the code show a little bitter on GitHub, fix a couple comments.