Minor tweaks :)