Some cosmetical changes