Cleaning up comments and some tweaking.