Refactored Objects to use constructors