Code cleanup Refs #15