Cleaned up the sample some