TRIVIAL refactoring, work-in-progress