removed helper, added enums to storm class