Tweaks

Just tidying things up.