my own OCD-based changes

Initial changes to satisfy my own compulsions from the original
repository.