Update code style, remove that = this in favor of bind