More lint warnings gone and simplified some code.