One step ahead, refactoring always feels good