trivial cleanup

- Use module->class hierarchy
- Avoid multiline {} blocks