refactor more stuff into Utilities