* tiny code improvements