Minor improvement to module