Some cosmetical changes to the code.