fix inboundfinder.cli and some coding style issues