Refactor - improve readability