Tidy code & comments