minor refacotrings