A few random suggested refactorings