little bit cleanup
better bound keys