Rearranged some methods to make it more OO