Small refactors, increase consistency