It should be straigtforward to change, i can just move the bodies of the switch back to the methods they came from (the even handlers) and call the event handlers from this method. The onresume will just call on start since they do the same thing.