Cleaned up spec format