some cosmetical changes were made