Cleaned up KeyboardListeners so that they do not cause unwanted bugs

Signed-off-by: sjdodge123 <sjdodge123@github.com>