Code clean up.. minor fix for binding issue