Added Key bindings and cleaned up project