Refactored and added some new rule to CodeSharper grammar and visitor.