Refactoring - second try