Cleaned up sample stuff