A few style and functional tweaks