a bit of cosmetical improovments