The code was refactored