normalize code a bit, delete unused comments for options, since it slowdown parse.