Cleanup
Fix vars editing