Tidied up home page spec with some variables