- Clean up
- Disallowing copy&assign ctor
- Cosmetics