mgedmin/refactor

Name: refactor