Further cleanup and changes