Modified a few lines
Updated formating