Move casing to variables, add tertiary