Fix #113 Refactored events in excalibur for readability