refactoring names
samples