Little refactors