EMPIREDB-362 more cleanup and beautification
13 files changed