CodeMaid cleanup on new code