Tidying up some of the refactoring. Moving some methods internal