Refactor samples somewhat