cleanup and changes