remove of comments and ajusts