diff --git a/pmapper.py b/pmapper.py
index 05facec..ab21384 100755
--- a/pmapper.py
+++ b/pmapper.py
@@ -4,7 +4,8 @@
 Wrap around principalmapper/__main__.py
 """
 
-#  Copyright NCC Group (c) 2019. This file is part of Principal Mapper.
+
+#  Copyright (c) NCC Group and Erik Steringer 2019. This file is part of Principal Mapper.
 #
 #      Principal Mapper is free software: you can redistribute it and/or modify
 #      it under the terms of the GNU Affero General Public License as published by
@@ -18,19 +19,6 @@
 #
 #      You should have received a copy of the GNU Affero General Public License
 #      along with Principal Mapper.  If not, see <https://www.gnu.org/licenses/>.
-#
-#      Principal Mapper is free software: you can redistribute it and/or modify
-#      it under the terms of the GNU Affero General Public License as published by
-#      the Free Software Foundation, either version 3 of the License, or
-#      (at your option) any later version.
-#
-#      Principal Mapper is distributed in the hope that it will be useful,
-#      but WITHOUT ANY WARRANTY; without even the implied warranty of
-#      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#      GNU General Public License for more details.
-#
-#      You should have received a copy of the GNU Affero General Public License
-#      along with Foobar.  If not, see <https://www.gnu.org/licenses/>.
 
 import sys
 
diff --git a/principalmapper/__init__.py b/principalmapper/__init__.py
index 1d2f73f..c2baa22 100644
--- a/principalmapper/__init__.py
+++ b/principalmapper/__init__.py
@@ -1,6 +1,6 @@
 """Module principalmapper: Python code to dissect and analyze an AWS account's use of IAM"""
 
-#  Copyright NCC Group (c) 2019. This file is part of Principal Mapper.
+#  Copyright (c) NCC Group and Erik Steringer 2019. This file is part of Principal Mapper.
 #
 #      Principal Mapper is free software: you can redistribute it and/or modify
 #      it under the terms of the GNU Affero General Public License as published by
@@ -14,18 +14,5 @@
 #
 #      You should have received a copy of the GNU Affero General Public License
 #      along with Principal Mapper.  If not, see <https://www.gnu.org/licenses/>.
-#
-#      Principal Mapper is free software: you can redistribute it and/or modify
-#      it under the terms of the GNU Affero General Public License as published by
-#      the Free Software Foundation, either version 3 of the License, or
-#      (at your option) any later version.
-#
-#      Principal Mapper is distributed in the hope that it will be useful,
-#      but WITHOUT ANY WARRANTY; without even the implied warranty of
-#      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#      GNU General Public License for more details.
-#
-#      You should have received a copy of the GNU Affero General Public License
-#      along with Foobar.  If not, see <https://www.gnu.org/licenses/>.
 
 __version__ = '1.0.0'
diff --git a/principalmapper/__main__.py b/principalmapper/__main__.py
index f7876f9..d899e32 100644
--- a/principalmapper/__main__.py
+++ b/principalmapper/__main__.py
@@ -2,7 +2,7 @@
 Provides a command-line interface to use the principalmapper library
 """
 
-#  Copyright NCC Group (c) 2019. This file is part of Principal Mapper.
+#  Copyright (c) NCC Group and Erik Steringer 2019. This file is part of Principal Mapper.
 #
 #      Principal Mapper is free software: you can redistribute it and/or modify
 #      it under the terms of the GNU Affero General Public License as published by
@@ -16,19 +16,6 @@
 #
 #      You should have received a copy of the GNU Affero General Public License
 #      along with Principal Mapper.  If not, see <https://www.gnu.org/licenses/>.
-#
-#      Principal Mapper is free software: you can redistribute it and/or modify
-#      it under the terms of the GNU Affero General Public License as published by
-#      the Free Software Foundation, either version 3 of the License, or
-#      (at your option) any later version.
-#
-#      Principal Mapper is distributed in the hope that it will be useful,
-#      but WITHOUT ANY WARRANTY; without even the implied warranty of
-#      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#      GNU General Public License for more details.
-#
-#      You should have received a copy of the GNU Affero General Public License
-#      along with Foobar.  If not, see <https://www.gnu.org/licenses/>.
 
 import argparse
 import os
diff --git a/principalmapper/analysis/__init__.py b/principalmapper/analysis/__init__.py
index 250589f..7d99db2 100644
--- a/principalmapper/analysis/__init__.py
+++ b/principalmapper/analysis/__init__.py
@@ -1,4 +1,4 @@
-#  Copyright NCC Group (c) 2019. This file is part of Principal Mapper.
+#  Copyright (c) NCC Group and Erik Steringer 2019. This file is part of Principal Mapper.
 #
 #      Principal Mapper is free software: you can redistribute it and/or modify
 #      it under the terms of the GNU Affero General Public License as published by
@@ -12,17 +12,6 @@
 #
 #      You should have received a copy of the GNU Affero General Public License
 #      along with Principal Mapper.  If not, see <https://www.gnu.org/licenses/>.
-#
-#      Principal Mapper is free software: you can redistribute it and/or modify
-#      it under the terms of the GNU Affero General Public License as published by
-#      the Free Software Foundation, either version 3 of the License, or
-#      (at your option) any later version.
-#
-#      Principal Mapper is distributed in the hope that it will be useful,
-#      but WITHOUT ANY WARRANTY; without even the implied warranty of
-#      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#      GNU General Public License for more details.
-#
-#      You should have received a copy of the GNU Affero General Public License
-#      along with Foobar.  If not, see <https://www.gnu.org/licenses/>.
+
+
 
diff --git a/principalmapper/analysis/risks.py b/principalmapper/analysis/risks.py
index 1a767c1..eb26832 100644
--- a/principalmapper/analysis/risks.py
+++ b/principalmapper/analysis/risks.py
@@ -9,7 +9,9 @@
 }
 """
 
-#  Copyright NCC Group (c) 2019. This file is part of Principal Mapper.
+
+
+#  Copyright (c) NCC Group and Erik Steringer 2019. This file is part of Principal Mapper.
 #
 #      Principal Mapper is free software: you can redistribute it and/or modify
 #      it under the terms of the GNU Affero General Public License as published by
@@ -23,19 +25,6 @@
 #
 #      You should have received a copy of the GNU Affero General Public License
 #      along with Principal Mapper.  If not, see <https://www.gnu.org/licenses/>.
-#
-#      Principal Mapper is free software: you can redistribute it and/or modify
-#      it under the terms of the GNU Affero General Public License as published by
-#      the Free Software Foundation, either version 3 of the License, or
-#      (at your option) any later version.
-#
-#      Principal Mapper is distributed in the hope that it will be useful,
-#      but WITHOUT ANY WARRANTY; without even the implied warranty of
-#      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#      GNU General Public License for more details.
-#
-#      You should have received a copy of the GNU Affero General Public License
-#      along with Foobar.  If not, see <https://www.gnu.org/licenses/>.
 
 import datetime as dt
 import json
diff --git a/principalmapper/common/__init__.py b/principalmapper/common/__init__.py
index 113d078..558cd5f 100644
--- a/principalmapper/common/__init__.py
+++ b/principalmapper/common/__init__.py
@@ -1,4 +1,4 @@
-#  Copyright NCC Group (c) 2019. This file is part of Principal Mapper.
+#  Copyright (c) NCC Group and Erik Steringer 2019. This file is part of Principal Mapper.
 #
 #      Principal Mapper is free software: you can redistribute it and/or modify
 #      it under the terms of the GNU Affero General Public License as published by
@@ -12,18 +12,7 @@
 #
 #      You should have received a copy of the GNU Affero General Public License
 #      along with Principal Mapper.  If not, see <https://www.gnu.org/licenses/>.
-#
-#      Principal Mapper is free software: you can redistribute it and/or modify
-#      it under the terms of the GNU Affero General Public License as published by
-#      the Free Software Foundation, either version 3 of the License, or
-#      (at your option) any later version.
-#
-#      Principal Mapper is distributed in the hope that it will be useful,
-#      but WITHOUT ANY WARRANTY; without even the implied warranty of
-#      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#      GNU General Public License for more details.
-#
-#      You should have received a copy of the GNU Affero General Public License
-#      along with Foobar.  If not, see <https://www.gnu.org/licenses/>.
+
+
 
 """Module defining classes and functions used commonly across principalmapper"""
diff --git a/principalmapper/common/edges.py b/principalmapper/common/edges.py
index af58f18..d5e8acf 100644
--- a/principalmapper/common/edges.py
+++ b/principalmapper/common/edges.py
@@ -1,6 +1,8 @@
 """Python code for implementing the edges of a graph"""
 
-#  Copyright NCC Group (c) 2019. This file is part of Principal Mapper.
+
+
+#  Copyright (c) NCC Group and Erik Steringer 2019. This file is part of Principal Mapper.
 #
 #      Principal Mapper is free software: you can redistribute it and/or modify
 #      it under the terms of the GNU Affero General Public License as published by
@@ -14,19 +16,6 @@
 #
 #      You should have received a copy of the GNU Affero General Public License
 #      along with Principal Mapper.  If not, see <https://www.gnu.org/licenses/>.
-#
-#      Principal Mapper is free software: you can redistribute it and/or modify
-#      it under the terms of the GNU Affero General Public License as published by
-#      the Free Software Foundation, either version 3 of the License, or
-#      (at your option) any later version.
-#
-#      Principal Mapper is distributed in the hope that it will be useful,
-#      but WITHOUT ANY WARRANTY; without even the implied warranty of
-#      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#      GNU General Public License for more details.
-#
-#      You should have received a copy of the GNU Affero General Public License
-#      along with Foobar.  If not, see <https://www.gnu.org/licenses/>.
 
 from principalmapper.common.nodes import Node
 from principalmapper.util import arns
diff --git a/principalmapper/common/graphs.py b/principalmapper/common/graphs.py
index 41c9f61..cb0c80f 100644
--- a/principalmapper/common/graphs.py
+++ b/principalmapper/common/graphs.py
@@ -4,7 +4,9 @@
 create a graph object, you need all the policies, then all the groups, then you can build the lists of nodes and edges.
 """
 
-#  Copyright NCC Group (c) 2019. This file is part of Principal Mapper.
+
+
+#  Copyright (c) NCC Group and Erik Steringer 2019. This file is part of Principal Mapper.
 #
 #      Principal Mapper is free software: you can redistribute it and/or modify
 #      it under the terms of the GNU Affero General Public License as published by
@@ -18,19 +20,6 @@
 #
 #      You should have received a copy of the GNU Affero General Public License
 #      along with Principal Mapper.  If not, see <https://www.gnu.org/licenses/>.
-#
-#      Principal Mapper is free software: you can redistribute it and/or modify
-#      it under the terms of the GNU Affero General Public License as published by
-#      the Free Software Foundation, either version 3 of the License, or
-#      (at your option) any later version.
-#
-#      Principal Mapper is distributed in the hope that it will be useful,
-#      but WITHOUT ANY WARRANTY; without even the implied warranty of
-#      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#      GNU General Public License for more details.
-#
-#      You should have received a copy of the GNU Affero General Public License
-#      along with Foobar.  If not, see <https://www.gnu.org/licenses/>.
 
 import json
 import os
diff --git a/principalmapper/common/groups.py b/principalmapper/common/groups.py
index 83b1534..cdbca74 100644
--- a/principalmapper/common/groups.py
+++ b/principalmapper/common/groups.py
@@ -1,6 +1,8 @@
 """Python code for handling AWS IAM groups"""
 
-#  Copyright NCC Group (c) 2019. This file is part of Principal Mapper.
+
+
+#  Copyright (c) NCC Group and Erik Steringer 2019. This file is part of Principal Mapper.
 #
 #      Principal Mapper is free software: you can redistribute it and/or modify
 #      it under the terms of the GNU Affero General Public License as published by
@@ -14,19 +16,6 @@
 #
 #      You should have received a copy of the GNU Affero General Public License
 #      along with Principal Mapper.  If not, see <https://www.gnu.org/licenses/>.
-#
-#      Principal Mapper is free software: you can redistribute it and/or modify
-#      it under the terms of the GNU Affero General Public License as published by
-#      the Free Software Foundation, either version 3 of the License, or
-#      (at your option) any later version.
-#
-#      Principal Mapper is distributed in the hope that it will be useful,
-#      but WITHOUT ANY WARRANTY; without even the implied warranty of
-#      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#      GNU General Public License for more details.
-#
-#      You should have received a copy of the GNU Affero General Public License
-#      along with Foobar.  If not, see <https://www.gnu.org/licenses/>.
 
 from typing import List
 from typing import Optional
diff --git a/principalmapper/common/nodes.py b/principalmapper/common/nodes.py
index ee7955f..0959a17 100644
--- a/principalmapper/common/nodes.py
+++ b/principalmapper/common/nodes.py
@@ -1,6 +1,8 @@
 """Python code for implementing the nodes of a graph"""
 
-#  Copyright NCC Group (c) 2019. This file is part of Principal Mapper.
+
+
+#  Copyright (c) NCC Group and Erik Steringer 2019. This file is part of Principal Mapper.
 #
 #      Principal Mapper is free software: you can redistribute it and/or modify
 #      it under the terms of the GNU Affero General Public License as published by
@@ -14,19 +16,6 @@
 #
 #      You should have received a copy of the GNU Affero General Public License
 #      along with Principal Mapper.  If not, see <https://www.gnu.org/licenses/>.
-#
-#      Principal Mapper is free software: you can redistribute it and/or modify
-#      it under the terms of the GNU Affero General Public License as published by
-#      the Free Software Foundation, either version 3 of the License, or
-#      (at your option) any later version.
-#
-#      Principal Mapper is distributed in the hope that it will be useful,
-#      but WITHOUT ANY WARRANTY; without even the implied warranty of
-#      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#      GNU General Public License for more details.
-#
-#      You should have received a copy of the GNU Affero General Public License
-#      along with Foobar.  If not, see <https://www.gnu.org/licenses/>.
 
 from typing import List, Optional
 
diff --git a/principalmapper/common/policies.py b/principalmapper/common/policies.py
index 365e14a..26573fe 100644
--- a/principalmapper/common/policies.py
+++ b/principalmapper/common/policies.py
@@ -1,7 +1,7 @@
 """Python code for handling AWS IAM policies"""
 
 
-#  Copyright NCC Group (c) 2019. This file is part of Principal Mapper.
+#  Copyright (c) NCC Group and Erik Steringer 2019. This file is part of Principal Mapper.
 #
 #      Principal Mapper is free software: you can redistribute it and/or modify
 #      it under the terms of the GNU Affero General Public License as published by
@@ -15,19 +15,6 @@
 #
 #      You should have received a copy of the GNU Affero General Public License
 #      along with Principal Mapper.  If not, see <https://www.gnu.org/licenses/>.
-#
-#      Principal Mapper is free software: you can redistribute it and/or modify
-#      it under the terms of the GNU Affero General Public License as published by
-#      the Free Software Foundation, either version 3 of the License, or
-#      (at your option) any later version.
-#
-#      Principal Mapper is distributed in the hope that it will be useful,
-#      but WITHOUT ANY WARRANTY; without even the implied warranty of
-#      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#      GNU General Public License for more details.
-#
-#      You should have received a copy of the GNU Affero General Public License
-#      along with Foobar.  If not, see <https://www.gnu.org/licenses/>.
 
 class Policy(object):
     """A class representing a single IAM policy"""
diff --git a/principalmapper/graphing/__init__.py b/principalmapper/graphing/__init__.py
index 0fd84d6..010e4e2 100644
--- a/principalmapper/graphing/__init__.py
+++ b/principalmapper/graphing/__init__.py
@@ -1,4 +1,4 @@
-#  Copyright NCC Group (c) 2019. This file is part of Principal Mapper.
+#  Copyright (c) NCC Group and Erik Steringer 2019. This file is part of Principal Mapper.
 #
 #      Principal Mapper is free software: you can redistribute it and/or modify
 #      it under the terms of the GNU Affero General Public License as published by
@@ -12,18 +12,5 @@
 #
 #      You should have received a copy of the GNU Affero General Public License
 #      along with Principal Mapper.  If not, see <https://www.gnu.org/licenses/>.
-#
-#      Principal Mapper is free software: you can redistribute it and/or modify
-#      it under the terms of the GNU Affero General Public License as published by
-#      the Free Software Foundation, either version 3 of the License, or
-#      (at your option) any later version.
-#
-#      Principal Mapper is distributed in the hope that it will be useful,
-#      but WITHOUT ANY WARRANTY; without even the implied warranty of
-#      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#      GNU General Public License for more details.
-#
-#      You should have received a copy of the GNU Affero General Public License
-#      along with Foobar.  If not, see <https://www.gnu.org/licenses/>.
 
 """Module for graphing code"""
diff --git a/principalmapper/graphing/cloudformation_edges.py b/principalmapper/graphing/cloudformation_edges.py
index 12b8bd6..8f8d452 100644
--- a/principalmapper/graphing/cloudformation_edges.py
+++ b/principalmapper/graphing/cloudformation_edges.py
@@ -1,6 +1,6 @@
 """Code to identify if a principal in an AWS account can use access to CloudFormation to access other principals."""
 
-#  Copyright NCC Group (c) 2019. This file is part of Principal Mapper.
+#  Copyright (c) NCC Group and Erik Steringer 2019. This file is part of Principal Mapper.
 #
 #      Principal Mapper is free software: you can redistribute it and/or modify
 #      it under the terms of the GNU Affero General Public License as published by
@@ -14,19 +14,6 @@
 #
 #      You should have received a copy of the GNU Affero General Public License
 #      along with Principal Mapper.  If not, see <https://www.gnu.org/licenses/>.
-#
-#      Principal Mapper is free software: you can redistribute it and/or modify
-#      it under the terms of the GNU Affero General Public License as published by
-#      the Free Software Foundation, either version 3 of the License, or
-#      (at your option) any later version.
-#
-#      Principal Mapper is distributed in the hope that it will be useful,
-#      but WITHOUT ANY WARRANTY; without even the implied warranty of
-#      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#      GNU General Public License for more details.
-#
-#      You should have received a copy of the GNU Affero General Public License
-#      along with Foobar.  If not, see <https://www.gnu.org/licenses/>.
 
 import io
 import os
diff --git a/principalmapper/graphing/ec2_edges.py b/principalmapper/graphing/ec2_edges.py
index 12a63f8..fee5505 100644
--- a/principalmapper/graphing/ec2_edges.py
+++ b/principalmapper/graphing/ec2_edges.py
@@ -1,6 +1,7 @@
 """Code to identify if a principal in an AWS account can use access to EC2 to access other principals."""
 
-#  Copyright NCC Group (c) 2019. This file is part of Principal Mapper.
+
+#  Copyright (c) NCC Group and Erik Steringer 2019. This file is part of Principal Mapper.
 #
 #      Principal Mapper is free software: you can redistribute it and/or modify
 #      it under the terms of the GNU Affero General Public License as published by
@@ -14,19 +15,6 @@
 #
 #      You should have received a copy of the GNU Affero General Public License
 #      along with Principal Mapper.  If not, see <https://www.gnu.org/licenses/>.
-#
-#      Principal Mapper is free software: you can redistribute it and/or modify
-#      it under the terms of the GNU Affero General Public License as published by
-#      the Free Software Foundation, either version 3 of the License, or
-#      (at your option) any later version.
-#
-#      Principal Mapper is distributed in the hope that it will be useful,
-#      but WITHOUT ANY WARRANTY; without even the implied warranty of
-#      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#      GNU General Public License for more details.
-#
-#      You should have received a copy of the GNU Affero General Public License
-#      along with Foobar.  If not, see <https://www.gnu.org/licenses/>.
 
 import io
 import os
diff --git a/principalmapper/graphing/edge_checker.py b/principalmapper/graphing/edge_checker.py
index eefa91f..11b1f5c 100644
--- a/principalmapper/graphing/edge_checker.py
+++ b/principalmapper/graphing/edge_checker.py
@@ -1,6 +1,8 @@
 """Holds the base object EdgeChecker to be implemented and used in identifying edges"""
 
-#  Copyright NCC Group (c) 2019. This file is part of Principal Mapper.
+
+
+#  Copyright (c) NCC Group and Erik Steringer 2019. This file is part of Principal Mapper.
 #
 #      Principal Mapper is free software: you can redistribute it and/or modify
 #      it under the terms of the GNU Affero General Public License as published by
@@ -14,19 +16,6 @@
 #
 #      You should have received a copy of the GNU Affero General Public License
 #      along with Principal Mapper.  If not, see <https://www.gnu.org/licenses/>.
-#
-#      Principal Mapper is free software: you can redistribute it and/or modify
-#      it under the terms of the GNU Affero General Public License as published by
-#      the Free Software Foundation, either version 3 of the License, or
-#      (at your option) any later version.
-#
-#      Principal Mapper is distributed in the hope that it will be useful,
-#      but WITHOUT ANY WARRANTY; without even the implied warranty of
-#      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#      GNU General Public License for more details.
-#
-#      You should have received a copy of the GNU Affero General Public License
-#      along with Foobar.  If not, see <https://www.gnu.org/licenses/>.
 
 import io
 import os
diff --git a/principalmapper/graphing/edge_identification.py b/principalmapper/graphing/edge_identification.py
index 39f28fa..04e4884 100644
--- a/principalmapper/graphing/edge_identification.py
+++ b/principalmapper/graphing/edge_identification.py
@@ -1,6 +1,6 @@
 """Code to coordinate identifying edges between principals in an AWS account"""
 
-#  Copyright NCC Group (c) 2019. This file is part of Principal Mapper.
+#  Copyright (c) NCC Group and Erik Steringer 2019. This file is part of Principal Mapper.
 #
 #      Principal Mapper is free software: you can redistribute it and/or modify
 #      it under the terms of the GNU Affero General Public License as published by
@@ -14,19 +14,6 @@
 #
 #      You should have received a copy of the GNU Affero General Public License
 #      along with Principal Mapper.  If not, see <https://www.gnu.org/licenses/>.
-#
-#      Principal Mapper is free software: you can redistribute it and/or modify
-#      it under the terms of the GNU Affero General Public License as published by
-#      the Free Software Foundation, either version 3 of the License, or
-#      (at your option) any later version.
-#
-#      Principal Mapper is distributed in the hope that it will be useful,
-#      but WITHOUT ANY WARRANTY; without even the implied warranty of
-#      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#      GNU General Public License for more details.
-#
-#      You should have received a copy of the GNU Affero General Public License
-#      along with Foobar.  If not, see <https://www.gnu.org/licenses/>.
 
 import io
 import os
diff --git a/principalmapper/graphing/gathering.py b/principalmapper/graphing/gathering.py
index 63bf0c3..7488a75 100644
--- a/principalmapper/graphing/gathering.py
+++ b/principalmapper/graphing/gathering.py
@@ -1,6 +1,6 @@
 """Python code for gathering IAM-related information from an AWS account"""
 
-#  Copyright NCC Group (c) 2019. This file is part of Principal Mapper.
+#  Copyright (c) NCC Group and Erik Steringer 2019. This file is part of Principal Mapper.
 #
 #      Principal Mapper is free software: you can redistribute it and/or modify
 #      it under the terms of the GNU Affero General Public License as published by
@@ -14,19 +14,6 @@
 #
 #      You should have received a copy of the GNU Affero General Public License
 #      along with Principal Mapper.  If not, see <https://www.gnu.org/licenses/>.
-#
-#      Principal Mapper is free software: you can redistribute it and/or modify
-#      it under the terms of the GNU Affero General Public License as published by
-#      the Free Software Foundation, either version 3 of the License, or
-#      (at your option) any later version.
-#
-#      Principal Mapper is distributed in the hope that it will be useful,
-#      but WITHOUT ANY WARRANTY; without even the implied warranty of
-#      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#      GNU General Public License for more details.
-#
-#      You should have received a copy of the GNU Affero General Public License
-#      along with Foobar.  If not, see <https://www.gnu.org/licenses/>.
 
 import io
 import os
diff --git a/principalmapper/graphing/graph_actions.py b/principalmapper/graphing/graph_actions.py
index c55c2bb..38c8111 100644
--- a/principalmapper/graphing/graph_actions.py
+++ b/principalmapper/graphing/graph_actions.py
@@ -1,6 +1,6 @@
 """Code for executing commands given by the Principal Mapper command-line"""
 
-#  Copyright NCC Group (c) 2019. This file is part of Principal Mapper.
+#  Copyright (c) NCC Group and Erik Steringer 2019. This file is part of Principal Mapper.
 #
 #      Principal Mapper is free software: you can redistribute it and/or modify
 #      it under the terms of the GNU Affero General Public License as published by
@@ -14,19 +14,6 @@
 #
 #      You should have received a copy of the GNU Affero General Public License
 #      along with Principal Mapper.  If not, see <https://www.gnu.org/licenses/>.
-#
-#      Principal Mapper is free software: you can redistribute it and/or modify
-#      it under the terms of the GNU Affero General Public License as published by
-#      the Free Software Foundation, either version 3 of the License, or
-#      (at your option) any later version.
-#
-#      Principal Mapper is distributed in the hope that it will be useful,
-#      but WITHOUT ANY WARRANTY; without even the implied warranty of
-#      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#      GNU General Public License for more details.
-#
-#      You should have received a copy of the GNU Affero General Public License
-#      along with Foobar.  If not, see <https://www.gnu.org/licenses/>.
 
 import os
 import os.path
diff --git a/principalmapper/graphing/iam_edges.py b/principalmapper/graphing/iam_edges.py
index 44fa65f..911f232 100644
--- a/principalmapper/graphing/iam_edges.py
+++ b/principalmapper/graphing/iam_edges.py
@@ -1,6 +1,7 @@
 """Code to identify if a principal in an AWS account can use access to IAM to access other principals."""
 
-#  Copyright NCC Group (c) 2019. This file is part of Principal Mapper.
+
+#  Copyright (c) NCC Group and Erik Steringer 2019. This file is part of Principal Mapper.
 #
 #      Principal Mapper is free software: you can redistribute it and/or modify
 #      it under the terms of the GNU Affero General Public License as published by
@@ -14,19 +15,6 @@
 #
 #      You should have received a copy of the GNU Affero General Public License
 #      along with Principal Mapper.  If not, see <https://www.gnu.org/licenses/>.
-#
-#      Principal Mapper is free software: you can redistribute it and/or modify
-#      it under the terms of the GNU Affero General Public License as published by
-#      the Free Software Foundation, either version 3 of the License, or
-#      (at your option) any later version.
-#
-#      Principal Mapper is distributed in the hope that it will be useful,
-#      but WITHOUT ANY WARRANTY; without even the implied warranty of
-#      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#      GNU General Public License for more details.
-#
-#      You should have received a copy of the GNU Affero General Public License
-#      along with Foobar.  If not, see <https://www.gnu.org/licenses/>.
 
 import io
 import os
diff --git a/principalmapper/graphing/lambda_edges.py b/principalmapper/graphing/lambda_edges.py
index 7d001fb..59bebe3 100644
--- a/principalmapper/graphing/lambda_edges.py
+++ b/principalmapper/graphing/lambda_edges.py
@@ -1,6 +1,6 @@
 """Code to identify if a principal in an AWS account can use access to Lambda to access other principals."""
 
-#  Copyright NCC Group (c) 2019. This file is part of Principal Mapper.
+#  Copyright (c) NCC Group and Erik Steringer 2019. This file is part of Principal Mapper.
 #
 #      Principal Mapper is free software: you can redistribute it and/or modify
 #      it under the terms of the GNU Affero General Public License as published by
@@ -14,19 +14,6 @@
 #
 #      You should have received a copy of the GNU Affero General Public License
 #      along with Principal Mapper.  If not, see <https://www.gnu.org/licenses/>.
-#
-#      Principal Mapper is free software: you can redistribute it and/or modify
-#      it under the terms of the GNU Affero General Public License as published by
-#      the Free Software Foundation, either version 3 of the License, or
-#      (at your option) any later version.
-#
-#      Principal Mapper is distributed in the hope that it will be useful,
-#      but WITHOUT ANY WARRANTY; without even the implied warranty of
-#      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#      GNU General Public License for more details.
-#
-#      You should have received a copy of the GNU Affero General Public License
-#      along with Foobar.  If not, see <https://www.gnu.org/licenses/>.
 
 import io
 import os
diff --git a/principalmapper/graphing/ssm_edges.py b/principalmapper/graphing/ssm_edges.py
index 68ed618..2e6664d 100644
--- a/principalmapper/graphing/ssm_edges.py
+++ b/principalmapper/graphing/ssm_edges.py
@@ -1,6 +1,6 @@
 """Code to identify if a principal in an AWS account can use access to STS to access other principals."""
 
-#  Copyright NCC Group (c) 2019. This file is part of Principal Mapper.
+#  Copyright (c) NCC Group and Erik Steringer 2019. This file is part of Principal Mapper.
 #
 #      Principal Mapper is free software: you can redistribute it and/or modify
 #      it under the terms of the GNU Affero General Public License as published by
@@ -14,19 +14,6 @@
 #
 #      You should have received a copy of the GNU Affero General Public License
 #      along with Principal Mapper.  If not, see <https://www.gnu.org/licenses/>.
-#
-#      Principal Mapper is free software: you can redistribute it and/or modify
-#      it under the terms of the GNU Affero General Public License as published by
-#      the Free Software Foundation, either version 3 of the License, or
-#      (at your option) any later version.
-#
-#      Principal Mapper is distributed in the hope that it will be useful,
-#      but WITHOUT ANY WARRANTY; without even the implied warranty of
-#      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#      GNU General Public License for more details.
-#
-#      You should have received a copy of the GNU Affero General Public License
-#      along with Foobar.  If not, see <https://www.gnu.org/licenses/>.
 
 import io
 import os
diff --git a/principalmapper/graphing/sts_edges.py b/principalmapper/graphing/sts_edges.py
index 5e38141..4179750 100644
--- a/principalmapper/graphing/sts_edges.py
+++ b/principalmapper/graphing/sts_edges.py
@@ -1,6 +1,6 @@
 """Code to identify if a principal in an AWS account can use access to STS to access other principals."""
 
-#  Copyright NCC Group (c) 2019. This file is part of Principal Mapper.
+#  Copyright (c) NCC Group and Erik Steringer 2019. This file is part of Principal Mapper.
 #
 #      Principal Mapper is free software: you can redistribute it and/or modify
 #      it under the terms of the GNU Affero General Public License as published by
@@ -14,19 +14,6 @@
 #
 #      You should have received a copy of the GNU Affero General Public License
 #      along with Principal Mapper.  If not, see <https://www.gnu.org/licenses/>.
-#
-#      Principal Mapper is free software: you can redistribute it and/or modify
-#      it under the terms of the GNU Affero General Public License as published by
-#      the Free Software Foundation, either version 3 of the License, or
-#      (at your option) any later version.
-#
-#      Principal Mapper is distributed in the hope that it will be useful,
-#      but WITHOUT ANY WARRANTY; without even the implied warranty of
-#      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#      GNU General Public License for more details.
-#
-#      You should have received a copy of the GNU Affero General Public License
-#      along with Foobar.  If not, see <https://www.gnu.org/licenses/>.
 
 import io
 import os
diff --git a/principalmapper/querying/__init__.py b/principalmapper/querying/__init__.py
index d762c33..f45d344 100644
--- a/principalmapper/querying/__init__.py
+++ b/principalmapper/querying/__init__.py
@@ -1,4 +1,4 @@
-#  Copyright NCC Group (c) 2019. This file is part of Principal Mapper.
+#  Copyright (c) NCC Group and Erik Steringer 2019. This file is part of Principal Mapper.
 #
 #      Principal Mapper is free software: you can redistribute it and/or modify
 #      it under the terms of the GNU Affero General Public License as published by
@@ -12,18 +12,7 @@
 #
 #      You should have received a copy of the GNU Affero General Public License
 #      along with Principal Mapper.  If not, see <https://www.gnu.org/licenses/>.
-#
-#      Principal Mapper is free software: you can redistribute it and/or modify
-#      it under the terms of the GNU Affero General Public License as published by
-#      the Free Software Foundation, either version 3 of the License, or
-#      (at your option) any later version.
-#
-#      Principal Mapper is distributed in the hope that it will be useful,
-#      but WITHOUT ANY WARRANTY; without even the implied warranty of
-#      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#      GNU General Public License for more details.
-#
-#      You should have received a copy of the GNU Affero General Public License
-#      along with Foobar.  If not, see <https://www.gnu.org/licenses/>.
+
+
 
 """Module for querying"""
diff --git a/principalmapper/querying/local_policy_simulation.py b/principalmapper/querying/local_policy_simulation.py
index ef2afea..f1c7185 100644
--- a/principalmapper/querying/local_policy_simulation.py
+++ b/principalmapper/querying/local_policy_simulation.py
@@ -1,7 +1,8 @@
 """Utility code for the querying module: creates functions for simulating the authorization of principals making
 API calls to AWS."""
 
-#  Copyright NCC Group (c) 2019. This file is part of Principal Mapper.
+
+#  Copyright (c) NCC Group and Erik Steringer 2019. This file is part of Principal Mapper.
 #
 #      Principal Mapper is free software: you can redistribute it and/or modify
 #      it under the terms of the GNU Affero General Public License as published by
@@ -15,19 +16,6 @@
 #
 #      You should have received a copy of the GNU Affero General Public License
 #      along with Principal Mapper.  If not, see <https://www.gnu.org/licenses/>.
-#
-#      Principal Mapper is free software: you can redistribute it and/or modify
-#      it under the terms of the GNU Affero General Public License as published by
-#      the Free Software Foundation, either version 3 of the License, or
-#      (at your option) any later version.
-#
-#      Principal Mapper is distributed in the hope that it will be useful,
-#      but WITHOUT ANY WARRANTY; without even the implied warranty of
-#      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#      GNU General Public License for more details.
-#
-#      You should have received a copy of the GNU Affero General Public License
-#      along with Foobar.  If not, see <https://www.gnu.org/licenses/>.
 
 import ast
 import datetime as dt
diff --git a/principalmapper/querying/presets/__init__.py b/principalmapper/querying/presets/__init__.py
index 250589f..7d99db2 100644
--- a/principalmapper/querying/presets/__init__.py
+++ b/principalmapper/querying/presets/__init__.py
@@ -1,4 +1,4 @@
-#  Copyright NCC Group (c) 2019. This file is part of Principal Mapper.
+#  Copyright (c) NCC Group and Erik Steringer 2019. This file is part of Principal Mapper.
 #
 #      Principal Mapper is free software: you can redistribute it and/or modify
 #      it under the terms of the GNU Affero General Public License as published by
@@ -12,17 +12,6 @@
 #
 #      You should have received a copy of the GNU Affero General Public License
 #      along with Principal Mapper.  If not, see <https://www.gnu.org/licenses/>.
-#
-#      Principal Mapper is free software: you can redistribute it and/or modify
-#      it under the terms of the GNU Affero General Public License as published by
-#      the Free Software Foundation, either version 3 of the License, or
-#      (at your option) any later version.
-#
-#      Principal Mapper is distributed in the hope that it will be useful,
-#      but WITHOUT ANY WARRANTY; without even the implied warranty of
-#      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#      GNU General Public License for more details.
-#
-#      You should have received a copy of the GNU Affero General Public License
-#      along with Foobar.  If not, see <https://www.gnu.org/licenses/>.
+
+
 
diff --git a/principalmapper/querying/presets/connected.py b/principalmapper/querying/presets/connected.py
index 8886b43..ac4ea6a 100644
--- a/principalmapper/querying/presets/connected.py
+++ b/principalmapper/querying/presets/connected.py
@@ -1,6 +1,6 @@
 """Query preset for testing if a principal is connected to another, or listing what a principal is connected to."""
 
-#  Copyright NCC Group (c) 2019. This file is part of Principal Mapper.
+#  Copyright (c) NCC Group and Erik Steringer 2019. This file is part of Principal Mapper.
 #
 #      Principal Mapper is free software: you can redistribute it and/or modify
 #      it under the terms of the GNU Affero General Public License as published by
@@ -14,19 +14,6 @@
 #
 #      You should have received a copy of the GNU Affero General Public License
 #      along with Principal Mapper.  If not, see <https://www.gnu.org/licenses/>.
-#
-#      Principal Mapper is free software: you can redistribute it and/or modify
-#      it under the terms of the GNU Affero General Public License as published by
-#      the Free Software Foundation, either version 3 of the License, or
-#      (at your option) any later version.
-#
-#      Principal Mapper is distributed in the hope that it will be useful,
-#      but WITHOUT ANY WARRANTY; without even the implied warranty of
-#      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#      GNU General Public License for more details.
-#
-#      You should have received a copy of the GNU Affero General Public License
-#      along with Foobar.  If not, see <https://www.gnu.org/licenses/>.
 
 import io
 import os
diff --git a/principalmapper/querying/presets/privesc.py b/principalmapper/querying/presets/privesc.py
index e50d501..d1cc220 100644
--- a/principalmapper/querying/presets/privesc.py
+++ b/principalmapper/querying/presets/privesc.py
@@ -2,7 +2,7 @@
 methods to make it usable programmatically. Call can_privesc with a Graph and Node to get results that don't require
 parsing text output."""
 
-#  Copyright NCC Group (c) 2019. This file is part of Principal Mapper.
+#  Copyright (c) NCC Group and Erik Steringer 2019. This file is part of Principal Mapper.
 #
 #      Principal Mapper is free software: you can redistribute it and/or modify
 #      it under the terms of the GNU Affero General Public License as published by
@@ -16,19 +16,6 @@
 #
 #      You should have received a copy of the GNU Affero General Public License
 #      along with Principal Mapper.  If not, see <https://www.gnu.org/licenses/>.
-#
-#      Principal Mapper is free software: you can redistribute it and/or modify
-#      it under the terms of the GNU Affero General Public License as published by
-#      the Free Software Foundation, either version 3 of the License, or
-#      (at your option) any later version.
-#
-#      Principal Mapper is distributed in the hope that it will be useful,
-#      but WITHOUT ANY WARRANTY; without even the implied warranty of
-#      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#      GNU General Public License for more details.
-#
-#      You should have received a copy of the GNU Affero General Public License
-#      along with Foobar.  If not, see <https://www.gnu.org/licenses/>.
 
 import io
 import os
diff --git a/principalmapper/querying/query_actions.py b/principalmapper/querying/query_actions.py
index a5c9336..9805dff 100644
--- a/principalmapper/querying/query_actions.py
+++ b/principalmapper/querying/query_actions.py
@@ -1,6 +1,7 @@
 """Code for executing queries given by the Principal Mapper command-line"""
 
-#  Copyright NCC Group (c) 2019. This file is part of Principal Mapper.
+
+#  Copyright (c) NCC Group and Erik Steringer 2019. This file is part of Principal Mapper.
 #
 #      Principal Mapper is free software: you can redistribute it and/or modify
 #      it under the terms of the GNU Affero General Public License as published by
@@ -14,19 +15,6 @@
 #
 #      You should have received a copy of the GNU Affero General Public License
 #      along with Principal Mapper.  If not, see <https://www.gnu.org/licenses/>.
-#
-#      Principal Mapper is free software: you can redistribute it and/or modify
-#      it under the terms of the GNU Affero General Public License as published by
-#      the Free Software Foundation, either version 3 of the License, or
-#      (at your option) any later version.
-#
-#      Principal Mapper is distributed in the hope that it will be useful,
-#      but WITHOUT ANY WARRANTY; without even the implied warranty of
-#      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#      GNU General Public License for more details.
-#
-#      You should have received a copy of the GNU Affero General Public License
-#      along with Foobar.  If not, see <https://www.gnu.org/licenses/>.
 
 import io
 import os
diff --git a/principalmapper/querying/query_interface.py b/principalmapper/querying/query_interface.py
index bc539fa..72daa50 100644
--- a/principalmapper/querying/query_interface.py
+++ b/principalmapper/querying/query_interface.py
@@ -1,6 +1,7 @@
 """Code for querying a graph about specific access to actions and resources in AWS"""
 
-#  Copyright NCC Group (c) 2019. This file is part of Principal Mapper.
+
+#  Copyright (c) NCC Group and Erik Steringer 2019. This file is part of Principal Mapper.
 #
 #      Principal Mapper is free software: you can redistribute it and/or modify
 #      it under the terms of the GNU Affero General Public License as published by
@@ -14,19 +15,6 @@
 #
 #      You should have received a copy of the GNU Affero General Public License
 #      along with Principal Mapper.  If not, see <https://www.gnu.org/licenses/>.
-#
-#      Principal Mapper is free software: you can redistribute it and/or modify
-#      it under the terms of the GNU Affero General Public License as published by
-#      the Free Software Foundation, either version 3 of the License, or
-#      (at your option) any later version.
-#
-#      Principal Mapper is distributed in the hope that it will be useful,
-#      but WITHOUT ANY WARRANTY; without even the implied warranty of
-#      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#      GNU General Public License for more details.
-#
-#      You should have received a copy of the GNU Affero General Public License
-#      along with Foobar.  If not, see <https://www.gnu.org/licenses/>.
 
 import copy
 import datetime as dt
diff --git a/principalmapper/querying/query_result.py b/principalmapper/querying/query_result.py
index e0c2544..384add0 100644
--- a/principalmapper/querying/query_result.py
+++ b/principalmapper/querying/query_result.py
@@ -1,6 +1,7 @@
 """Class representation of a query result."""
 
-#  Copyright NCC Group (c) 2019. This file is part of Principal Mapper.
+
+#  Copyright (c) NCC Group and Erik Steringer 2019. This file is part of Principal Mapper.
 #
 #      Principal Mapper is free software: you can redistribute it and/or modify
 #      it under the terms of the GNU Affero General Public License as published by
@@ -14,19 +15,6 @@
 #
 #      You should have received a copy of the GNU Affero General Public License
 #      along with Principal Mapper.  If not, see <https://www.gnu.org/licenses/>.
-#
-#      Principal Mapper is free software: you can redistribute it and/or modify
-#      it under the terms of the GNU Affero General Public License as published by
-#      the Free Software Foundation, either version 3 of the License, or
-#      (at your option) any later version.
-#
-#      Principal Mapper is distributed in the hope that it will be useful,
-#      but WITHOUT ANY WARRANTY; without even the implied warranty of
-#      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#      GNU General Public License for more details.
-#
-#      You should have received a copy of the GNU Affero General Public License
-#      along with Foobar.  If not, see <https://www.gnu.org/licenses/>.
 
 import io
 import os
diff --git a/principalmapper/querying/query_utils.py b/principalmapper/querying/query_utils.py
index 6d0204e..b49532f 100644
--- a/principalmapper/querying/query_utils.py
+++ b/principalmapper/querying/query_utils.py
@@ -1,6 +1,6 @@
 """Utility functions that help with querying"""
 
-#  Copyright NCC Group (c) 2019. This file is part of Principal Mapper.
+#  Copyright (c) NCC Group and Erik Steringer 2019. This file is part of Principal Mapper.
 #
 #      Principal Mapper is free software: you can redistribute it and/or modify
 #      it under the terms of the GNU Affero General Public License as published by
@@ -14,19 +14,6 @@
 #
 #      You should have received a copy of the GNU Affero General Public License
 #      along with Principal Mapper.  If not, see <https://www.gnu.org/licenses/>.
-#
-#      Principal Mapper is free software: you can redistribute it and/or modify
-#      it under the terms of the GNU Affero General Public License as published by
-#      the Free Software Foundation, either version 3 of the License, or
-#      (at your option) any later version.
-#
-#      Principal Mapper is distributed in the hope that it will be useful,
-#      but WITHOUT ANY WARRANTY; without even the implied warranty of
-#      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#      GNU General Public License for more details.
-#
-#      You should have received a copy of the GNU Affero General Public License
-#      along with Foobar.  If not, see <https://www.gnu.org/licenses/>.
 
 from typing import List
 
diff --git a/principalmapper/querying/repl.py b/principalmapper/querying/repl.py
index 0ec2917..e8196f5 100644
--- a/principalmapper/querying/repl.py
+++ b/principalmapper/querying/repl.py
@@ -1,6 +1,6 @@
 """Code that implements a Read-Evaluated-Print-Loop (REPL) for the query interfaces of Principal Mapper."""
 
-#  Copyright NCC Group (c) 2019. This file is part of Principal Mapper.
+#  Copyright (c) NCC Group and Erik Steringer 2019. This file is part of Principal Mapper.
 #
 #      Principal Mapper is free software: you can redistribute it and/or modify
 #      it under the terms of the GNU Affero General Public License as published by
@@ -14,19 +14,6 @@
 #
 #      You should have received a copy of the GNU Affero General Public License
 #      along with Principal Mapper.  If not, see <https://www.gnu.org/licenses/>.
-#
-#      Principal Mapper is free software: you can redistribute it and/or modify
-#      it under the terms of the GNU Affero General Public License as published by
-#      the Free Software Foundation, either version 3 of the License, or
-#      (at your option) any later version.
-#
-#      Principal Mapper is distributed in the hope that it will be useful,
-#      but WITHOUT ANY WARRANTY; without even the implied warranty of
-#      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#      GNU General Public License for more details.
-#
-#      You should have received a copy of the GNU Affero General Public License
-#      along with Foobar.  If not, see <https://www.gnu.org/licenses/>.
 
 import argparse
 import shlex
diff --git a/principalmapper/util/__init__.py b/principalmapper/util/__init__.py
index 6d78fdd..75025da 100644
--- a/principalmapper/util/__init__.py
+++ b/principalmapper/util/__init__.py
@@ -1,4 +1,4 @@
-#  Copyright NCC Group (c) 2019. This file is part of Principal Mapper.
+#  Copyright (c) NCC Group and Erik Steringer 2019. This file is part of Principal Mapper.
 #
 #      Principal Mapper is free software: you can redistribute it and/or modify
 #      it under the terms of the GNU Affero General Public License as published by
@@ -12,18 +12,7 @@
 #
 #      You should have received a copy of the GNU Affero General Public License
 #      along with Principal Mapper.  If not, see <https://www.gnu.org/licenses/>.
-#
-#      Principal Mapper is free software: you can redistribute it and/or modify
-#      it under the terms of the GNU Affero General Public License as published by
-#      the Free Software Foundation, either version 3 of the License, or
-#      (at your option) any later version.
-#
-#      Principal Mapper is distributed in the hope that it will be useful,
-#      but WITHOUT ANY WARRANTY; without even the implied warranty of
-#      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#      GNU General Public License for more details.
-#
-#      You should have received a copy of the GNU Affero General Public License
-#      along with Foobar.  If not, see <https://www.gnu.org/licenses/>.
+
+
 
 """Module defining functions used for utility purposes such as loading and saving data"""
diff --git a/principalmapper/util/arns.py b/principalmapper/util/arns.py
index 8a9e2bd..304f317 100644
--- a/principalmapper/util/arns.py
+++ b/principalmapper/util/arns.py
@@ -8,8 +8,7 @@
 arn:<partition>:<service>:<region>:<account id>:<resource/identifier>
 """
 
-
-#  Copyright NCC Group (c) 2019. This file is part of Principal Mapper.
+#  Copyright (c) NCC Group and Erik Steringer 2019. This file is part of Principal Mapper.
 #
 #      Principal Mapper is free software: you can redistribute it and/or modify
 #      it under the terms of the GNU Affero General Public License as published by
@@ -23,19 +22,6 @@
 #
 #      You should have received a copy of the GNU Affero General Public License
 #      along with Principal Mapper.  If not, see <https://www.gnu.org/licenses/>.
-#
-#      Principal Mapper is free software: you can redistribute it and/or modify
-#      it under the terms of the GNU Affero General Public License as published by
-#      the Free Software Foundation, either version 3 of the License, or
-#      (at your option) any later version.
-#
-#      Principal Mapper is distributed in the hope that it will be useful,
-#      but WITHOUT ANY WARRANTY; without even the implied warranty of
-#      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#      GNU General Public License for more details.
-#
-#      You should have received a copy of the GNU Affero General Public License
-#      along with Foobar.  If not, see <https://www.gnu.org/licenses/>.
 
 def get_partition(arn: str):
     """Returns the partition from a string ARN."""
diff --git a/principalmapper/util/botocore_tools.py b/principalmapper/util/botocore_tools.py
index b8f1690..50a165b 100644
--- a/principalmapper/util/botocore_tools.py
+++ b/principalmapper/util/botocore_tools.py
@@ -1,6 +1,6 @@
 """Utility functions for working with botocore"""
 
-#  Copyright NCC Group (c) 2019. This file is part of Principal Mapper.
+#  Copyright (c) NCC Group and Erik Steringer 2019. This file is part of Principal Mapper.
 #
 #      Principal Mapper is free software: you can redistribute it and/or modify
 #      it under the terms of the GNU Affero General Public License as published by
@@ -14,19 +14,6 @@
 #
 #      You should have received a copy of the GNU Affero General Public License
 #      along with Principal Mapper.  If not, see <https://www.gnu.org/licenses/>.
-#
-#      Principal Mapper is free software: you can redistribute it and/or modify
-#      it under the terms of the GNU Affero General Public License as published by
-#      the Free Software Foundation, either version 3 of the License, or
-#      (at your option) any later version.
-#
-#      Principal Mapper is distributed in the hope that it will be useful,
-#      but WITHOUT ANY WARRANTY; without even the implied warranty of
-#      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#      GNU General Public License for more details.
-#
-#      You should have received a copy of the GNU Affero General Public License
-#      along with Foobar.  If not, see <https://www.gnu.org/licenses/>.
 
 from typing import Optional
 
diff --git a/principalmapper/util/debug_print.py b/principalmapper/util/debug_print.py
index ea079f0..39ff1c9 100644
--- a/principalmapper/util/debug_print.py
+++ b/principalmapper/util/debug_print.py
@@ -1,6 +1,6 @@
 """Code for handling printing to console depending on if debugging is enabled"""
 
-#  Copyright NCC Group (c) 2019. This file is part of Principal Mapper.
+#  Copyright (c) NCC Group and Erik Steringer 2019. This file is part of Principal Mapper.
 #
 #      Principal Mapper is free software: you can redistribute it and/or modify
 #      it under the terms of the GNU Affero General Public License as published by
@@ -14,19 +14,6 @@
 #
 #      You should have received a copy of the GNU Affero General Public License
 #      along with Principal Mapper.  If not, see <https://www.gnu.org/licenses/>.
-#
-#      Principal Mapper is free software: you can redistribute it and/or modify
-#      it under the terms of the GNU Affero General Public License as published by
-#      the Free Software Foundation, either version 3 of the License, or
-#      (at your option) any later version.
-#
-#      Principal Mapper is distributed in the hope that it will be useful,
-#      but WITHOUT ANY WARRANTY; without even the implied warranty of
-#      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#      GNU General Public License for more details.
-#
-#      You should have received a copy of the GNU Affero General Public License
-#      along with Foobar.  If not, see <https://www.gnu.org/licenses/>.
 
 import sys
 
diff --git a/principalmapper/util/storage.py b/principalmapper/util/storage.py
index 823a80b..d7ae830 100644
--- a/principalmapper/util/storage.py
+++ b/principalmapper/util/storage.py
@@ -1,6 +1,6 @@
 """Code for handling the process of storing or retrieving data to/from disk"""
 
-#  Copyright NCC Group (c) 2019. This file is part of Principal Mapper.
+#  Copyright (c) NCC Group and Erik Steringer 2019. This file is part of Principal Mapper.
 #
 #      Principal Mapper is free software: you can redistribute it and/or modify
 #      it under the terms of the GNU Affero General Public License as published by
@@ -14,19 +14,6 @@
 #
 #      You should have received a copy of the GNU Affero General Public License
 #      along with Principal Mapper.  If not, see <https://www.gnu.org/licenses/>.
-#
-#      Principal Mapper is free software: you can redistribute it and/or modify
-#      it under the terms of the GNU Affero General Public License as published by
-#      the Free Software Foundation, either version 3 of the License, or
-#      (at your option) any later version.
-#
-#      Principal Mapper is distributed in the hope that it will be useful,
-#      but WITHOUT ANY WARRANTY; without even the implied warranty of
-#      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#      GNU General Public License for more details.
-#
-#      You should have received a copy of the GNU Affero General Public License
-#      along with Foobar.  If not, see <https://www.gnu.org/licenses/>.
 
 import os
 import os.path
diff --git a/principalmapper/visualizing/__init__.py b/principalmapper/visualizing/__init__.py
index 274f45f..edabc50 100644
--- a/principalmapper/visualizing/__init__.py
+++ b/principalmapper/visualizing/__init__.py
@@ -1,4 +1,4 @@
-#  Copyright NCC Group (c) 2019. This file is part of Principal Mapper.
+#  Copyright (c) NCC Group and Erik Steringer 2019. This file is part of Principal Mapper.
 #
 #      Principal Mapper is free software: you can redistribute it and/or modify
 #      it under the terms of the GNU Affero General Public License as published by
@@ -12,18 +12,5 @@
 #
 #      You should have received a copy of the GNU Affero General Public License
 #      along with Principal Mapper.  If not, see <https://www.gnu.org/licenses/>.
-#
-#      Principal Mapper is free software: you can redistribute it and/or modify
-#      it under the terms of the GNU Affero General Public License as published by
-#      the Free Software Foundation, either version 3 of the License, or
-#      (at your option) any later version.
-#
-#      Principal Mapper is distributed in the hope that it will be useful,
-#      but WITHOUT ANY WARRANTY; without even the implied warranty of
-#      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#      GNU General Public License for more details.
-#
-#      You should have received a copy of the GNU Affero General Public License
-#      along with Foobar.  If not, see <https://www.gnu.org/licenses/>.
 
 """Module for visualizing"""
diff --git a/principalmapper/visualizing/graph_writer.py b/principalmapper/visualizing/graph_writer.py
index f669ceb..c578ca2 100644
--- a/principalmapper/visualizing/graph_writer.py
+++ b/principalmapper/visualizing/graph_writer.py
@@ -1,6 +1,8 @@
 """Code to write Graph data to various output formats."""
 
-#  Copyright NCC Group (c) 2019. This file is part of Principal Mapper.
+
+
+#  Copyright (c) NCC Group and Erik Steringer 2019. This file is part of Principal Mapper.
 #
 #      Principal Mapper is free software: you can redistribute it and/or modify
 #      it under the terms of the GNU Affero General Public License as published by
@@ -14,19 +16,6 @@
 #
 #      You should have received a copy of the GNU Affero General Public License
 #      along with Principal Mapper.  If not, see <https://www.gnu.org/licenses/>.
-#
-#      Principal Mapper is free software: you can redistribute it and/or modify
-#      it under the terms of the GNU Affero General Public License as published by
-#      the Free Software Foundation, either version 3 of the License, or
-#      (at your option) any later version.
-#
-#      Principal Mapper is distributed in the hope that it will be useful,
-#      but WITHOUT ANY WARRANTY; without even the implied warranty of
-#      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#      GNU General Public License for more details.
-#
-#      You should have received a copy of the GNU Affero General Public License
-#      along with Foobar.  If not, see <https://www.gnu.org/licenses/>.
 
 import pydot
 
diff --git a/setup.py b/setup.py
index 2b7df10..406ba02 100644
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,8 @@
 #!/usr/bin/env python
 
 """Code for installing the Principal Mapper library and script."""
-#  Copyright NCC Group (c) 2019. This file is part of Principal Mapper.
+
+#  Copyright (c) NCC Group and Erik Steringer 2019. This file is part of Principal Mapper.
 #
 #      Principal Mapper is free software: you can redistribute it and/or modify
 #      it under the terms of the GNU Affero General Public License as published by
@@ -15,19 +16,6 @@
 #
 #      You should have received a copy of the GNU Affero General Public License
 #      along with Principal Mapper.  If not, see <https://www.gnu.org/licenses/>.
-#
-#      Principal Mapper is free software: you can redistribute it and/or modify
-#      it under the terms of the GNU Affero General Public License as published by
-#      the Free Software Foundation, either version 3 of the License, or
-#      (at your option) any later version.
-#
-#      Principal Mapper is distributed in the hope that it will be useful,
-#      but WITHOUT ANY WARRANTY; without even the implied warranty of
-#      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#      GNU General Public License for more details.
-#
-#      You should have received a copy of the GNU Affero General Public License
-#      along with Foobar.  If not, see <https://www.gnu.org/licenses/>.
 
 # TODO: write setup script
 
diff --git a/tests/build_test_graphs.py b/tests/build_test_graphs.py
index 3d186d8..781ab90 100644
--- a/tests/build_test_graphs.py
+++ b/tests/build_test_graphs.py
@@ -1,6 +1,6 @@
 """Code for building Graph objects for testing purposes"""
 
-#  Copyright NCC Group (c) 2019. This file is part of Principal Mapper.
+#  Copyright (c) NCC Group and Erik Steringer 2019. This file is part of Principal Mapper.
 #
 #      Principal Mapper is free software: you can redistribute it and/or modify
 #      it under the terms of the GNU Affero General Public License as published by
@@ -14,19 +14,6 @@
 #
 #      You should have received a copy of the GNU Affero General Public License
 #      along with Principal Mapper.  If not, see <https://www.gnu.org/licenses/>.
-#
-#      Principal Mapper is free software: you can redistribute it and/or modify
-#      it under the terms of the GNU Affero General Public License as published by
-#      the Free Software Foundation, either version 3 of the License, or
-#      (at your option) any later version.
-#
-#      Principal Mapper is distributed in the hope that it will be useful,
-#      but WITHOUT ANY WARRANTY; without even the implied warranty of
-#      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#      GNU General Public License for more details.
-#
-#      You should have received a copy of the GNU Affero General Public License
-#      along with Foobar.  If not, see <https://www.gnu.org/licenses/>.
 
 import sys
 
diff --git a/tests/test_constructors.py b/tests/test_constructors.py
index a366733..84c1986 100644
--- a/tests/test_constructors.py
+++ b/tests/test_constructors.py
@@ -1,6 +1,7 @@
 """Code for testing the constructors of graphs, nodes, edges, policies, and groups"""
 
-#  Copyright NCC Group (c) 2019. This file is part of Principal Mapper.
+
+#  Copyright (c) NCC Group and Erik Steringer 2019. This file is part of Principal Mapper.
 #
 #      Principal Mapper is free software: you can redistribute it and/or modify
 #      it under the terms of the GNU Affero General Public License as published by
@@ -14,19 +15,6 @@
 #
 #      You should have received a copy of the GNU Affero General Public License
 #      along with Principal Mapper.  If not, see <https://www.gnu.org/licenses/>.
-#
-#      Principal Mapper is free software: you can redistribute it and/or modify
-#      it under the terms of the GNU Affero General Public License as published by
-#      the Free Software Foundation, either version 3 of the License, or
-#      (at your option) any later version.
-#
-#      Principal Mapper is distributed in the hope that it will be useful,
-#      but WITHOUT ANY WARRANTY; without even the implied warranty of
-#      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#      GNU General Public License for more details.
-#
-#      You should have received a copy of the GNU Affero General Public License
-#      along with Foobar.  If not, see <https://www.gnu.org/licenses/>.
 
 import unittest
 
diff --git a/tests/test_edge_identification.py b/tests/test_edge_identification.py
index a4a3363..cc52567 100644
--- a/tests/test_edge_identification.py
+++ b/tests/test_edge_identification.py
@@ -1,6 +1,6 @@
 """Test code for the edge-identifying functions and classes"""
 
-#  Copyright NCC Group (c) 2019. This file is part of Principal Mapper.
+#  Copyright (c) NCC Group and Erik Steringer 2019. This file is part of Principal Mapper.
 #
 #      Principal Mapper is free software: you can redistribute it and/or modify
 #      it under the terms of the GNU Affero General Public License as published by
@@ -14,19 +14,6 @@
 #
 #      You should have received a copy of the GNU Affero General Public License
 #      along with Principal Mapper.  If not, see <https://www.gnu.org/licenses/>.
-#
-#      Principal Mapper is free software: you can redistribute it and/or modify
-#      it under the terms of the GNU Affero General Public License as published by
-#      the Free Software Foundation, either version 3 of the License, or
-#      (at your option) any later version.
-#
-#      Principal Mapper is distributed in the hope that it will be useful,
-#      but WITHOUT ANY WARRANTY; without even the implied warranty of
-#      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#      GNU General Public License for more details.
-#
-#      You should have received a copy of the GNU Affero General Public License
-#      along with Foobar.  If not, see <https://www.gnu.org/licenses/>.
 
 import unittest
 
diff --git a/tests/test_graph_checking.py b/tests/test_graph_checking.py
index 3a3626d..1d90106 100644
--- a/tests/test_graph_checking.py
+++ b/tests/test_graph_checking.py
@@ -1,6 +1,6 @@
 """Code for testing code operating on Graph objects"""
 
-#  Copyright NCC Group (c) 2019. This file is part of Principal Mapper.
+#  Copyright (c) NCC Group and Erik Steringer 2019. This file is part of Principal Mapper.
 #
 #      Principal Mapper is free software: you can redistribute it and/or modify
 #      it under the terms of the GNU Affero General Public License as published by
@@ -14,19 +14,6 @@
 #
 #      You should have received a copy of the GNU Affero General Public License
 #      along with Principal Mapper.  If not, see <https://www.gnu.org/licenses/>.
-#
-#      Principal Mapper is free software: you can redistribute it and/or modify
-#      it under the terms of the GNU Affero General Public License as published by
-#      the Free Software Foundation, either version 3 of the License, or
-#      (at your option) any later version.
-#
-#      Principal Mapper is distributed in the hope that it will be useful,
-#      but WITHOUT ANY WARRANTY; without even the implied warranty of
-#      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#      GNU General Public License for more details.
-#
-#      You should have received a copy of the GNU Affero General Public License
-#      along with Foobar.  If not, see <https://www.gnu.org/licenses/>.
 
 import unittest
 
diff --git a/tests/test_local_policy_sim.py b/tests/test_local_policy_sim.py
index c14b88e..439ce93 100644
--- a/tests/test_local_policy_sim.py
+++ b/tests/test_local_policy_sim.py
@@ -1,6 +1,6 @@
 """Test functions for local policy simulation"""
 
-#  Copyright NCC Group (c) 2019. This file is part of Principal Mapper.
+#  Copyright (c) NCC Group and Erik Steringer 2019. This file is part of Principal Mapper.
 #
 #      Principal Mapper is free software: you can redistribute it and/or modify
 #      it under the terms of the GNU Affero General Public License as published by
@@ -14,19 +14,6 @@
 #
 #      You should have received a copy of the GNU Affero General Public License
 #      along with Principal Mapper.  If not, see <https://www.gnu.org/licenses/>.
-#
-#      Principal Mapper is free software: you can redistribute it and/or modify
-#      it under the terms of the GNU Affero General Public License as published by
-#      the Free Software Foundation, either version 3 of the License, or
-#      (at your option) any later version.
-#
-#      Principal Mapper is distributed in the hope that it will be useful,
-#      but WITHOUT ANY WARRANTY; without even the implied warranty of
-#      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#      GNU General Public License for more details.
-#
-#      You should have received a copy of the GNU Affero General Public License
-#      along with Foobar.  If not, see <https://www.gnu.org/licenses/>.
 
 import unittest
 
diff --git a/tests/test_local_querying.py b/tests/test_local_querying.py
index 0836fb5..be2d983 100644
--- a/tests/test_local_querying.py
+++ b/tests/test_local_querying.py
@@ -1,6 +1,6 @@
 """Test functions for querying (local)"""
 
-#  Copyright NCC Group (c) 2019. This file is part of Principal Mapper.
+#  Copyright (c) NCC Group and Erik Steringer 2019. This file is part of Principal Mapper.
 #
 #      Principal Mapper is free software: you can redistribute it and/or modify
 #      it under the terms of the GNU Affero General Public License as published by
@@ -14,19 +14,6 @@
 #
 #      You should have received a copy of the GNU Affero General Public License
 #      along with Principal Mapper.  If not, see <https://www.gnu.org/licenses/>.
-#
-#      Principal Mapper is free software: you can redistribute it and/or modify
-#      it under the terms of the GNU Affero General Public License as published by
-#      the Free Software Foundation, either version 3 of the License, or
-#      (at your option) any later version.
-#
-#      Principal Mapper is distributed in the hope that it will be useful,
-#      but WITHOUT ANY WARRANTY; without even the implied warranty of
-#      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#      GNU General Public License for more details.
-#
-#      You should have received a copy of the GNU Affero General Public License
-#      along with Foobar.  If not, see <https://www.gnu.org/licenses/>.
 
 import unittest