Block a few more events, reformat code