Issue 399: Removed unnecessary implementation of Serializable interfaces, removed unnecessary transient fields, added proper field initialization