All code was refactored.