(EDITOR) Small var cleanup
(EDITOR) WIP