Multiple items

Opening PR for Hound feedback
`end` at 40, 18 is not aligned with `if` at 36, 19