Improved editor, code cleanup, prettier