Revert "status bar: code clean up"

This reverts commit 3c9936b401b1216c3c083a37319a2b9ffbdf2ca2.