A little reformatting of the code.