Cleaned up the ORM