Customizable keys
Removing unnecessary code