Minor formatting changes; Changed event sorting