Fix module code per recommendations