clean some code (update stuff on execution)