Some minor refactoring (well…)