Refactored code after feedback
Renamed module