Correct whitespaces in code

This makes the code a bit cleaner.
Remove commented block of code

This code might have been used only for some debugging.
Improve output message when rewind begins

Patch by Samrat-Revagade