Jeffs refactoring session. he didn't fix much but it was good.