Cleaned up the OS X version.