Refactoring using stl features.