improve storm topology

Signed-off-by: Laurent K. <lau@landbit.co.uk>