Just some moving around of methods to make things a little easier to read.