Update and fix minor style problems