Hmmm, it looks a bit uncomfortable refactoring.
What was changed?