Refactoring weird variable names