Merge "Code Cleanup and better Sampler creation method"