Some refactoring changes for stormlight : STORM-80