Bugs should be fixed except moving down on the final line.
Small refactor, large improvement.