Fixing YUI issue, cleaning up