Fixed incorrect logging strings
Cleaned up licensing information
Fixed code that wasn't reachable due to an exception being raised before
Removed unnecessary argument because it was the same as the default argument