#20 cleanup some static analysis issues