* UPDATE code clean up