Cleaning up code, fixing timing on event display