grammer refactored.