#master - refactoring