Codemaid Cleanup and Reorganize