Cleaned up to get Travis going.