Minor tweaks
Single purpose methods