[TASK] Clean up code of available services report