Moved salt to main config.ini + code cleanup