code cleanup
current grammar