Make each do/end usage more consistent.
Remove unused files.
Fix missing blanks in about hashes.