Add comment. Fix typo. White space
Add comment for maybe obsolete code (and somewhat wrong conditional)