Style fixes, no more comments