minor cleanup and changes