Fixed variable assignment, plus tidyup