Refactor getting property irder