Rearranged class variables and case statement.