CodeMaid suggested cleanup