refac a bit
improve signal strength monitor