Neaten code
Moved sender to front of message
Fixed typo's