Remove odd saving and restoring of cursor positions behaviour, code is now cleaner