Feature/code clean up

Addresses 3 small issues:
- #372 
- #407
- #408