Initial CodeMaid cleanup
Various changes