formating and minor changes