Rearranging functions for readability.