The latest and greatest refactord code