Removed accidental tracking of a tmp.cpp file.
Modified constructors to be more descriptive.