Refactor for better method, variable names -- one more change