Whitespace
Use discard_remove_listener instead of remove_ in some places
Use discard_change_listener instead of remove_ in some places