* code improvement