Very minor refactoring
oups, fixed a bug that I introduced in my refactorization