#68 - refactoring