clean up sources to make them easier to read and understand
clean up sources to make them easier to read and understand

neicnordic/neic.no,neicnordic/neic.no,neicnordic/experimental.neic.nordforsk.org,neicnordic/neic.no,neicnordic/experimental.neic.nordforsk.org,neicnordic/experimental.neic.nordforsk.org