Cleaned up some inefficencies in the domain objects.