fix indentation & fix crash on startup