tidy up and add in a feature spec