Code formating and other changes