Some more cleanup, letting every gamestate do something on init