Improve backspace behavior. Clean up