additional clean up for the enter key and logging