Some clean up. And upgrade to angular-ui-sortable.