Clean some stuff up, move some stuff around