Some lines of code are refactored.