Refs #44 - Code cleanup