Refactor getty