Cleanup methods module
Merge remote-tracking branch 'origin/refactor'