#1 - Minor refactor tweaks