Minor code tidying as I refamiliarize myself with the project