Moving some functionality to utils
Cleanup editor format