corrections in example properties
minor refacrotization
minor refactorization