some cleanup and namefix