Method rename and code formatting