Move parameters from modules to subroutines