Slimming refactor