Refactoring Module Parsing looking at arguments