Cleaned up some formatting, better handling of parseing messages