removed unnecessary vars, changed module name