some cleanup and update