better rest binding
code clean up