Removed dead code, added grammar.