Refactor for better method, variable names