small cleanup of STORE module type