refactoring to retrato package