[module] Minor code cleanup