Changed the order of the member variables.
Taking a more object oriented approach.