Restructure checks and remove events to handle multiple checks