Standardized the module variable declarations