Cleanup and minor updates