Switch to unified view

a/utils.cpp b/utils.cpp