Cleanup. (+1 squashed commit)
Squashed commits:
[6f29105] Cleanup.
Max length allocation for keys. (+1 squashed commit)
Squashed commits:
[595ec61] Max length for keys.