Style fixes and improve comments