Refactor, simplification