WIP: better variable names
Some nitpicks