removed useless comments. reordered some items