proper cursor placement on special keywords
code cleanup