cleanup and additional cursor movement class