Style fixes, cleanup