Elliot Shank

The refactoring aparently never stops.