Refactoring, better common points finding