Refactor and variable names.