major style changes.  much cleaner.