Scaffold torrent model
Scaffold layout clean-up