- better formatting, add missing @override
- combine variables and accessors