Update cdUtils, begin fixing up the styling