cleaned coding style in modules