regression working good and a bit of cleaning