Refactored module namespace
Fixed module indentation