Code simplification (less confused abstraction)