Refs #40 - coding standards