cleaned up code refs #12