I am having trouble figuring out what, if anything, you changed with these methods other than reordering them.  Please put back in original order and make a commit that is clearer.