Some cosmetical improvements