Minor formatting changes
Add hoppers