Rearranged into class