more refactoring
pulled out objectify