cosmetic changes: alphabetization, spacing, indentation, type location

Merge of pull request #135