Do code refactoring without changing the functionality