Minor Cleanup
Cleaned up public interface to KeyHandler