Refactoring.
refactor
fixed issue with key click highlighting