Resolve first run bug
Add proper indentation on eventKitController