Refactor some string keys and add javadoc.
Move out some hard coded values.