Code cleanups to make it ready for opensuse-web help