small refactoring + create neural service