Refactoring. Nothing special.