- slight code refacto