Removed duplicated code and added spec for crew.