Aspect Mining and Refactoring