Cleaning up code style; refs #7