minor updates.  cleaner code