misc refact