Minor stylistic fixes following up the previous commit