Refacturating and cleaing up.