Clean Up and some consitency changes