Style fixes. FINISHED