EMPIREDB-304
code optimization
6 files changed