cleaning up the samples, naming convention