Cleaned up the object model a little bit