Some refactoring.  Updated read me.