[Feature/STORM/387] Changes per code review