General refactor of code base (not GUI)

Look through the code base for opportunities to refactor and make new related issues for these.