Neaten with comments