Code cleanup/smaller adjustments. Thanks @tobiassjosten.