Refs #85 - Code standards