Rearranged definitions for clarity