* Refactoring of classes based on "get nearest" politic