docstring fix
moved some stuff around
moved some stuff around