slight refacotr and bug squashing