Tidy Up

See individual commits for details

- [x] G
- [x] vic