Cleaned up whitespaces and tweaked some comments to reflect current version.