refactor

http://pm.tablexi.com/issues/79737