make source code easier to read
make source code easier to read

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