Cleaning up code at home: particularly writing custom constructors for use where possible instead of default constructors and manual variable assignment later.  Haven't tested this yet so should debug at work.