Style fixes, working version