Tidy up - unneeded vars & comments