Removed some comments and blank lines to make it easy to merge with backchatio's branch.