Cleaned up specification