Re order methods to be more readable