more cleanup -- just going through files and improving them.