Change the expression to a single line, refactor we're slowly making throughout the file.