minor changes + codeMaid cleanup