refactoring.... :)