Conversion to CodeKit