Cleaned up the samplings