Code cleanup, added Y! copy right info