minor refactoring and formatting changes.
add userInfo dictionary to keyboard notification, #287