Tried out CodeMaid on solution, if it's any good I'll keep it