Cleaned up epiceditor code a bit