Four small comments. Some cleanup along the lines.
This will create a new commit in order to revert the existing changes.
