Applied code formatting (from Pentaho-Coding-Standards).   Fixed serialization warnings.