Minor refactors while sitting in class.
- RMUR