More refactoring - camelCase things and unified another code dup