code improvements
n/a