Trying to beautify the storm config - try 1