more refactor
refactor mooaarrr