Tidy up
Redstone torch conversion was the wrong way round