Minor tweaks and organisation