- spa => sapphire
- some basic clean up