removed ability for Keyboard and cleaned up some code