Fixed serial messages.  Cleaned up some redundant code