Cleaning up spec