Tidied up deck spec with some variables