Addition (minor) clean up of the code.