Slight module invocation refactor