Slight refactor, features in sample / mean