Reorder functions so documentation is consistent