Formatting changes; Added EDITOR