Tidy things up by grouping var declarations