Finally removed eventstate and reformatted a lot

It's beautiful :D