formatting improved, empty spaces removed