Removed empty message element from datastream.
Corrected some coding standards.