Bunch of little best practice refactors