Indent using spaces.
Updated the header comments.
Clean up tails.