Little reformatting of the code.