Added lots of formatting