Some code cleanup and fixing a minor error.

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | --
| Fixed tickets | --
| License       | MIT
| Doc PR        | --