Code and grammar review

Implemented tab indentation.