First round of basic Ruby style cleanup in cdp