EMPIREDB-362 API cleanup and beautification
7 files changed