DF Some styling changes.
DF Fixed some checkstyle problems.
DF Fixed some checkstyle problems.
DF Moved dictionary definition to correct plugin.