Polishing up some of the Captain lines