Refs #44 - Code style fixes