Tidied up the labspec