Clean up boat spec
Refactor boat