some minor refactoring around storm samples