minor code improvements in order to fix all lint warnings