Tidied up the rack definitions, should be easier to read now.