Refactoring
complete key control and some cleanUp
Refactoring