Optimizations on module response
minor refactoring