cleanup/modernize