* follow and track did not report proper pid on startup
* tiny cosmetic changes in order to prepare code aggreggration