Minor code cleanup and updated Readme comments.