Clean / improve / update code