Cleaned up settings, events