Cleaned up Machine.