Multiple items

Opening PR for Hound feedback
Line is too long. [81/80]