Constant strings for tokens.

Minor: refactoring, java code conventions