little cleanup + update