Some cleanup and minor updates