* code improvements