Rearranged utility functions