minor changes.

Code tidy up