Fixed comments (no preemptive stuff)/Style