CodeMaid cleanup