Cleanup and minor tune