Cleanup and minor syntaxt error fix.