Clean up code a bit
Merge remote-tracking branch 'origin/master' into joe
Rename EmoEventGetter to main