Minor Refactor

Added KeyboardUtil
Removed redundant code
Renamed elements better