Minor tweaks to read things easier