Code Review WMA

Refactored to new module style