A little improvement / bug fixing for "Module pattern"