Rename and extract methods