Made some fixes
Fixed all the formatting for 80 char limit
Merged