Refs #62 - Fix code style issues