simple refactoring =)