Added additional constructors to Object, cleaned up formatting