Tweaks
More code tidying...