diff --git a/doc/CHANGELOG.txt b/doc/CHANGELOG.txt
index 187da11..b14bba7 100644
--- a/doc/CHANGELOG.txt
+++ b/doc/CHANGELOG.txt
@@ -1,3 +1,13 @@
+- renamed OpenIEC61850 to IEC61850bean
+
+- moved from Java 7 to 8
+
+- run scripts support white space in paths
+
+- BdaTimestamp's getters and setters take Instant instead of Date now
+
+- significant code clean up
+
 v1.8.0 22-Mar-2019
 --------------------
 
diff --git a/src/main/java/com/beanit/iec61850bean/BasicDataAttribute.java b/src/main/java/com/beanit/iec61850bean/BasicDataAttribute.java
index 6b10613..2502391 100644
--- a/src/main/java/com/beanit/iec61850bean/BasicDataAttribute.java
+++ b/src/main/java/com/beanit/iec61850bean/BasicDataAttribute.java
@@ -21,21 +21,17 @@ import java.util.List;
 
 public abstract class BasicDataAttribute extends FcModelNode {
 
+  final List<Urcb> chgRcbs;
+  final List<Urcb> dupdRcbs;
   BasicDataAttribute mirror;
-
   /** attribute value type */
   BdaType basicType = null;
-
   /** short address, can be used by SCSM and for local data mapping */
   String sAddr = null;
-
   boolean dchg;
   boolean qchg;
   boolean dupd;
 
-  final List<Urcb> chgRcbs;
-  final List<Urcb> dupdRcbs;
-
   protected BasicDataAttribute(
       ObjectReference objectReference, Fc fc, String sAddr, boolean dchg, boolean dupd) {
     this.objectReference = objectReference;
diff --git a/src/main/java/com/beanit/iec61850bean/ServerSap.java b/src/main/java/com/beanit/iec61850bean/ServerSap.java
index 9ca5c7a..722de00 100644
--- a/src/main/java/com/beanit/iec61850bean/ServerSap.java
+++ b/src/main/java/com/beanit/iec61850bean/ServerSap.java
@@ -37,12 +37,12 @@ public final class ServerSap {
   static final int MINIMUM_MMS_PDU_SIZE = 64;
   private static final int MAXIMUM_MMS_PDU_SIZE = 65000;
   final ServerModel serverModel;
+  final List<ServerAssociation> associations = new ArrayList<>();
   byte[] servicesSupportedCalled =
       new byte[] {(byte) 0xee, 0x1c, 0, 0, 0x04, 0x08, 0, 0, 0x79, (byte) 0xef, 0x18};
   byte[] cbbBitString = {(byte) 0xfb, 0x00};
   ServerEventListener serverEventListener;
   Timer timer;
-  final List<ServerAssociation> associations = new ArrayList<>();
   boolean listening = false;
   private int proposedMaxMmsPduSize = 65000;
   private int proposedMaxServOutstandingCalling = 5;