rename methods and clean