Refactor without breaking anything