Cleanup of init
Moved stuff from settings to definitions