Cleaned up captain class