Fixing up code readability and some typos; refs #7