Minor tweaks. Removing comments.