refactoring ;)