Cleanup method naming