Fixed all the formatting