Add/remove update; begin view/code clean