Code styling improvements and bigger key_length