Tidied up "clearos lint" violations