Code cleaning, Current sample halfway, and optimize Adding sets to the container