more cleaning up, main consistent style.