Minor cosmetical changes