Added a default constructor and cleaned up others