outdated comments, whitespace and typo fixed.