refactor Config slightly
refactor Dispatch
refactor Lock
whitespace s/class/module