code clean up across work/world