Simplify variables

Replaces #10