Neaten up and commenting