Mmmh, delicious refactorings