Code improvements, moved to Bind.