Addressing comments and jsbeautify