Split some things outs