ameliorate any code-smells!