Make variable name more explicit
Tidy up CSS order