Code cleanup icxdisplay
Merge branch 'master' of https://github.com/puffball/freebeer
Code cleanup icxdisplay continued