method name cleanup