Tidied the Specs further