Sample annotation. Minor refactoring