Rearranging code to have all private methods in one group.