Its a work in progress. But its getting cleaner then before!