Minor tweaks to make it more pinteresting