JAMES-3148 Readability enhencements: method extractions and renames
4 files changed