Let's stay within the column limits
Tweaks here and there