Rearranged functions and variables