Clean up formatting, remove commented code.
Adds solution to #6: 24174150.
Add #7: 104743