Minor refactors while at school