Tidied spec file