minor cleanup of samples