Cleaned up the spec