remove extra constants
trim and idiomize
2.6 does not this dict comprehension
Merge branch 'feature/tabular' into feature/move_plugin_tests