Formatting adjusted