Code refactoring pettifoggery

Just a few minor changes.