Automating Extract Class Refactoring: an Improved Method and its Evaluation