removed lint warnings