Fix various stylistic errors