minor refactoring :)