refactor IT's
move some stuff