Minor coding style changes according to the comments by Nori.