refactor(serial): move some things around