Pull Changes from CCoffie

Pull CCoffie's cleanup and repair of assigned files.