Fix bug of next
Better formatting, remove unnecessary comment
pass all tests!