Rearranged grammar rules
Cleanup