partially fixed lint warnings