Refactor: change variable name and remove white space