Minor code simplifications
`Maintainer` now shown in `-Ai` output - closes #90