UPDATE, clean code