refact a few