code cleanup.  Added static name generator (not really needed but nice to have.