Additional cleanup and changes