Super slight style cleanup - some refactoring for efficiency potentially to come