some minor changes (deleted unnecessary comments etc)