Refactor, rework, improve