light refactoring ;)