-code improvements