Various stylistic and functional updates