A few style changes and other minor fixes