Revert "Revert "get method refactoring""

This reverts commit 7574a6f8988f316340efbf1a398d296abab06852.