Ok, done! And I've kept things consistent by arranging those variables the same way in two other places within this file.