refactor to what I -think- they meant