Cleaned up the objects a bit