Refactor bindigs
