diff --git a/.clang-format b/.clang-format
new file mode 100644
index 00000000..e1f53046
--- /dev/null
+++ b/.clang-format
@@ -0,0 +1,136 @@
+---
+Language:        Cpp
+# BasedOnStyle:  LLVM
+AccessModifierOffset: -2
+AlignAfterOpenBracket: Align
+AlignConsecutiveMacros: false
+AlignConsecutiveAssignments: false
+AlignConsecutiveDeclarations: false
+AlignEscapedNewlines: Right
+AlignOperands:   true
+AlignTrailingComments: true
+AllowAllArgumentsOnNextLine: true
+AllowAllConstructorInitializersOnNextLine: true
+AllowAllParametersOfDeclarationOnNextLine: true
+AllowShortBlocksOnASingleLine: Never
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: All
+AllowShortLambdasOnASingleLine: All
+AllowShortIfStatementsOnASingleLine: Never
+AllowShortLoopsOnASingleLine: false
+AlwaysBreakAfterDefinitionReturnType: None
+AlwaysBreakAfterReturnType: None
+AlwaysBreakBeforeMultilineStrings: false
+AlwaysBreakTemplateDeclarations: MultiLine
+BinPackArguments: true
+BinPackParameters: true
+BraceWrapping:
+  AfterCaseLabel:  true
+  AfterClass:      true
+  AfterControlStatement: true
+  AfterEnum:       true
+  AfterFunction:   true
+  AfterNamespace:  true
+  AfterObjCDeclaration: true
+  AfterStruct:     true
+  AfterUnion:      true
+  AfterExternBlock: true
+  BeforeCatch:     true
+  BeforeElse:      true
+  IndentBraces:    false
+  SplitEmptyFunction: false
+  SplitEmptyRecord: true
+  SplitEmptyNamespace: true
+BreakBeforeBinaryOperators: None
+BreakBeforeBraces: Custom
+BreakBeforeInheritanceComma: false
+BreakInheritanceList: BeforeColon
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializersBeforeComma: false
+BreakConstructorInitializers: BeforeColon
+BreakAfterJavaFieldAnnotations: false
+BreakStringLiterals: true
+ColumnLimit:     120
+CommentPragmas:  '^ IWYU pragma:'
+CompactNamespaces: false
+ConstructorInitializerAllOnOneLineOrOnePerLine: false
+ConstructorInitializerIndentWidth: 4
+ContinuationIndentWidth: 4
+Cpp11BracedListStyle: true
+DeriveLineEnding: true
+DerivePointerAlignment: false
+DisableFormat:   false
+ExperimentalAutoDetectBinPacking: false
+FixNamespaceComments: true
+ForEachMacros:
+  - foreach
+  - Q_FOREACH
+  - BOOST_FOREACH
+IncludeBlocks:   Preserve
+IncludeCategories:
+  - Regex:           '^"(llvm|llvm-c|clang|clang-c)/'
+    Priority:        2
+    SortPriority:    0
+  - Regex:           '^(<|"(gtest|gmock|isl|json)/)'
+    Priority:        3
+    SortPriority:    0
+  - Regex:           '.*'
+    Priority:        1
+    SortPriority:    0
+IncludeIsMainRegex: '(Test)?$'
+IncludeIsMainSourceRegex: ''
+IndentCaseLabels: false
+IndentGotoLabels: true
+IndentPPDirectives: None
+IndentWidth:     4
+IndentWrappedFunctionNames: false
+JavaScriptQuotes: Leave
+JavaScriptWrapImports: true
+KeepEmptyLinesAtTheStartOfBlocks: true
+MacroBlockBegin: ''
+MacroBlockEnd:   ''
+MaxEmptyLinesToKeep: 1
+NamespaceIndentation: None
+ObjCBinPackProtocolList: Auto
+ObjCBlockIndentWidth: 2
+ObjCSpaceAfterProperty: false
+ObjCSpaceBeforeProtocolList: true
+PenaltyBreakAssignment: 2
+PenaltyBreakBeforeFirstCallParameter: 19
+PenaltyBreakComment: 300
+PenaltyBreakFirstLessLess: 120
+PenaltyBreakString: 1000
+PenaltyBreakTemplateDeclaration: 10
+PenaltyExcessCharacter: 1000000
+PenaltyReturnTypeOnItsOwnLine: 60
+PointerAlignment: Right
+ReflowComments:  false
+SortIncludes:    true
+SortUsingDeclarations: true
+SpaceAfterCStyleCast: false
+SpaceAfterLogicalNot: false
+SpaceAfterTemplateKeyword: true
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeCpp11BracedList: false
+SpaceBeforeCtorInitializerColon: true
+SpaceBeforeInheritanceColon: true
+SpaceBeforeParens: ControlStatements
+SpaceBeforeRangeBasedForLoopColon: true
+SpaceInEmptyBlock: false
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 1
+SpacesInAngles:  false
+SpacesInConditionalStatement: false
+SpacesInContainerLiterals: true
+SpacesInCStyleCastParentheses: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+SpaceBeforeSquareBrackets: false
+Standard:        Latest
+StatementMacros:
+  - Q_UNUSED
+  - QT_REQUIRE_VERSION
+TabWidth:        8
+UseCRLF:         false
+UseTab:          Never
+...
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
new file mode 100644
index 00000000..255c1ed0
--- /dev/null
+++ b/.pre-commit-config.yaml
@@ -0,0 +1,32 @@
+exclude: "^.github/"
+repos:
+-   repo: https://github.com/pre-commit/mirrors-yapf.git
+    rev: v0.32.0
+    hooks:
+    -   id: yapf
+        additional_dependencies: [toml]
+-   repo: https://github.com/pre-commit/mirrors-clang-format.git
+    rev: v13.0.0
+    hooks:
+    -   id: clang-format
+-   repo: https://github.com/pre-commit/pre-commit-hooks.git
+    rev: v4.1.0
+    hooks:
+    -   id: trailing-whitespace
+        exclude: \.fits
+    -   id: end-of-file-fixer
+        exclude: \.fits
+    -   id: check-yaml
+    -   id: debug-statements
+    -   id: requirements-txt-fixer
+    -   id: check-added-large-files
+    -   id: check-ast
+    -   id: check-merge-conflict
+#-   repo: git://github.com/detailyang/pre-commit-shell
+#    rev: v1.0.6
+#    hooks:
+#    - id: shell-lint
+#-   repo: https://github.com/lovesegfault/beautysh.git
+#    rev: v6.2.1
+#    hooks:
+#    -   id: beautysh
diff --git a/.style.yapf b/.style.yapf
new file mode 100644
index 00000000..32fce91e
--- /dev/null
+++ b/.style.yapf
@@ -0,0 +1,182 @@
+[style]
+# Custom stylesheet for COMPASS python code
+# Relatively relax policy, trying to make nice, compact, complete lines
+
+# Align closing bracket with visual indentation.
+align_closing_bracket_with_visual_indent = True
+
+# Allow dictionary keys to exist on multiple lines. For example:
+#
+#   x = {
+#       ('this is the first element of a tuple',
+#        'this is the second element of a tuple'):
+#            value,
+#   }
+allow_multiline_dictionary_keys = True
+
+# Allow lambdas to be formatted on more than one line.
+allow_multiline_lambdas = True
+
+# Insert a blank line before a class-level docstring.
+blank_line_before_class_docstring = False
+
+# Insert a blank line before a 'def' or 'class' immediately nested
+# within another 'def' or 'class'. For example:
+#
+#   class Foo:
+#                      # <------ this blank line
+#     def method():
+#       ...
+blank_line_before_nested_class_or_def = True
+
+# Do not split consecutive brackets. Only relevant when
+# dedent_closing_brackets is set. For example:
+#
+#    call_func_that_takes_a_dict(
+#        {
+#            'key1': 'value1',
+#            'key2': 'value2',
+#        }
+#    )
+#
+# would reformat to:
+#
+#    call_func_that_takes_a_dict({
+#        'key1': 'value1',
+#        'key2': 'value2',
+#    })
+coalesce_brackets = True
+
+# The column limit.
+column_limit = 79
+
+# Indent width used for line continuations.
+continuation_indent_width = 8
+
+# Put closing brackets on a separate line, dedented, if the bracketed
+# expression can't fit in a single line. Applies to all kinds of brackets,
+# including function definitions and calls. For example:
+#
+#   config = {
+#       'key1': 'value1',
+#       'key2': 'value2',
+#   }        # <--- this bracket is dedented and on a separate line
+#
+#   time_series = self.remote_client.query_entity_counters(
+#       entity='dev3246.region1',
+#       key='dns.query_latency_tcp',
+#       transform=Transformation.AVERAGE(window=timedelta(seconds=60)),
+#       start_ts=now()-timedelta(days=3),
+#       end_ts=now(),
+#   )        # <--- this bracket is dedented and on a separate line
+dedent_closing_brackets = False
+
+# Place each dictionary entry onto its own line.
+each_dict_entry_on_separate_line = True
+
+# The regex for an i18n comment. The presence of this comment stops
+# reformatting of that line, because the comments are required to be
+# next to the string they translate.
+i18n_comment=
+
+# The i18n function call names. The presence of this function stops
+# reformattting on that line, because the string it has cannot be moved
+# away from the i18n comment.
+i18n_function_call=
+
+# Indent the dictionary value if it cannot fit on the same line as the
+# dictionary key. For example:
+#
+#   config = {
+#       'key1':
+#           'value1',
+#       'key2': value1 +
+#               value2,
+#   }
+indent_dictionary_value = True
+
+# The number of columns to use for indentation.
+indent_width=4
+
+# Join short lines into one line. E.g., single line 'if' statements.
+join_multiple_lines = True
+
+# Use spaces around default or named assigns.
+spaces_around_default_or_named_assign = False
+
+# Use spaces around the power operator.
+spaces_around_power_operator = False
+
+# The number of spaces required before a trailing comment.
+spaces_before_comment = 2
+
+# Insert a space between the ending comma and closing bracket of a list,
+# etc.
+space_between_ending_comma_and_closing_bracket = True
+
+# Split before arguments if the argument list is terminated by a
+# comma.
+split_arguments_when_comma_terminated = False
+
+# Set to True to prefer splitting before '&', '|' or '^' rather than
+# after.
+split_before_bitwise_operator = False
+
+# Split before a dictionary or set generator (comp_for). For example, note
+# the split before the 'for':
+#
+#   foo = {
+#       variable: 'Hello world, have a nice day!'
+#       for variable in bar if variable != 42
+#   }
+split_before_dict_set_generator = True
+
+# If an argument / parameter list is going to be split, then split before
+# the first argument.
+split_before_first_argument = False
+
+# Set to True to prefer splitting before 'and' or 'or' rather than
+# after.
+split_before_logical_operator = False
+
+# Split named assignments onto individual lines.
+split_before_named_assigns = False
+
+# The penalty for splitting right after the opening bracket.
+split_penalty_after_opening_bracket = 2600
+
+# The penalty for splitting the line after a unary operator.
+split_penalty_after_unary_operator = 10000
+
+# The penalty for splitting right before an if expression.
+split_penalty_before_if_expr = 0
+
+# The penalty of splitting the line around the '&', '|', and '^'
+# operators.
+split_penalty_bitwise_operator = 300
+
+# The penalty for characters over the column limit.
+split_penalty_excess_character = 4000
+
+# The penalty incurred by adding a line split to the unwrapped line. The
+# more line splits added the higher the penalty.
+split_penalty_for_added_line_split = 150
+
+# The penalty of splitting a list of "import as" names. For example:
+#
+#   from a_very_long_or_indented_module_name_yada_yad import (long_argument_1,
+#                                                             long_argument_2,
+#                                                             long_argument_3)
+#
+# would reformat to something like:
+#
+#   from a_very_long_or_indented_module_name_yada_yad import (
+#       long_argument_1, long_argument_2, long_argument_3)
+split_penalty_import_names = 0
+
+# The penalty of splitting the line around the 'and' and 'or'
+# operators.
+split_penalty_logical_operator = 300
+
+# Use the Tab character for indentation.
+use_tabs = False
diff --git a/.travis.yml b/.travis.yml
index c5251046..8a898062 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,4 +26,3 @@ script:
 - export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:${MILK_INSTALLDIR}/lib/pkgconfig
 - ls -l /usr/local/milk/bin/
 - ctest -D Experimental
-
diff --git a/CTestConfig.cmake b/CTestConfig.cmake
index 621e0332..d095c1d4 100644
--- a/CTestConfig.cmake
+++ b/CTestConfig.cmake
@@ -13,4 +13,3 @@ set(CTEST_DROP_METHOD "http")
 set(CTEST_DROP_SITE "my.cdash.org")
 set(CTEST_DROP_LOCATION "/submit.php?project=milk-core")
 set(CTEST_DROP_SITE_CDASH TRUE)
-
diff --git a/README.md b/README.md
index 6172605c..bc978d4f 100644
--- a/README.md
+++ b/README.md
@@ -63,5 +63,3 @@ Compile with coffee plugins:
 
     ./fetch_coffee_dev.sh
     ./compile.sh $PWD/local
-
-
diff --git a/compile.sh b/compile.sh
index 2eb2296f..98d081f9 100755
--- a/compile.sh
+++ b/compile.sh
@@ -3,7 +3,7 @@
 
 usage()
 {
-	echo -n "############################################################
+    echo -n "############################################################
 # Compile script for milk_package
 # Customize / add you own options
 # Use as-is, or make a local custom copy (private, do not commit)
@@ -40,12 +40,12 @@ Check you bashrc for
   export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:${MILK_INSTALLDIR}/lib/pkgconfig
 
 
-"
+    "
 }
 
 if [ "$1" == "-h" ]; then
-usage
-exit 1
+    usage
+    exit 1
 fi
 
 
@@ -68,18 +68,18 @@ BUILDTYPE=${MILK_BUILD_TYPE:-"Release"}
 
 if [ "${MILK_PYTHON}" == "OFF" ]; then
 
-echo "Compiling without Python wrapper"
-cmake .. $MILK_CMAKE_OPT -DCMAKE_INSTALL_PREFIX=$MILK_INSTALL_ROOT -DCMAKE_BUILD_TYPE=${BUILDTYPE}
+    echo "Compiling without Python wrapper"
+    cmake .. $MILK_CMAKE_OPT -DCMAKE_INSTALL_PREFIX=$MILK_INSTALL_ROOT -DCMAKE_BUILD_TYPE=${BUILDTYPE}
 
 else
-# find python executable
-pythonexec=$(which python)
-if command -v python3 &> /dev/null
-then
-    pythonexec=$(which python3)
-fi
-echo "using python at ${pythonexec}"
-cmake .. $MILK_CMAKE_OPT -Dbuild_python_module=ON -DPYTHON_EXECUTABLE=${pythonexec} -DCMAKE_INSTALL_PREFIX=$MILK_INSTALL_ROOT -DCMAKE_BUILD_TYPE=${BUILDTYPE}
+    # find python executable
+    pythonexec=$(which python)
+    if command -v python3 &> /dev/null
+    then
+        pythonexec=$(which python3)
+    fi
+    echo "using python at ${pythonexec}"
+    cmake .. $MILK_CMAKE_OPT -Dbuild_python_module=ON -DPYTHON_EXECUTABLE=${pythonexec} -DCMAKE_INSTALL_PREFIX=$MILK_INSTALL_ROOT -DCMAKE_BUILD_TYPE=${BUILDTYPE}
 fi
 
 
@@ -87,6 +87,3 @@ fi
 
 NCPUS=`fgrep processor /proc/cpuinfo | wc -l`
 cmake --build . -- -j $NCPUS
-
-
-
diff --git a/deploy_pre_commit.sh b/deploy_pre_commit.sh
new file mode 100755
index 00000000..0de61d0a
--- /dev/null
+++ b/deploy_pre_commit.sh
@@ -0,0 +1,43 @@
+#!/bin/bash
+
+if [[ ! -z "${MILK_ROOT}" ]]; then
+    echo "Changing dir to ${MILK_ROOT}"
+    cd ${MILK_ROOT}
+fi
+
+pip install pre-commit
+
+sudo apt install shellcheck
+
+pre-commit install
+
+
+for FOLD in $(ls -d ${MILK_ROOT}/plugins/milk-extra-src/*/); do
+    echo "Installing pre-commit in ${FOLD}"
+    cp ${MILK_ROOT}/.style.yapf ${FOLD}/
+    cp ${MILK_ROOT}/.pre-commit-config.yaml ${FOLD}/
+    cp ${MILK_ROOT}/.clang-format ${FOLD}/
+    cd ${FOLD}
+    pre-commit install
+    cd ${MILK_ROOT}
+done
+
+FOLD=${MILK_ROOT}/plugins/cacao-src/
+echo "Installing pre-commit in ${FOLD}"
+cp ${MILK_ROOT}/.style.yapf ${FOLD}/
+cp ${MILK_ROOT}/.pre-commit-config.yaml ${FOLD}/
+cp ${MILK_ROOT}/.clang-format ${FOLD}/
+cd ${FOLD}
+pre-commit install
+cd ${MILK_ROOT}
+
+FOLD=${MILK_ROOT}/plugins/coffee-src/
+echo "Installing pre-commit in ${FOLD}"
+cp ${MILK_ROOT}/.style.yapf ${FOLD}/
+cp ${MILK_ROOT}/.pre-commit-config.yaml ${FOLD}/
+cp ${MILK_ROOT}/.clang-format ${FOLD}/
+cd ${FOLD}
+pre-commit install
+cd ${MILK_ROOT}
+
+echo "Now you may run \"pre-commit run --all-files\" here and in plugin repos"
diff --git a/deployconfig b/deployconfig
deleted file mode 100755
index a81df0b5..00000000
--- a/deployconfig
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-cp devscripts/pre-commit .git/hooks/
diff --git a/devscripts/apply-format b/devscripts/apply-format
new file mode 100755
index 00000000..653f06d0
--- /dev/null
+++ b/devscripts/apply-format
@@ -0,0 +1,342 @@
+#! /bin/bash
+#
+# Copyright 2018 Undo Ltd.
+#
+# https://github.com/barisione/clang-format-hooks
+
+# Force variable declaration before access.
+set -u
+# Make any failure in piped commands be reflected in the exit code.
+set -o pipefail
+
+readonly bash_source="${BASH_SOURCE[0]:-$0}"
+
+##################
+# Misc functions #
+##################
+
+function error_exit() {
+    for str in "$@"; do
+        echo -n "$str" >&2
+    done
+    echo >&2
+
+    exit 1
+}
+
+
+########################
+# Command line parsing #
+########################
+
+function show_help() {
+    if [ -t 1 ] && hash tput 2> /dev/null; then
+        local -r b=$(tput bold)
+        local -r i=$(tput sitm)
+        local -r n=$(tput sgr0)
+    else
+        local -r b=
+        local -r i=
+        local -r n=
+    fi
+
+    cat << EOF
+${b}SYNOPSIS${n}
+
+    To reformat git diffs:
+
+        ${i}$bash_source [OPTIONS] [FILES-OR-GIT-DIFF-OPTIONS]${n}
+
+    To reformat whole files, including unchanged parts:
+
+        ${i}$bash_source [-f | --whole-file] FILES${n}
+
+${b}DESCRIPTION${n}
+
+    Reformat C or C++ code to match a specified formatting style.
+
+    This command can either work on diffs, to reformat only changed parts of
+    the code, or on whole files (if -f or --whole-file is used).
+
+    ${b}FILES-OR-GIT-DIFF-OPTIONS${n}
+        List of files to consider when applying clang-format to a diff. This is
+        passed to "git diff" as is, so it can also include extra git options or
+        revisions.
+        For example, to apply clang-format on the changes made in the last few
+        revisions you could use:
+            ${i}\$ $bash_source HEAD~3${n}
+
+    ${b}FILES${n}
+        List of files to completely reformat.
+
+    ${b}-f, --whole-file${n}
+        Reformat the specified files completely (including parts you didn't
+        change).
+        The fix is printed on stdout by default. Use -i if you want to modify
+        the files on disk.
+
+    ${b}--staged, --cached${n}
+        Reformat only code which is staged for commit.
+        The fix is printed on stdout by default. Use -i if you want to modify
+        the files on disk.
+
+    ${b}-i${n}
+        Reformat the code and apply the changes to the files on disk (instead
+        of just printing the fix on stdout).
+
+    ${b}--apply-to-staged${n}
+        This is like specifying both --staged and -i, but the formatting
+        changes are also staged for commit (so you can just use "git commit"
+        to commit what you planned to, but formatted correctly).
+
+    ${b}--style STYLE${n}
+        The style to use for reformatting code.
+        If no style is specified, then it's assumed there's a .clang-format
+        file in the current directory or one of its parents.
+
+    ${b}--help, -h, -?${n}
+        Show this help.
+EOF
+}
+
+# getopts doesn't support long options.
+# getopt mangles stuff.
+# So we parse manually...
+declare positionals=()
+declare has_positionals=false
+declare whole_file=false
+declare apply_to_staged=false
+declare staged=false
+declare in_place=false
+declare style=file
+declare ignored=()
+while [ $# -gt 0 ]; do
+    declare arg="$1"
+    shift # Past option.
+    case "$arg" in
+        -h | -\? | --help )
+            show_help
+            exit 0
+            ;;
+        -f | --whole-file )
+            whole_file=true
+            ;;
+        --apply-to-staged )
+            apply_to_staged=true
+            ;;
+        --cached | --staged )
+            staged=true
+            ;;
+        -i )
+            in_place=true
+            ;;
+        --style=* )
+            style="${arg//--style=/}"
+            ;;
+        --style )
+            [ $# -gt 0 ] || \
+                error_exit "No argument for --style option."
+            style="$1"
+            shift
+            ;;
+        --internal-opt-ignore-regex=* )
+            ignored+=("${arg//--internal-opt-ignore-regex=/}")
+            ;;
+        --internal-opt-ignore-regex )
+            ignored+=("${arg//--internal-opt-ignore-regex=/}")
+            [ $# -gt 0 ] || \
+                error_exit "No argument for --internal-opt-ignore-regex option."
+            ignored+=("$1")
+            shift
+            ;;
+        -- )
+            # Stop processing further arguments.
+            if [ $# -gt 0 ]; then
+                positionals+=("$@")
+                has_positionals=true
+            fi
+            break
+            ;;
+        -* )
+            error_exit "Unknown argument: $arg"
+            ;;
+        *)
+            positionals+=("$arg")
+            ;;
+    esac
+done
+
+# Restore positional arguments, access them from "$@".
+if [ ${#positionals[@]} -gt 0 ]; then
+    set -- "${positionals[@]}"
+    has_positionals=true
+fi
+
+[ -n "$style" ] || \
+    error_exit "If you use --style you need to specify a valid style."
+
+#######################################
+# Detection of clang-format & friends #
+#######################################
+
+# clang-format.
+declare format="${CLANG_FORMAT:-}"
+if [ -z "$format" ]; then
+    format=$(type -p clang-format)
+fi
+
+if [ -z "$format" ]; then
+    error_exit \
+        $'You need to install clang-format.\n' \
+        $'\n' \
+        $'On Ubuntu/Debian this is available in the clang-format package or, in\n' \
+        $'older distro versions, clang-format-VERSION.\n' \
+        $'On Fedora it\'s available in the clang package.\n' \
+        $'You can also specify your own path for clang-format by setting the\n' \
+        $'$CLANG_FORMAT environment variable.'
+fi
+
+# clang-format-diff.
+if [ "$whole_file" = false ]; then
+    invalid="/dev/null/invalid/path"
+    if [ "${OSTYPE:-}" = "linux-gnu" ]; then
+        readonly sort_version=-V
+    else
+        # On macOS, sort doesn't have -V.
+        readonly sort_version=-n
+    fi
+    declare paths_to_try=()
+    # .deb packages directly from upstream.
+    # We try these first as they are probably newer than the system ones.
+    while read -r f; do
+        paths_to_try+=("$f")
+    done < <(compgen -G "/usr/share/clang/clang-format-*/clang-format-diff.py" | sort "$sort_version" -r)
+    # LLVM official releases (just untarred in /usr/local).
+    while read -r f; do
+        paths_to_try+=("$f")
+    done < <(compgen -G "/usr/local/clang+llvm*/share/clang/clang-format-diff.py" | sort "$sort_version" -r)
+    # Maybe it's in the $PATH already? This is true for Ubuntu and Debian.
+    paths_to_try+=( \
+            "$(type -p clang-format-diff 2> /dev/null || echo "$invalid")" \
+            "$(type -p clang-format-diff.py 2> /dev/null || echo "$invalid")" \
+        )
+    # Fedora.
+    paths_to_try+=( \
+            /usr/share/clang/clang-format-diff.py \
+        )
+    # Gentoo.
+    while read -r f; do
+        paths_to_try+=("$f")
+    done < <(compgen -G "/usr/lib/llvm/*/share/clang/clang-format-diff.py" | sort -n -r)
+    # Homebrew.
+    while read -r f; do
+        paths_to_try+=("$f")
+    done < <(compgen -G "/usr/local/Cellar/clang-format/*/share/clang/clang-format-diff.py" | sort -n -r)
+
+    declare format_diff=
+
+    # Did the user specify a path?
+    if [ -n "${CLANG_FORMAT_DIFF:-}" ]; then
+        format_diff="$CLANG_FORMAT_DIFF"
+    else
+        for path in "${paths_to_try[@]}"; do
+            if [ -e "$path" ]; then
+                # Found!
+                format_diff="$path"
+                if [ ! -x "$format_diff" ]; then
+                    format_diff="python $format_diff"
+                fi
+                break
+            fi
+        done
+    fi
+
+    if [ -z "$format_diff" ]; then
+        error_exit \
+            $'Cannot find clang-format-diff which should be shipped as part of the same\n' \
+            $'package where clang-format is.\n' \
+            $'\n' \
+            $'Please find out where clang-format-diff is in your distro and report an issue\n' \
+            $'at https://github.com/barisione/clang-format-hooks/issues with details about\n' \
+            $'your operating system and setup.\n' \
+            $'\n' \
+            $'You can also specify your own path for clang-format-diff by setting the\n' \
+            $'$CLANG_FORMAT_DIFF environment variable, for instance:\n' \
+            $'\n' \
+            $'    CLANG_FORMAT_DIFF="python /.../clang-format-diff.py" \\\n' \
+            $'        ' "$bash_source"
+    fi
+
+    readonly format_diff
+fi
+
+
+############################
+# Actually run the command #
+############################
+
+if [ "$whole_file" = true ]; then
+
+    [ "$has_positionals" = true ] || \
+        error_exit "No files to reformat specified."
+    [ "$staged" = false ] || \
+        error_exit "--staged/--cached only make sense when applying to a diff."
+
+    read -r -a format_args <<< "$format"
+    format_args+=("-style=file")
+    [ "$in_place" = true ] && format_args+=("-i")
+
+    "${format_args[@]}" "$@"
+
+else # Diff-only.
+
+    if [ "$apply_to_staged" = true ]; then
+        [ "$staged" = false ] || \
+            error_exit "You don't need --staged/--cached with --apply-to-staged."
+        [ "$in_place" = false ] || \
+            error_exit "You don't need -i with --apply-to-staged."
+        staged=true
+        readonly patch_dest=$(mktemp)
+        trap '{ rm -f "$patch_dest"; }' EXIT
+    else
+        readonly patch_dest=/dev/stdout
+    fi
+
+    declare git_args=(git diff -U0 --no-color)
+    [ "$staged" = true ] && git_args+=("--staged")
+
+    # $format_diff may contain a command ("python") and the script to excute, so we
+    # need to split it.
+    read -r -a format_diff_args <<< "$format_diff"
+    [ "$in_place" = true ] && format_diff_args+=("-i")
+
+    # Build the regex for paths to consider or ignore.
+    # We use negative lookahead assertions which preceed the list of allowed patterns
+    # (that is, the extensions we want).
+    exclusions_regex=
+    if [ "${#ignored[@]}" -gt 0 ]; then
+        for pattern in "${ignored[@]}"; do
+            exclusions_regex="$exclusions_regex(?!$pattern)"
+        done
+    fi
+
+    "${git_args[@]}" "$@" \
+        | "${format_diff_args[@]}" \
+        -p1 \
+        -style="$style" \
+        -iregex="$exclusions_regex"'.*\.(c|cpp|cxx|cc|h|hpp|m|mm|js|java)' \
+        > "$patch_dest" \
+        || exit 1
+
+    if [ "$apply_to_staged" = true ]; then
+        if [ ! -s "$patch_dest" ]; then
+            echo "No formatting changes to apply."
+            exit 0
+        fi
+        patch -p0 < "$patch_dest" || \
+            error_exit "Cannot apply fix to local files."
+        git apply -p0 --cached < "$patch_dest" || \
+            error_exit "Cannot apply fix to git staged changes."
+    fi
+
+fi
diff --git a/devscripts/pre-commit b/devscripts/pre-commit
index c30fd953..83e85bf4 100755
--- a/devscripts/pre-commit
+++ b/devscripts/pre-commit
@@ -1,4 +1,3 @@
 #!/bin/sh
 
 ./devscripts/precommit-code-format
-
diff --git a/devscripts/precommit-code-format b/devscripts/precommit-code-format
index 6d85f4b5..d8069fda 100755
--- a/devscripts/precommit-code-format
+++ b/devscripts/precommit-code-format
@@ -6,14 +6,13 @@ RETURN=0
 
 ASTYLECMD=$(which astyle)
 if [ $? -ne 0 ]; then
-	echo "[!] astyle not installed. Unable to check source file format policy." >&2
-	exit 1
+    echo "[!] astyle not installed. Unable to check source file format policy." >&2
+    exit 1
 fi
 
 FILES=$(git diff --cached --name-only --diff-filter=ACMR | grep -E "\.(c|cpp|h)$")
 for FILE in $FILES; do
-	$ASTYLECMD $ASTYLEOPTIONS $FILE -n
+    $ASTYLECMD $ASTYLEOPTIONS $FILE -n
 done
 
 exit $RETURN
-
diff --git a/doc/CLI_Overview.md b/doc/CLI_Overview.md
index 24136480..f65cc2dd 100644
--- a/doc/CLI_Overview.md
+++ b/doc/CLI_Overview.md
@@ -7,4 +7,3 @@ The entire C code is compiled into a single executable :
 Running the executable starts a command line interface (CLI) prompt from which all functions can be launched.
 
 The source code is organized in modules. A module included C code and documentation. It may also include data files and extended documentation. Run `m?` in the CLI prompt to list modules.
- 
diff --git a/doc/CLIcore.md b/doc/CLIcore.md
index 44e804c9..267419c3 100644
--- a/doc/CLIcore.md
+++ b/doc/CLIcore.md
@@ -1,22 +1,22 @@
-# Command Line Interface Syntax {#page_command_line_interface}  
+# Command Line Interface Syntax {#page_command_line_interface}
 
 Files CLIcore.c and CLIcore.h contain the source code for the command line interpreter (CLI)
 
 ## COMMAND LINE OPTIONS
 
 \verbatim
-  -h, --help 
+  -h, --help
 	print this message and exit
   -i, --info
 	Print version, settings, info and exit
   -j, --journal
-	keeps journal of commands - TO BE IMPLEMENTED 
+	keeps journal of commands - TO BE IMPLEMENTED
 	Write all commands to file "cfits_cmdlog.txt" as they are entered
   --verbose
 	be verbose
   -d, --debug=DEBUGLEVEL
 	Set debug level at startup
-  -o, --overwrite 
+  -o, --overwrite
 	Automatically overwrite files if necessary (USE WITH CAUTION - WILL OVERWRITE EXISTING FITS FILES)
   -l
 	Keeps a list of images in file imlist.txt
@@ -61,7 +61,7 @@ Tab completion is provided and behaves as follows:
 
 GNU readline used to read input. See GNU readline documentation on http://tiswww.case.edu/php/chet/readline/rltop.html. For a quick help on readline input, type:
 \verbatim
-> helprl 
+> helprl
 \endverbatim
 
 The command line interpreter (CLI) will take input from file cmdfile.txt if it exists. If file cmdfile.txt exists commands will be read one by one from top to bottom, and will be removed from the file as they are read, until the file is empty
@@ -71,21 +71,21 @@ The command line interpreter (CLI) will take input from file cmdfile.txt if it e
 
 \verbatim
 > ?
-> help			     
+> help
 	# print this help file
-> helprl		     
+> helprl
 	# print readline quick help
-> lm?                        
+> lm?
 	# list all modules loaded
-> m? <module>               
+> m? <module>
 	# list all commands for a module
-> m?                    
+> m?
 	# perform m? on all modules loaded
-> cmd? <command>              
+> cmd? <command>
 	# command description for <command>
-> cmd?                    
+> cmd?
 	# command description for all commands
-> h? str                    
+> h? str
 	# search for string <str> in all commands and their descriptions
 \endverbatim
 
@@ -95,20 +95,20 @@ The command line interpreter (CLI) will take input from file cmdfile.txt if it e
 \verbatim
 > ci
 	# compilation time and memory usage
-> listim 
+> listim
 	# list all images in memory
-> listimf <filename> 
+> listimf <filename>
 	# list all images in memory and write output to file <filename>
-> !<syscommand>             
+> !<syscommand>
 	# execute system command
-> showhist                  
+> showhist
 	# prints history of all commands
-> quit                      
+> quit
 	# exit Cfits (exit also works)
 
-> setdp <val> 		     
+> setdp <val>
 	# set default precision to float (<val> = 0) or double (<val> = 1)
-> creaim <im> <xs> <ys>     
+> creaim <im> <xs> <ys>
 	# creates a 2D image named <im>, size = <xs> x <ys> pixels
 \endverbatim
 
@@ -119,30 +119,30 @@ FITSIO is used for FITS files I/O, see FITSIO documentation for more detailed in
 ## LOADING FILES
 
 \verbatim
-> loadfits <fname> <imname> 
+> loadfits <fname> <imname>
 	# load FITS file <fname> into image <imname>
-> loadfits im1.fits imf1    
+> loadfits im1.fits imf1
 	# load file im1.fits in memory with name imf1
-> loadfits im1.fits	     
+> loadfits im1.fits
 	# load file im1.fits in memory with name im1 (default name is composed of all chars before first ".")
-> loadfits im1.fits.gz im1  
+> loadfits im1.fits.gz im1
 	# load compressed file
 \endverbatim
 
 ## SAVING FILES
 
 \verbatim
-> save_fl  <imname> <fname> 
+> save_fl  <imname> <fname>
 	# save image <imname> into FITS file <fname> (float)
-> save_fl im1 imf1.fits      
+> save_fl im1 imf1.fits
 	# write image im1 to disk file imf1.fits
 > save_fl im1
 	# write image im1 to disk file im1.fits (default file name = image name + ".fits")
-> save_fl im1 "!im1.fits"   
+> save_fl im1 "!im1.fits"
 	# overwrite file im1.fits if it exists
 > save_fl im1 "../dir2/im1.fits"
 	# specify full path
-> save_fl im1 im1.fits.gz   
+> save_fl im1 im1.fits.gz
 	# save compressed image
 \endverbatim
 
@@ -172,15 +172,6 @@ If you start Cfits with the "-l" option,  the file "imlist.txt" contains the lis
 # ARITHMETIC OPERATIONS
 
 \verbatim
-> im1=sqrt(im+2.0)          
+> im1=sqrt(im+2.0)
 	# will perform an arithmetic operation on image im and store the result in image im1
 \endverbatim
-
-
-
-
-
-
-
-
-
diff --git a/doc/TemplateSourceCode.md b/doc/TemplateSourceCode.md
index 46dba62e..8c08a001 100644
--- a/doc/TemplateSourceCode.md
+++ b/doc/TemplateSourceCode.md
@@ -5,15 +5,13 @@ Documentation should appear before each function in the .c and .h files, followi
 
 ## .h file
 
-<a href="../src/CommandLineInterface/doc/templatemodule/templatemodule.h">Download templatemodule.h</a> 
+<a href="../src/CommandLineInterface/doc/templatemodule/templatemodule.h">Download templatemodule.h</a>
 
 See corresponding doxygen documentation : templatemodule/templatemodule.h
 
 
 ## .c file
 
-<a href="../src/CommandLineInterface/doc/templatemodule/templatemodule.c">Download templatemodule.c</a> 
+<a href="../src/CommandLineInterface/doc/templatemodule/templatemodule.c">Download templatemodule.c</a>
 
 See corresponding doxygen documentation : templatemodule/templatemodule.c
-
-
diff --git a/doc/coding_standards.md b/doc/coding_standards.md
index feebc9af..c9eaa037 100644
--- a/doc/coding_standards.md
+++ b/doc/coding_standards.md
@@ -12,4 +12,3 @@
 - @subpage page_ProcessInfoStructure
 - @subpage page_FunctionParameterStructure
 - @subpage page_exampleBASHscript
-
diff --git a/doc/help.txt b/doc/help.txt
index d7bdf533..f73489de 100644
--- a/doc/help.txt
+++ b/doc/help.txt
@@ -3,7 +3,7 @@
 -----------------------------------------------------------------------------------
 COMMAND LINE OPTIONS
 
-  -h, --help 
+  -h, --help
 	print this message and exit
   -i, --info
 	Print version, settings, info and exit
@@ -11,12 +11,12 @@ COMMAND LINE OPTIONS
 	be verbose
   -d, --debug=DEBUGLEVEL
 	Set debug level at startup
-  -o, --overwrite         
+  -o, --overwrite
 	Automatically overwrite files if necessary (USE WITH CAUTION - WILL OVERWRITE EXISTING FITS FILES)
   -e, --idle
 	Only run process when X is idle (WARNING: PREVENTS INTERACTIVE USER INPUT)
 	Requires script runidle
-  --listimfile	  
+  --listimfile
 	Keeps a list of images in file imlist.txt
   -m, --mmon=TTYDEVICE
 	open memory monitor on tty device
@@ -58,7 +58,7 @@ Tab completion is provided and behaves as follows:
 INPUT
 
 GNU readline used to read input. See GNU readline documentation on http://tiswww.case.edu/php/chet/readline/rltop.html. For a quick help on readline input, type:
-> helprl 
+> helprl
 
 The command line interpreter (CLI) will take input from file cmdfile.txt if it exists. If file cmdfile.txt exists commands will be read one by one from top to bottom, and will be removed from the file as they are read, until the file is empty
 
@@ -66,21 +66,21 @@ The command line interpreter (CLI) will take input from file cmdfile.txt if it e
 HELP COMMANDS
 
 > ?
-> help			     
+> help
 	# print this help file
-> helprl		     
+> helprl
 	# print readline quick help
-> lm?                        
+> lm?
 	# list all modules loaded
-> m? <module>               
+> m? <module>
 	# list all commands for a module
-> m?                    
+> m?
 	# perform m? on all modules loaded
-> cmd? <command>              
+> cmd? <command>
 	# command description for <command>
-> cmd?                    
+> cmd?
 	# command description for all commands
-> h? str                    
+> h? str
 	# search for string <str> in all commands and their descriptions
 
 -----------------------------------------------------------------------------------
@@ -88,17 +88,17 @@ IMPORTANT COMMANDS
 
 > ci
 	# compilation time and memory usage
-> listim                    
+> listim
 	# list all images in memory
-> listimf <filename>        
+> listimf <filename>
 	# list all images in memory and write output to file <filename>
-> !<syscommand>             
+> !<syscommand>
 	# execute system command
-> showhist                  
+> showhist
 	# prints history of all commands
-> quit                      
+> quit
 	# exit Cfits (exit also works)
-> creaim <im> <xs> <ys>     
+> creaim <im> <xs> <ys>
 	# creates a 2D image named <im>, size = <xs> x <ys> pixels
 
 -----------------------------------------------------------------------------------
@@ -108,28 +108,28 @@ FITSIO is used for FITS files I/O, see FITSIO documentation for more detailed in
 
 LOADING FILES
 
-> loadfits <fname> <imname> 
+> loadfits <fname> <imname>
 	# load FITS file <fname> into image <imname>
-> loadfits im1.fits imf1    
+> loadfits im1.fits imf1
 	# load file im1.fits in memory with name imf1
-> loadfits im1.fits	     
+> loadfits im1.fits
 	# load file im1.fits in memory with name im1 (default name is composed of all chars before first ".")
-> loadfits im1.fits.gz im1  
+> loadfits im1.fits.gz im1
 	# load compressed file
 
 SAVING FILES
 
-> savefits  <imname> <fname> 
-	# save image <imname> into FITS file <fname> 
-> savefits im1 imf1.fits      
+> savefits  <imname> <fname>
+	# save image <imname> into FITS file <fname>
+> savefits im1 imf1.fits
 	# write image im1 to disk file imf1.fits
 > savefits im1
 	# write image im1 to disk file im1.fits (default file name = image name + ".fits")
-> savefits im1 "!im1.fits"   
+> savefits im1 "!im1.fits"
 	# overwrite file im1.fits if it exists
 > savefits im1 "../dir2/im1.fits"
 	# specify full path
-> savefits im1 im1.fits.gz   
+> savefits im1 im1.fits.gz
 	# save compressed image
 
 -----------------------------------------------------------------------------------
@@ -141,11 +141,11 @@ You can control the executable through a named pipe (fifo), which is created by
 
 By default, the fifo is created in the local directory, with the name "clififo", to pipe commands into the command line interface. You can opt out of the fifo feature by adding the option --nofifo to the command line executable, or rename the fifo with the -f option :
 <executable> -f "/tmp/fifo145.txt"
-This will create a fifo named /tmp/fifo145.txt. 
+This will create a fifo named /tmp/fifo145.txt.
 
 Other programs can write to the fifo to issue commands to the executable, such as:
 cat myscript.txt > clififo
-More complex commands can be issued within the executable using the fifo. 
+More complex commands can be issued within the executable using the fifo.
 For example, to load all im*.fits files in memory, you can type within the executable:
 
 > !ls im*.fits | xargs -I {} echo loadfits {} >> clififo
@@ -162,8 +162,7 @@ Note that if you launch several instances of the executable in the same director
 -----------------------------------------------------------------------------------
 ARITHMETIC OPERATIONS
 
-> im1=sqrt(im+2.0)          
+> im1=sqrt(im+2.0)
 	# will perform an arithmetic operation on image im and store the result in image im1
 
 -----------------------------------------------------------------------------------
-
diff --git a/doc/helpreadline.md b/doc/helpreadline.md
index 67643a02..34ad379f 100644
--- a/doc/helpreadline.md
+++ b/doc/helpreadline.md
@@ -2,11 +2,11 @@
 
 
 The command line interface (CLI) uses readline to take input command for keyboard. Readline offers convenient bindings, listed in this page.
- 
+
 For more information, consult the readline library documentation.
 
 
-<pre> 
+<pre>
 
 READLINE QUICK HELP
 
@@ -15,34 +15,32 @@ Notations:
 C- is control key
 M- is meta key (if already bound to action, use ESC and then type the folling character)
 
-C-_ or C-x C-u    Undo the last editing command. You can undo all the way back to an empty line. 
+C-_ or C-x C-u    Undo the last editing command. You can undo all the way back to an empty line.
 C-a	    Move to the start of the line
 C-e         Move to the end of the line
-M-f         Move forward a word, where a word is composed of letters and digits. 
-M-b         Move backward a word. 
-C-l         Clear the screen, reprinting the current line at the top. 
+M-f         Move forward a word, where a word is composed of letters and digits.
+M-b         Move backward a word.
+C-l         Clear the screen, reprinting the current line at the top.
 
 C-k         Kill the text from the current cursor position to the end of the line.
-M-d         Kill from the cursor to the end of the current word, or, if between words, to the end of the next word. 
-M-DEL       Kill from the cursor the start of the current word, or, if between words, to the start of the previous 
+M-d         Kill from the cursor to the end of the current word, or, if between words, to the end of the next word.
+M-DEL       Kill from the cursor the start of the current word, or, if between words, to the start of the previous
 C-w         Kill from the cursor to the previous whitespace. This is different than M-DEL because the word boundaries differ.
 
 C-y         Yank the most recently killed text back into the buffer at the cursor.
-M-y         Rotate the kill-ring, and yank the new top. You can only do this if the prior command is C-y or ESC y. 
+M-y         Rotate the kill-ring, and yank the new top. You can only do this if the prior command is C-y or ESC y.
 
 M-<         Move to the first line in the history.
-M->         Move to the end of the input history, i.e., the line currently being entered. 
+M->         Move to the end of the input history, i.e., the line currently being entered.
 
 C-t	    Drag the character before the cursor forward over the character at the cursor, moving the cursor forward as well. If the insertion point is at the end of the line, then this transposes the last two characters of the line. Negative arguments have no effect.
 M-t	    Drag the word before point past the word after point, moving point past that word as well. If the insertion point is at the end of the line, this transposes the last two words on the line.
 M-u	    Uppercase the current (or following) word. With a negative argument, uppercase the previous word, but do not move the cursor.
 M-l	    Lowercase the current (or following) word. With a negative argument, lowercase the previous word, but do not move the cursor.
-M-c	    Capitalize the current (or following) word. With a negative argument, capitalize the previous word, but do not move the cursor. 
+M-c	    Capitalize the current (or following) word. With a negative argument, capitalize the previous word, but do not move the cursor.
 
 TAB         Attempt to perform completion on the text before point. The actual completion performed is application-specific. The default is filename completion.
 M-?         List the possible completions of the text before point.
-M-*         Insert all completions of the text before point that would have been generated by possible-completions. 
+M-*         Insert all completions of the text before point that would have been generated by possible-completions.
 
 </pre>
-
-
diff --git a/doc/templatemodule/templatemodule.c b/doc/templatemodule/templatemodule.c
index 23fb9cca..e2102e2b 100644
--- a/doc/templatemodule/templatemodule.c
+++ b/doc/templatemodule/templatemodule.c
@@ -5,12 +5,12 @@
  * Follow this template to write your C code
  * The template includes examples of frequently used coding practices
  * and doxygen-based documentation
- * 
+ *
  * Source code includes notes (comments):
  * - CODING STANDARD NOTE : note about coding practices and standards
  * - DOCUMENTATION NOTE : how to document code
- * 
- * 
+ *
+ *
  * ## Other files of interest
  * Each module should include :
  * - souce code (.c file)
@@ -19,21 +19,15 @@
  * ## Change log
  * - 20180120  Guyon   Added mode documentation
  * - 20170813  Guyon   Added some documentation
- * 
+ *
  * @author  O. Guyon
  *
  * @bug No known bugs.
  *
  */
 
-
 /** @defgroup RTfunctions Functions with high priority scheduler */
 
-
-
-
-
-
 /// CODING STANDARD NOTE: code indented by : bash -c "astyle --indent-classes -Y"
 
 /* =============================================================================================== */
@@ -48,25 +42,20 @@
 
 /// CODING STANDARD NOTE: document any unusual head file include
 
-#include <strangefile.h>     // module strangefile does strange things, which we need in this module
-
+#include <strangefile.h> // module strangefile does strange things, which we need in this module
 
 // frequently included
-#include <fitsio.h>
-#include "CLIcore.h"
 #include "00CORE/00CORE.h"
-#include "COREMOD_memory/COREMOD_memory.h"
+#include "CLIcore.h"
+#include "COREMOD_arith/COREMOD_arith.h"
 #include "COREMOD_iofits/COREMOD_iofits.h"
+#include "COREMOD_memory/COREMOD_memory.h"
 #include "COREMOD_tools/COREMOD_tools.h"
-#include "COREMOD_arith/COREMOD_arith.h"
-
-
+#include <fitsio.h>
 
 // CODING STANDARD NOTE: include function prototypes for this module
 #include "templatemodule/templatemodule.h"
 
-
-
 /* =============================================================================================== */
 /* =============================================================================================== */
 /*                                      DEFINES, MACROS                                            */
@@ -76,31 +65,26 @@
 // CODING STANDARD NOTE: start with defines
 // CODING STANDARD NOTE: #define constants should be in all CAPS
 // CODING STANDARD NOTE: do not use names starting or ending with "_" (reserved for system)
-#define TWOPLUSTWO	4
+#define TWOPLUSTWO 4
 #define NAME_STRING_MAXSIZE 100
 #define FNAME_STRING_MAXSIZE 200
 #define COMMAND_STRING_MAXSIZE 200
 
-
 // CODING STANDARD NOTE: list function macros after defines
 // CODING STANDARD NOTE: function macro start with module name when specific to current module
-#define ABS(x)                         (((x) < 0) ? -(x) : (x))
-#define EXAMPLEMODULE_MAX(a,b)         ((a < b) ?  (b) : (a))
+#define ABS(x) (((x) < 0) ? -(x) : (x))
+#define EXAMPLEMODULE_MAX(a, b) ((a < b) ? (b) : (a))
 
 // CODING STANDARD NOTE: list typedefs after function macros
 
 // CODING STANDARD NOTE: list enums after typedefs
 
-
-
-
 /* =============================================================================================== */
 /* =============================================================================================== */
 /*                                  GLOBAL DATA DECLARATION                                        */
 /* =============================================================================================== */
 /* =============================================================================================== */
 
-
 // CODING STANDARD NOTE: Function, typedef, and variable names, as well as struct, union, and enum tag names should be in lower case
 // CODING STANDARD NOTE:
 
@@ -110,10 +94,6 @@
 
 // static globals
 
-
-
-
-
 /* =============================================================================================== */
 /* =============================================================================================== */
 /*                           FUNCTIONS TIED TO COMMAND LINE INTERFACE (CLI)                        */
@@ -131,30 +111,32 @@
 // 2: long
 // 3: string, not existing image
 // 4: existing image
-// 5: string 
+// 5: string
 //
 
-
 // CODING STANDARD NOTE: CLI function name should be function name + "_cli", with no argument
-int_fast8_t templatemodule_examplefunction00_cli() {
-    if(CLI_checkarg(1,2)==0) {
+int_fast8_t templatemodule_examplefunction00_cli()
+{
+    if (CLI_checkarg(1, 2) == 0)
+    {
         templatemodule_examplefunction00(data.cmdargtoken[1].val.numl);
         return 0;
     }
-    else return 1;
+    else
+        return 1;
 }
 
-int_fast8_t templatemodule_examplefunction01_cli() {
-    if(CLI_checkarg(1,1)+CLI_checkarg(2,2)==0) {
+int_fast8_t templatemodule_examplefunction01_cli()
+{
+    if (CLI_checkarg(1, 1) + CLI_checkarg(2, 2) == 0)
+    {
         templatemodule_examplefunction01(data.cmdargtoken[1].val.numl, data.cmdargtoken[2].val.numf, NULL);
         return 0;
     }
-    else return 1;
+    else
+        return 1;
 }
 
-
-
-
 /* =============================================================================================== */
 /* =============================================================================================== */
 /*                                    MODULE INITIALIZATION                                        */
@@ -170,40 +152,24 @@ int_fast8_t init_templatemodule()
     strcpy(data.module[data.NBmodule].info, "AO loop control");
     data.NBmodule++;
 
+    // CODING STANDARD NOTE: follow this template to link function calls to the command line interface
+    // CODING STANDARD NOTE: arg1 : function name in command line
+    // CODING STANDARD NOTE: arg2 : module name (= __FILE__)
+    // CODING STANDARD NOTE: arg3 : C call
+    // CODING STANDARD NOTE: arg4 : one-line description
+    // CODING STANDARD NOTE: arg5 : arguments. <arg1 [type]> <arg2 [type]> ...
+    // CODING STANDARD NOTE: arg6 : example call from CLI
+    // CODING STANDARD NOTE: arg7 : C call syntax
 
-	// CODING STANDARD NOTE: follow this template to link function calls to the command line interface
-	// CODING STANDARD NOTE: arg1 : function name in command line
-	// CODING STANDARD NOTE: arg2 : module name (= __FILE__)
-	// CODING STANDARD NOTE: arg3 : C call
-	// CODING STANDARD NOTE: arg4 : one-line description
-	// CODING STANDARD NOTE: arg5 : arguments. <arg1 [type]> <arg2 [type]> ...
-	// CODING STANDARD NOTE: arg6 : example call from CLI
-	// CODING STANDARD NOTE: arg7 : C call syntax
-
-    RegisterCLIcommand("clicmdname", 
-                       __FILE__,
-                       templatemodule_examplefunction_cli,
-                       "function purpose",
-                       "<mode [int]>",
-                       "clicmdname 3",
-                       "int templatemodule_examplefunc(int mode)");
+    RegisterCLIcommand("clicmdname", __FILE__, templatemodule_examplefunction_cli, "function purpose", "<mode [int]>",
+                       "clicmdname 3", "int templatemodule_examplefunc(int mode)");
 
-	// CODING STANDARD NOTE: Link as many functions as desired
+    // CODING STANDARD NOTE: Link as many functions as desired
 
     // CODING STANDARD NOTE: Add atexit function(s) here (OPTIONAL)
     // atexit((void*) templatemodule_clearmem());
 }
 
-
-
-
-
-
-
-
-
-
-
 /* =============================================================================================== */
 /* =============================================================================================== */
 /*                                    FUNCTION(S) SOURCE CODE                                      */
@@ -211,47 +177,35 @@ int_fast8_t init_templatemodule()
 /* =============================================================================================== */
 /** @name TEMPLATEMODULE functions */
 
-
-
-
-
-
-
-
-
 /* =============================================================================================== */
 /* =============================================================================================== */
 /** @name TEMPLATEMODULE - 1. FIRST GROUP OF FUNCTIONS                                             */
 /* =============================================================================================== */
 /* =============================================================================================== */
 
-
-
-
-
 // CODING STANDARD NOTE: minimal required documentation for doxygen
 /**
  *  ## Purpose
- * 
+ *
  * This function does absolutely nothing useful
- * 
- * 
+ *
+ *
  * ## Arguments
- * 
+ *
  * @param[in]	mode
  * 		mode sets up what function does
  * -	does nothing
  * -	also does nothing
- * 
+ *
  */
 // CODING STANDARD NOTE: function name start with module name
-int templatemodule_examplefunc00(int mode) 
+int templatemodule_examplefunc00(int mode)
 {
     // CODING STANDARD NOTE: pointer qualifier '*' with variable rather than with the type
     float *farray;
-	
-	int return_value;
-	
+
+    int return_value;
+
     // CODING STANDARD NOTE: choose human-readable variable names
     // CODING STANDARD NOTE: unrelated declarations should be on separate lines
     long iipix, jjpix; // pixel coordinates
@@ -259,28 +213,26 @@ int templatemodule_examplefunc00(int mode)
     long NBiteration;
     long n2;
 
-	FILE *fp_test;
-	
+    FILE *fp_test;
+
+    farray = (float *)malloc(sizeof(float) * 10);
+    if (farray == NULL)
+        printERROR(__FILE__, __func__, __LINE__, "malloc returns zero value");
 
-	farray = (float*) malloc(sizeof(float)*10);
-	if(farray == NULL)
-		printERROR(__FILE__, __func__, __LINE__, "malloc returns zero value");
-	
-	
     // CODING STANDARD NOTE: how to write an infinite loop
     // CODING STANDARD NOTE: Do not write infinite loop with while statement
-    for(;;)
+    for (;;)
     {
         // infinite loop
     }
-	free(farray);
+    free(farray);
 
-	fp_test = fopen("testfile.log", "w");
-	if(fp_test == NULL)
-		printERROR(__FILE__, __func__, __LINE__, "Cannot open file testfile.log");
-	fclose(fp_test);
+    fp_test = fopen("testfile.log", "w");
+    if (fp_test == NULL)
+        printERROR(__FILE__, __func__, __LINE__, "Cannot open file testfile.log");
+    fclose(fp_test);
 
-    if(mode == 2)
+    if (mode == 2)
     {
         // CODING STANDARD NOTE: reduce variable scope as much as possible
         // CODING STANDARD NOTE: variables used inside code block declared at beginning of code block
@@ -292,33 +244,30 @@ int templatemodule_examplefunc00(int mode)
         // CODING STANDARD NOTE: 		printERROR(const char *file, const char *func, int line, char *errmessage)
         // CODING STANDARD NOTE: 		printWARNING(const char *file, const char *func, int line, char *warnmessage)
         // CODING STANDARD NOTE:  printERROR will exit code, printWARNING will issue warning and continue
-        if(sprintf(name, "image1", loop)<1)
+        if (sprintf(name, "image1", loop) < 1)
             printERROR(__FILE__, __func__, __LINE__, "sprintf wrote <1 char");
-        if(sprintf(command, "ls %s.fits", name) < 1)
+        if (sprintf(command, "ls %s.fits", name) < 1)
             printERROR(__FILE__, __func__, __LINE__, "sprintf wrote <1 char");
-        if(system(command) != 0)
-            printERROR(__FILE__,__func__,__LINE__, "system() returns non-zero value");
+        if (system(command) != 0)
+            printERROR(__FILE__, __func__, __LINE__, "system() returns non-zero value");
     }
 
-	fp_test = fopen("testfile.log", "r");
-	if(fp_test == NULL)
-		printERROR(__FILE__, __func__, __LINE__, "Cannot Read file testfile.log");
+    fp_test = fopen("testfile.log", "r");
+    if (fp_test == NULL)
+        printERROR(__FILE__, __func__, __LINE__, "Cannot Read file testfile.log");
 
-	// CODING STANDARD NOTE: include field width limits in fscanf and sscanf calls
-    if(fscanf(fp_test, "%8ld", &n2) != 1)
-		printERROR(__FILE__,__func__,__LINE__, "fscanf returns value != 1");
-	fclose(fp_test);
-
-	// CODING STANDARD NOTE: Other test prototypes:
-	// CODING STANDARD NOTE: if(fread(...) < 1) printERROR(__FILE__,__func__,__LINE__, "fread() returns <1 value");
+    // CODING STANDARD NOTE: include field width limits in fscanf and sscanf calls
+    if (fscanf(fp_test, "%8ld", &n2) != 1)
+        printERROR(__FILE__, __func__, __LINE__, "fscanf returns value != 1");
+    fclose(fp_test);
 
+    // CODING STANDARD NOTE: Other test prototypes:
+    // CODING STANDARD NOTE: if(fread(...) < 1) printERROR(__FILE__,__func__,__LINE__, "fread() returns <1 value");
 
     free(farray);
-    
-    return(0);
-}
-
 
+    return (0);
+}
 
 /* =============================================================================================== */
 /* =============================================================================================== */
@@ -326,99 +275,83 @@ int templatemodule_examplefunc00(int mode)
 /* =============================================================================================== */
 /* =============================================================================================== */
 
-
-
-
-
 /* =============================================================================================== */
 /** @name TEMPLATEMODULE - 2.1. SECOND GROUP OF FUNCTIONS - SUBGROUP1                              */
 /* =============================================================================================== */
 
-
-
 // DOCUMENTATION NOTE: put @brief statement in .h
 // DOCUMENTATION NOTE: put short argument description in .h
 // DOCUMENTATION NOTE: put detailed function documentation in .c
 
-
 /**
  * ## Purpose
- * 
+ *
  * This function demonstrates use of seteuid, sched_setscheduler \n
  * Note that fields "Use", "return", "not" and "warning" are optional
- * 
+ *
  * ## Arguments
- * 
+ *
  * Brief description of arguments is in .h file \n
  * A more detailed description of arguments in provided here \n
- * 
- * 
- * 
+ *
+ *
+ *
  * ## Use
- * 
+ *
  * Use section is optional
  * to use this function, call it as
  * @code
  * templatemodule_examplefunc01(v1, n1, farray)
  * @endcode
- * 
+ *
  * ---
- * 
- * 
+ *
+ *
  * @return number of iteration [int]
  * @note sched_setscheduler and seteuid not supported under OS-X
- * @warning This function does nothing useful 
- * 
+ * @warning This function does nothing useful
+ *
  * \ingroup RTfunctions
- * 
- * 
+ *
+ *
  * ## Details
- * 
+ *
  */
-int templatemodule_examplefunc01(
-		const char*           namein, 
-		      float           val1, 
-		      int             n1, 
-		      float* restrict farray
-		)
+int templatemodule_examplefunc01(const char *namein, float val1, int n1, float *restrict farray)
 {
-	/// ---
-	/// # Code Description
-	///
-	int Niteration;
-	
-	int RT_priority = 95; // any number from 0-99. Higher number = higher priority
-	struct sched_param schedpar;
-	
-	int retval;
-	
-	schedpar.sched_priority = RT_priority;
-
-	/// ## Set up priviledges
-
-    #ifndef __MACH__ // Do not run code below if OS-X 
+    /// ---
+    /// # Code Description
+    ///
+    int Niteration;
+
+    int RT_priority = 95; // any number from 0-99. Higher number = higher priority
+    struct sched_param schedpar;
+
+    int retval;
+
+    schedpar.sched_priority = RT_priority;
+
+    /// ## Set up priviledges
+
+#ifndef __MACH__                    // Do not run code below if OS-X
     iretval = seteuid(euid_called); //This goes up to maximum privileges
-	if(retval != 0)
-		printERROR(__FILE__, __func__, __LINE__, "seteuid() returns non-zero value");
-		
-    sched_setscheduler(0, SCHED_FIFO, &schedpar); //other option is SCHED_RR, might be faster    
+    if (retval != 0)
+        printERROR(__FILE__, __func__, __LINE__, "seteuid() returns non-zero value");
 
-    retval = seteuid(euid_real); //Go back to normal privileges
-	if(retval != 0)
-		printERROR(__FILE__, __func__, __LINE__, "seteuid() returns non-zero value");
-	#endif
-	
-	/// ## Execute loop
-	
-	// code here
-	for(;;) // preferred way to write infinite loop
-	{
-	}
-	
-	/// ---	
-	return(Niteration);
-}
+    sched_setscheduler(0, SCHED_FIFO, &schedpar); //other option is SCHED_RR, might be faster
 
+    retval = seteuid(euid_real); //Go back to normal privileges
+    if (retval != 0)
+        printERROR(__FILE__, __func__, __LINE__, "seteuid() returns non-zero value");
+#endif
 
+    /// ## Execute loop
 
+    // code here
+    for (;;) // preferred way to write infinite loop
+    {
+    }
 
+    /// ---
+    return (Niteration);
+}
diff --git a/doc/templatemodule/templatemodule.h b/doc/templatemodule/templatemodule.h
index e4c65ded..ba24847b 100644
--- a/doc/templatemodule/templatemodule.h
+++ b/doc/templatemodule/templatemodule.h
@@ -1,31 +1,23 @@
 /**
  * @file    templatemodule.h
  * @brief   Function prototypes for templatemodule
- * 
- *  
+ *
+ *
  * @author  O. Guyon
  * @date    Aug 2 2017
  *
- * 
+ *
  * @bug No known bugs.
- * 
+ *
  */
 
-
 // CODING STANDARD NOTE: Ensure this code is only read once
 #ifndef _TEMPLATEMODULE_H
 #define _TEMPLATEMODULE_H
 
-
-
-
-
 /** @name INITIALIZATION
  * Module initialization functions
  */
- 
- 
- 
 
 /** @brief Initialize module */
 int_fast8_t init_templatemodule();
@@ -36,31 +28,24 @@ int_fast8_t init_templatemodule();
 /* =============================================================================================== */
 /* =============================================================================================== */
 
-/** @brief one-line description of function 
+/** @brief one-line description of function
  * More can be included here if needed */
 int templatemodule_examplefunc00(int mode);
 
-
 /* =============================================================================================== */
 /* =============================================================================================== */
 /** @name TEMPLATEMODULE - 2. SECOND GROUP OF FUNCTIONS                                            */
 /* =============================================================================================== */
 /* =============================================================================================== */
 
-
 /* =============================================================================================== */
 /** @name TEMPLATEMODULE - 2.1. SECOND GROUP OF FUNCTIONS - SUBGROUP1                              */
 /* =============================================================================================== */
 
 /** @brief one-line description of function */
-int templatemodule_examplefunc01(
-								float val1,      ///< [in]   This parameter does this and that
-								int n1,          ///< [in]   Number of that
-								float *farray    ///< [out]  Output array
-								);
-
-
-
+int templatemodule_examplefunc01(float val1,   ///< [in]   This parameter does this and that
+                                 int n1,       ///< [in]   Number of that
+                                 float *farray ///< [out]  Output array
+);
 
 #endif
- 
diff --git a/docs/_config.yml b/docs/_config.yml
index 2f7efbea..fff4ab92 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -1 +1 @@
-theme: jekyll-theme-minimal
\ No newline at end of file
+theme: jekyll-theme-minimal
diff --git a/docs/fps.md b/docs/fps.md
index df06470a..a3b7b2aa 100644
--- a/docs/fps.md
+++ b/docs/fps.md
@@ -1,3 +1,3 @@
 # Function Parameter Structure (FPS)
 
-FPS is 
+FPS is
diff --git a/docs/install/p1.md b/docs/install/p1.md
index 44e63b45..76ee417d 100644
--- a/docs/install/p1.md
+++ b/docs/install/p1.md
@@ -1,2 +1 @@
 this is page 1
-
diff --git a/docs/install/p2.md b/docs/install/p2.md
index 8f9df864..91e02fc8 100644
--- a/docs/install/p2.md
+++ b/docs/install/p2.md
@@ -1,2 +1 @@
 page 2 content
-
diff --git a/docs/procinfo.md b/docs/procinfo.md
index 15a2edee..76374c02 100644
--- a/docs/procinfo.md
+++ b/docs/procinfo.md
@@ -1,3 +1,3 @@
 # Process Information (procinfo)
 
-procinfo is 
+procinfo is
diff --git a/docs/streams.md b/docs/streams.md
index 100cc373..def5082a 100644
--- a/docs/streams.md
+++ b/docs/streams.md
@@ -1,4 +1,3 @@
 # Image Streams
 
 blabla...
-
diff --git a/fetch_atmosphere_dev.sh b/fetch_atmosphere_dev.sh
index 0e83c2eb..d9669ccd 100755
--- a/fetch_atmosphere_dev.sh
+++ b/fetch_atmosphere_dev.sh
@@ -6,13 +6,13 @@ CWD=$PWD
 cd plugins/milk-extra-src
 for mod in WFpropagate OpticsMaterials AtmosphereModel AtmosphericTurbulence
 do
-echo "Module ${mod}"
-if [ -d "${mod}" ]; then
-  echo "	Already installed -> pulling"
-  (cd ${mod}; git pull)
-else
-  git clone -b dev https://github.com/milk-org/${mod}
-  echo ""
-fi
+    echo "Module ${mod}"
+    if [ -d "${mod}" ]; then
+        echo "	Already installed -> pulling"
+        (cd ${mod}; git pull)
+    else
+        git clone -b dev https://github.com/milk-org/${mod}
+        echo ""
+    fi
 done
 cd $CWD
diff --git a/fetch_cacao_dev.sh b/fetch_cacao_dev.sh
index 16d9bbab..af9c3e0a 100755
--- a/fetch_cacao_dev.sh
+++ b/fetch_cacao_dev.sh
@@ -4,9 +4,9 @@
 
 echo "Module CACAO"
 if [ -d "plugins/cacao-src" ]; then
-  echo "	Already installed -> pulling"
-  (cd plugins/cacao-src; git pull)
+    echo "	Already installed -> pulling"
+    (cd plugins/cacao-src; git pull)
 else
-  git clone -b dev https://github.com/cacao-org/cacao plugins/cacao-src
-  echo ""
+    git clone -b dev https://github.com/cacao-org/cacao plugins/cacao-src
+    echo ""
 fi
diff --git a/fetch_coffee_dev.sh b/fetch_coffee_dev.sh
index ef3465a5..44ed87be 100755
--- a/fetch_coffee_dev.sh
+++ b/fetch_coffee_dev.sh
@@ -6,23 +6,23 @@ CWD=$PWD
 cd plugins/milk-extra-src
 for mod in WFpropagate OpticsMaterials
 do
-echo "Module ${mod}"
-if [ -d "${mod}" ]; then
-  echo "	Already installed -> pulling"
-  (cd ${mod}; git pull)
-else
-  git clone -b dev https://github.com/milk-org/${mod}
-  echo ""
-fi
+    echo "Module ${mod}"
+    if [ -d "${mod}" ]; then
+        echo "	Already installed -> pulling"
+        (cd ${mod}; git pull)
+    else
+        git clone -b dev https://github.com/milk-org/${mod}
+        echo ""
+    fi
 done
 cd $CWD
 
 
 echo "COFFEE modules"
 if [ -d "plugins/coffee-src" ]; then
-  echo "	Already installed -> pulling"
-  (cd plugins/coffee-src; git pull)
+    echo "	Already installed -> pulling"
+    (cd plugins/coffee-src; git pull)
 else
-  git clone -b dev https://github.com/coffee-org/coffee plugins/coffee-src
-  echo ""
+    git clone -b dev https://github.com/coffee-org/coffee plugins/coffee-src
+    echo ""
 fi
diff --git a/fetch_milk_dev.sh b/fetch_milk_dev.sh
index bfd1bcdf..b4f3b54f 100755
--- a/fetch_milk_dev.sh
+++ b/fetch_milk_dev.sh
@@ -5,12 +5,12 @@ cd plugins/milk-extra-src
 
 for mod in clustering fft ZernikePolyn cudacomp image_basic image_filter image_format image_gen img_reduce info kdtree linARfilterPred linopt_imtools psf statistic
 do
-echo "Module ${mod}"
-if [ -d "${mod}" ]; then
-  echo "	Already installed -> pulling"
-  (cd ${mod}; git pull)
-else
-  git clone -b dev https://github.com/milk-org/${mod}
-  echo ""
-fi
+    echo "Module ${mod}"
+    if [ -d "${mod}" ]; then
+        echo "	Already installed -> pulling"
+        (cd ${mod}; git pull)
+    else
+        git clone -b dev https://github.com/milk-org/${mod}
+        echo ""
+    fi
 done
diff --git a/python_module/CacaoProcessTools.cpp b/python_module/CacaoProcessTools.cpp
index 9db0a808..15435cb1 100644
--- a/python_module/CacaoProcessTools.cpp
+++ b/python_module/CacaoProcessTools.cpp
@@ -8,127 +8,126 @@
 namespace py = pybind11;
 using namespace pybind11::literals;
 
-extern "C" {
-DATA __attribute__((used)) data;
+extern "C"
+{
+    DATA __attribute__((used)) data;
 }
 
-int fps_value_to_key(pyFps &cls, const std::string &key,
-                     const FPS_type fps_type, py::object value) {
-  switch (fps_type) {
+int fps_value_to_key(pyFps &cls, const std::string &key, const FPS_type fps_type, py::object value)
+{
+    switch (fps_type)
+    {
     case FPS_type::INT32:
     case FPS_type::UINT32:
     case FPS_type::INT64:
     case FPS_type::UINT64:
-      return functionparameter_SetParamValue_INT64(cls, key.c_str(),
-                                                   py::int_(value));
+        return functionparameter_SetParamValue_INT64(cls, key.c_str(), py::int_(value));
     case FPS_type::FLOAT32:
-      return functionparameter_SetParamValue_FLOAT32(cls, key.c_str(),
-                                                     py::float_(value));
+        return functionparameter_SetParamValue_FLOAT32(cls, key.c_str(), py::float_(value));
     case FPS_type::FLOAT64:
-      return functionparameter_SetParamValue_FLOAT64(cls, key.c_str(),
-                                                     py::float_(value));
+        return functionparameter_SetParamValue_FLOAT64(cls, key.c_str(), py::float_(value));
     case FPS_type::STRING:
-      return functionparameter_SetParamValue_STRING(cls, key.c_str(),
-                                                    std::string(py::str(value)).c_str());
+        return functionparameter_SetParamValue_STRING(cls, key.c_str(), std::string(py::str(value)).c_str());
     default:
-      return EXIT_FAILURE;
-  }
+        return EXIT_FAILURE;
+    }
 }
 
-py::object fps_value_from_key(pyFps &cls, const std::string &key,
-                              const FPS_type fps_type) {
-  switch (fps_type) {
+py::object fps_value_from_key(pyFps &cls, const std::string &key, const FPS_type fps_type)
+{
+    switch (fps_type)
+    {
     case FPS_type::INT32:
     case FPS_type::UINT32:
     case FPS_type::INT64:
     case FPS_type::UINT64:
-      return py::int_(functionparameter_GetParamValue_INT64(cls, key.c_str()));
+        return py::int_(functionparameter_GetParamValue_INT64(cls, key.c_str()));
     case FPS_type::FLOAT32:
-      return py::float_(
-          functionparameter_GetParamValue_FLOAT32(cls, key.c_str()));
+        return py::float_(functionparameter_GetParamValue_FLOAT32(cls, key.c_str()));
     case FPS_type::FLOAT64:
-      return py::float_(
-          functionparameter_GetParamValue_FLOAT64(cls, key.c_str()));
+        return py::float_(functionparameter_GetParamValue_FLOAT64(cls, key.c_str()));
     case FPS_type::STRING:
-      return py::str(functionparameter_GetParamPtr_STRING(cls, key.c_str()));
+        return py::str(functionparameter_GetParamPtr_STRING(cls, key.c_str()));
     default:
-      return py::none();
-  }
+        return py::none();
+    }
 }
 
-py::dict fps_to_dict(pyFps &cls) {
-  py::dict fps_dict;
-  for (auto &key : cls.keys()) {
-    fps_dict[py::str(key.first)] =
-        fps_value_from_key(cls, key.first, key.second);
-  }
-  return fps_dict;
+py::dict fps_to_dict(pyFps &cls)
+{
+    py::dict fps_dict;
+    for (auto &key : cls.keys())
+    {
+        fps_dict[py::str(key.first)] = fps_value_from_key(cls, key.first, key.second);
+    }
+    return fps_dict;
 }
 
-PYBIND11_MODULE(CacaoProcessTools, m) {
-  m.doc() = "CacaoProcessTools library module";
+PYBIND11_MODULE(CacaoProcessTools, m)
+{
+    m.doc() = "CacaoProcessTools library module";
 
-  CLI_data_init();
-  //   m.attr("data") = &data;
+    CLI_data_init();
+    //   m.attr("data") = &data;
 
-  m.def("processCTRL", &processinfo_CTRLscreen,
-        R"pbdoc(Open the process control monitor
+    m.def("processCTRL", &processinfo_CTRLscreen,
+          R"pbdoc(Open the process control monitor
 )pbdoc");
 
-  m.def("streamCTRL", &streamCTRL_CTRLscreen,
-        R"pbdoc(Open the stream control monitor
+    m.def("streamCTRL", &streamCTRL_CTRLscreen,
+          R"pbdoc(Open the stream control monitor
 )pbdoc");
 
-  m.def("fparamCTRL", &functionparameter_CTRLscreen,
-        R"pbdoc(Open the function parameter monitor
+    m.def("fparamCTRL", &functionparameter_CTRLscreen,
+          R"pbdoc(Open the function parameter monitor
 )pbdoc");
 
-  py::enum_<FPS_status>(m, "FPS_status")
-      .value("CONF", FPS_status::CONF)
-      .value("RUN", FPS_status::RUN)
-      .value("CMDCONF", FPS_status::CMDCONF)
-      .value("CMDRUN", FPS_status::CMDRUN)
-      .value("RUNLOOP", FPS_status::RUNLOOP)
-      .value("CHECKOK", FPS_status::CHECKOK)
-      .value("TMUXCONF", FPS_status::TMUXCONF)
-      .value("TMUXRUN", FPS_status::TMUXRUN)
-      .value("TMUXCTRL", FPS_status::TMUXCTRL)
-      .export_values();
-
-  py::enum_<FPS_type>(m, "FPS_type")
-      .value("AUTO", FPS_type::AUTO)
-      .value("UNDEF", FPS_type::UNDEF)
-      .value("INT32", FPS_type::INT32)
-      .value("UINT32", FPS_type::UINT32)
-      .value("INT64", FPS_type::INT64)
-      .value("UINT64", FPS_type::UINT64)
-      .value("FLOAT32", FPS_type::FLOAT32)
-      .value("FLOAT64", FPS_type::FLOAT64)
-      .value("PID", FPS_type::PID)
-      .value("TIMESPEC", FPS_type::TIMESPEC)
-      .value("FILENAME", FPS_type::FILENAME)
-      .value("FITSFILENAME", FPS_type::FITSFILENAME)
-      .value("EXECFILENAME", FPS_type::EXECFILENAME)
-      .value("DIRNAME", FPS_type::DIRNAME)
-      .value("STREAMNAME", FPS_type::STREAMNAME)
-      .value("STRING", FPS_type::STRING)
-      .value("ONOFF", FPS_type::ONOFF)
-      .value("PROCESS", FPS_type::PROCESS)
-      .value("FPSNAME", FPS_type::FPSNAME)
-      .export_values();
-
-  py::class_<timespec>(m, "timespec")
-      .def(py::init<time_t, long>())
-      .def_readwrite("tv_sec", &timespec::tv_sec)
-      .def_readwrite("tv_nsec", &timespec::tv_nsec);
-
-  py::class_<pyProcessInfo>(m, "processinfo")
-      .def(py::init<>(),
-           R"pbdoc(Construct a empty Process Info object
+    py::enum_<FPS_status>(m, "FPS_status")
+        .value("CONF", FPS_status::CONF)
+        .value("RUN", FPS_status::RUN)
+        .value("CMDCONF", FPS_status::CMDCONF)
+        .value("CMDRUN", FPS_status::CMDRUN)
+        .value("RUNLOOP", FPS_status::RUNLOOP)
+        .value("CHECKOK", FPS_status::CHECKOK)
+        .value("TMUXCONF", FPS_status::TMUXCONF)
+        .value("TMUXRUN", FPS_status::TMUXRUN)
+        .value("TMUXCTRL", FPS_status::TMUXCTRL)
+        .export_values();
+
+    py::enum_<FPS_type>(m, "FPS_type")
+        .value("AUTO", FPS_type::AUTO)
+        .value("UNDEF", FPS_type::UNDEF)
+        .value("INT32", FPS_type::INT32)
+        .value("UINT32", FPS_type::UINT32)
+        .value("INT64", FPS_type::INT64)
+        .value("UINT64", FPS_type::UINT64)
+        .value("FLOAT32", FPS_type::FLOAT32)
+        .value("FLOAT64", FPS_type::FLOAT64)
+        .value("PID", FPS_type::PID)
+        .value("TIMESPEC", FPS_type::TIMESPEC)
+        .value("FILENAME", FPS_type::FILENAME)
+        .value("FITSFILENAME", FPS_type::FITSFILENAME)
+        .value("EXECFILENAME", FPS_type::EXECFILENAME)
+        .value("DIRNAME", FPS_type::DIRNAME)
+        .value("STREAMNAME", FPS_type::STREAMNAME)
+        .value("STRING", FPS_type::STRING)
+        .value("ONOFF", FPS_type::ONOFF)
+        .value("PROCESS", FPS_type::PROCESS)
+        .value("FPSNAME", FPS_type::FPSNAME)
+        .export_values();
+
+    py::class_<timespec>(m, "timespec")
+        .def(py::init<time_t, long>())
+        .def_readwrite("tv_sec", &timespec::tv_sec)
+        .def_readwrite("tv_nsec", &timespec::tv_nsec);
+
+    py::class_<pyProcessInfo>(m, "processinfo")
+        .def(py::init<>(),
+             R"pbdoc(Construct a empty Process Info object
 )pbdoc")
 
-      .def(py::init<char *, int>(),
-           R"pbdoc(Construct a new Process Info object
+        .def(py::init<char *, int>(),
+             R"pbdoc(Construct a new Process Info object
 
 Parameters:
     pname : name of the Process Info object (human-readable)
@@ -138,10 +137,10 @@ PYBIND11_MODULE(CacaoProcessTools, m) {
              - 2: increment single step (will go back to 1)
              - 3: exit loop
 )pbdoc",
-           py::arg("name"), py::arg("CTRLval"))
+             py::arg("name"), py::arg("CTRLval"))
 
-      .def("create", &pyProcessInfo::create,
-           R"pbdoc(Create Process Info object in shared memory
+        .def("create", &pyProcessInfo::create,
+             R"pbdoc(Create Process Info object in shared memory
 
 Parameters:
     pname : name of the Process Info object (human-readable)
@@ -153,163 +152,139 @@ PYBIND11_MODULE(CacaoProcessTools, m) {
 Return:
     ret : error code
 )pbdoc",
-           py::arg("name"), py::arg("CTRLval"))
+             py::arg("name"), py::arg("CTRLval"))
 
-      .def("link", &pyProcessInfo::link,
-           R"pbdoc(Link an existing Process Info object in shared memory
+        .def("link", &pyProcessInfo::link,
+             R"pbdoc(Link an existing Process Info object in shared memory
 
 Parameters:
     pname : name of the Process Info object (human-readable)
 Return:
     ret : error code
 )pbdoc",
-           py::arg("name"))
+             py::arg("name"))
 
-      .def("close", &pyProcessInfo::close,
-           R"pbdoc(Close an existing Process Info object in shared memory
+        .def("close", &pyProcessInfo::close,
+             R"pbdoc(Close an existing Process Info object in shared memory
 
 Parameters:
     pname : name of the Process Info object (human-readable)
 Return:
     ret : error code
 )pbdoc",
-           py::arg("name"))
+             py::arg("name"))
 
-      .def("sigexit", &pyProcessInfo::sigexit,
-           R"pbdoc(Send a signal to a Process Info object
+        .def("sigexit", &pyProcessInfo::sigexit,
+             R"pbdoc(Send a signal to a Process Info object
 
 Parameters:
     sig : signal to send
 )pbdoc",
-           py::arg("sig"))
+             py::arg("sig"))
 
-      .def("writeMessage", &pyProcessInfo::writeMessage,
-           R"pbdoc(Write a message into a Process Info object
+        .def("writeMessage", &pyProcessInfo::writeMessage,
+             R"pbdoc(Write a message into a Process Info object
 
 Parameters:
     message : message to write
 Return:
     ret : error code
 )pbdoc",
-           py::arg("message"))
+             py::arg("message"))
 
-      .def("exec_start", &pyProcessInfo::exec_start,
-           R"pbdoc(Define the start of the process (timing purpose)
+        .def("exec_start", &pyProcessInfo::exec_start,
+             R"pbdoc(Define the start of the process (timing purpose)
 
 Return:
     ret : error code
 )pbdoc")
 
-      .def("exec_end", &pyProcessInfo::exec_end,
-           R"pbdoc(Define the end of the process (timing purpose)
+        .def("exec_end", &pyProcessInfo::exec_end,
+             R"pbdoc(Define the end of the process (timing purpose)
 
 Return:
     ret : error code
 )pbdoc")
 
-      .def_property(
-          "name", [](pyProcessInfo &p) { return std::string(p->name); },
-          [](pyProcessInfo &p, std::string name) {
-            strncpy(p->name, name.c_str(), sizeof(p->name));
-          },
-          "Name of the Process Info object")
-
-      .def_property(
-          "source_FUNCTION",
-          [](pyProcessInfo &p) { return std::string(p->source_FUNCTION); },
-          [](pyProcessInfo &p, std::string source_FUNCTION) {
-            strncpy(p->source_FUNCTION, source_FUNCTION.c_str(),
-                    sizeof(p->source_FUNCTION));
-          })
-
-      .def_property(
-          "source_FILE",
-          [](pyProcessInfo &p) { return std::string(p->source_FILE); },
-          [](pyProcessInfo &p, std::string source_FILE) {
-            strncpy(p->source_FILE, source_FILE.c_str(),
-                    sizeof(p->source_FILE));
-          })
-      .def_property(
-          "source_LINE", [](pyProcessInfo &p) { return p->source_LINE; },
-          [](pyProcessInfo &p, int source_LINE) {
-            p->source_LINE = source_LINE;
-          })
-      .def_property(
-          "PID", [](pyProcessInfo &p) { return p->PID; },
-          [](pyProcessInfo &p, int PID) { p->PID = PID; })
-
-      .def_property(
-          "createtime", [](pyProcessInfo &p) { return p->createtime; },
-          [](pyProcessInfo &p, timespec createtime) {
-            p->createtime = createtime;
-          })
-      .def_property(
-          "loopcnt", [](pyProcessInfo &p) { return p->loopcnt; },
-          [](pyProcessInfo &p, int loopcnt) { p->loopcnt = loopcnt; })
-      .def_property(
-          "CTRLval", [](pyProcessInfo &p) { return p->CTRLval; },
-          [](pyProcessInfo &p, int CTRLval) { p->CTRLval = CTRLval; })
-      .def_property(
-          "tmuxname", [](pyProcessInfo &p) { return std::string(p->tmuxname); },
-          [](pyProcessInfo &p, std::string name) {
-            strncpy(p->tmuxname, name.c_str(), sizeof(p->tmuxname));
-          })
-      .def_property(
-          "loopstat", [](pyProcessInfo &p) { return p->loopstat; },
-          [](pyProcessInfo &p, int loopstat) { p->loopstat = loopstat; })
-      .def_property(
-          "statusmsg",
-          [](pyProcessInfo &p) { return std::string(p->statusmsg); },
-          [](pyProcessInfo &p, std::string name) {
-            strncpy(p->statusmsg, name.c_str(), sizeof(p->statusmsg));
-          })
-      .def_property(
-          "statuscode", [](pyProcessInfo &p) { return p->statuscode; },
-          [](pyProcessInfo &p, int statuscode) { p->statuscode = statuscode; })
-      // .def_readwrite("logFile", &pyProcessInfo::m_pinfo::logFile)
-      .def_property(
-          "description",
-          [](pyProcessInfo &p) { return std::string(p->description); },
-          [](pyProcessInfo &p, std::string name) {
-            strncpy(p->description, name.c_str(), sizeof(p->description));
-          });
-
-  py::class_<pyFps>(m, "fps")
-      // read-only constructor
-      .def(py::init<std::string>(),
-           R"pbdoc(Read / connect to existing shared memory FPS
+        .def_property(
+            "name", [](pyProcessInfo &p) { return std::string(p->name); },
+            [](pyProcessInfo &p, std::string name) { strncpy(p->name, name.c_str(), sizeof(p->name)); },
+            "Name of the Process Info object")
+
+        .def_property(
+            "source_FUNCTION", [](pyProcessInfo &p) { return std::string(p->source_FUNCTION); },
+            [](pyProcessInfo &p, std::string source_FUNCTION) {
+                strncpy(p->source_FUNCTION, source_FUNCTION.c_str(), sizeof(p->source_FUNCTION));
+            })
+
+        .def_property(
+            "source_FILE", [](pyProcessInfo &p) { return std::string(p->source_FILE); },
+            [](pyProcessInfo &p, std::string source_FILE) {
+                strncpy(p->source_FILE, source_FILE.c_str(), sizeof(p->source_FILE));
+            })
+        .def_property(
+            "source_LINE", [](pyProcessInfo &p) { return p->source_LINE; },
+            [](pyProcessInfo &p, int source_LINE) { p->source_LINE = source_LINE; })
+        .def_property(
+            "PID", [](pyProcessInfo &p) { return p->PID; }, [](pyProcessInfo &p, int PID) { p->PID = PID; })
+
+        .def_property(
+            "createtime", [](pyProcessInfo &p) { return p->createtime; },
+            [](pyProcessInfo &p, timespec createtime) { p->createtime = createtime; })
+        .def_property(
+            "loopcnt", [](pyProcessInfo &p) { return p->loopcnt; },
+            [](pyProcessInfo &p, int loopcnt) { p->loopcnt = loopcnt; })
+        .def_property(
+            "CTRLval", [](pyProcessInfo &p) { return p->CTRLval; },
+            [](pyProcessInfo &p, int CTRLval) { p->CTRLval = CTRLval; })
+        .def_property(
+            "tmuxname", [](pyProcessInfo &p) { return std::string(p->tmuxname); },
+            [](pyProcessInfo &p, std::string name) { strncpy(p->tmuxname, name.c_str(), sizeof(p->tmuxname)); })
+        .def_property(
+            "loopstat", [](pyProcessInfo &p) { return p->loopstat; },
+            [](pyProcessInfo &p, int loopstat) { p->loopstat = loopstat; })
+        .def_property(
+            "statusmsg", [](pyProcessInfo &p) { return std::string(p->statusmsg); },
+            [](pyProcessInfo &p, std::string name) { strncpy(p->statusmsg, name.c_str(), sizeof(p->statusmsg)); })
+        .def_property(
+            "statuscode", [](pyProcessInfo &p) { return p->statuscode; },
+            [](pyProcessInfo &p, int statuscode) { p->statuscode = statuscode; })
+        // .def_readwrite("logFile", &pyProcessInfo::m_pinfo::logFile)
+        .def_property(
+            "description", [](pyProcessInfo &p) { return std::string(p->description); },
+            [](pyProcessInfo &p, std::string name) { strncpy(p->description, name.c_str(), sizeof(p->description)); });
+
+    py::class_<pyFps>(m, "fps")
+        // read-only constructor
+        .def(py::init<std::string>(),
+             R"pbdoc(Read / connect to existing shared memory FPS
 Parameters:
     name     [in]:  the name of the shared memory file to connect
 )pbdoc",
-           py::arg("name"))
+             py::arg("name"))
 
-      // read/write constructor
-      .def(py::init<std::string, bool, int>(),
-           R"pbdoc(Read / connect to existing shared memory FPS
+        // read/write constructor
+        .def(py::init<std::string, bool, int>(),
+             R"pbdoc(Read / connect to existing shared memory FPS
 Parameters:
     name     [in]:  the name of the shared memory file to connect
     create   [in]:  flag for creating of shared memory identifier
     NBparamMAX   [in]:  Max number of parameters
 )pbdoc",
-           py::arg("name"), py::arg("create"),
-           py::arg("NBparamMAX") = FUNCTION_PARAMETER_NBPARAM_DEFAULT)
+             py::arg("name"), py::arg("create"), py::arg("NBparamMAX") = FUNCTION_PARAMETER_NBPARAM_DEFAULT)
 
-      .def("asdict", &fps_to_dict)
+        .def("asdict", &fps_to_dict)
 
-      .def("__getitem__",
-           [](pyFps &cls, const std::string &key) {
-             return fps_value_from_key(cls, key, cls.keys(key));
-           })
+        .def("__getitem__",
+             [](pyFps &cls, const std::string &key) { return fps_value_from_key(cls, key, cls.keys(key)); })
 
-      .def("__setitem__",
-           [](pyFps &cls, const std::string &key, py::object value) {
-             return fps_value_to_key(cls, key, cls.keys(key), value);
-           })
+        .def("__setitem__", [](pyFps &cls, const std::string &key,
+                               py::object value) { return fps_value_to_key(cls, key, cls.keys(key), value); })
 
-      .def("md", &pyFps::md, py::return_value_policy::reference)
+        .def("md", &pyFps::md, py::return_value_policy::reference)
 
-      .def("add_entry", &pyFps::add_entry,
-           R"pbdoc(Add parameter to database with default settings
+        .def("add_entry", &pyFps::add_entry,
+             R"pbdoc(Add parameter to database with default settings
 
 If entry already exists, do not modify it
 
@@ -318,75 +293,67 @@ If entry already exists, do not modify it
     create   [in]:  flag for creating of shared memory identifier
     NBparamMAX   [in]:  Max number of parameters
 )pbdoc",
-           py::arg("entry_name"), py::arg("entry_desc"), py::arg("fptype"))
+             py::arg("entry_name"), py::arg("entry_desc"), py::arg("fptype"))
 
-      .def("get_status", &pyFps::get_status)
-      .def("set_status", &pyFps::set_status)
+        .def("get_status", &pyFps::get_status)
+        .def("set_status", &pyFps::set_status)
 
-      .def("get_levelKeys", &pyFps::get_levelKeys)
+        .def("get_levelKeys", &pyFps::get_levelKeys)
 
-      .def(
-          "get_param_value_int",
-          [](pyFps &cls, std::string key) {
-            return functionparameter_GetParamValue_INT64(cls, key.c_str());
-          },
-          R"pbdoc(Get the int64 value of the FPS key
+        .def(
+            "get_param_value_int",
+            [](pyFps &cls, std::string key) { return functionparameter_GetParamValue_INT64(cls, key.c_str()); },
+            R"pbdoc(Get the int64 value of the FPS key
 
 Parameters:
     key     [in]: Parameter name
 Return:
     ret      [out]: parameter value
 )pbdoc",
-          py::arg("key"))
+            py::arg("key"))
 
-      .def(
-          "get_param_value_float",
-          [](pyFps &cls, std::string key) {
-            return functionparameter_GetParamValue_FLOAT32(cls, key.c_str());
-          },
-          R"pbdoc(Get the float32 value of the FPS key
+        .def(
+            "get_param_value_float",
+            [](pyFps &cls, std::string key) { return functionparameter_GetParamValue_FLOAT32(cls, key.c_str()); },
+            R"pbdoc(Get the float32 value of the FPS key
 
 Parameters:
     key     [in]: Parameter name
 Return:
     ret      [out]: parameter value
 )pbdoc",
-          py::arg("key"))
-      .def(
-          "get_param_value_double",
-          [](pyFps &cls, std::string key) {
-            return functionparameter_GetParamValue_FLOAT64(cls, key.c_str());
-          },
-          R"pbdoc(Get the float64 value of the FPS key
+            py::arg("key"))
+        .def(
+            "get_param_value_double",
+            [](pyFps &cls, std::string key) { return functionparameter_GetParamValue_FLOAT64(cls, key.c_str()); },
+            R"pbdoc(Get the float64 value of the FPS key
 
 Parameters:
     key     [in]: Parameter name
 Return:
     ret      [out]: parameter value
 )pbdoc",
-          py::arg("key"))
-      .def(
-          "get_param_value_string",
-          [](pyFps &cls, std::string key) {
-            return std::string(
-                functionparameter_GetParamPtr_STRING(cls, key.c_str()));
-          },
-          R"pbdoc(Get the string value of the FPS key
+            py::arg("key"))
+        .def(
+            "get_param_value_string",
+            [](pyFps &cls, std::string key) {
+                return std::string(functionparameter_GetParamPtr_STRING(cls, key.c_str()));
+            },
+            R"pbdoc(Get the string value of the FPS key
 
 Parameters:
     key     [in]: Parameter name
 Return:
     ret      [out]: parameter value
 )pbdoc",
-          py::arg("key"))
+            py::arg("key"))
 
-      .def(
-          "set_param_value_int",
-          [](pyFps &cls, std::string key, std::string value) {
-            return functionparameter_SetParamValue_INT64(cls, key.c_str(),
-                                                         std::stol(value));
-          },
-          R"pbdoc(Set the int64 value of the FPS key
+        .def(
+            "set_param_value_int",
+            [](pyFps &cls, std::string key, std::string value) {
+                return functionparameter_SetParamValue_INT64(cls, key.c_str(), std::stol(value));
+            },
+            R"pbdoc(Set the int64 value of the FPS key
 
 Parameters:
     key     [in]: Parameter name
@@ -394,14 +361,13 @@ If entry already exists, do not modify it
 Return:
     ret      [out]: error code
 )pbdoc",
-          py::arg("key"), py::arg("value"))
-      .def(
-          "set_param_value_float",
-          [](pyFps &cls, std::string key, std::string value) {
-            return functionparameter_SetParamValue_FLOAT32(cls, key.c_str(),
-                                                           std::stol(value));
-          },
-          R"pbdoc(Set the float32 value of the FPS key
+            py::arg("key"), py::arg("value"))
+        .def(
+            "set_param_value_float",
+            [](pyFps &cls, std::string key, std::string value) {
+                return functionparameter_SetParamValue_FLOAT32(cls, key.c_str(), std::stol(value));
+            },
+            R"pbdoc(Set the float32 value of the FPS key
 
 Parameters:
     key     [in]: Parameter name
@@ -409,14 +375,13 @@ If entry already exists, do not modify it
 Return:
     ret      [out]: error code
 )pbdoc",
-          py::arg("key"), py::arg("value"))
-      .def(
-          "set_param_value_double",
-          [](pyFps &cls, std::string key, std::string value) {
-            return functionparameter_SetParamValue_FLOAT64(cls, key.c_str(),
-                                                           std::stol(value));
-          },
-          R"pbdoc(Set the float64 value of the FPS key
+            py::arg("key"), py::arg("value"))
+        .def(
+            "set_param_value_double",
+            [](pyFps &cls, std::string key, std::string value) {
+                return functionparameter_SetParamValue_FLOAT64(cls, key.c_str(), std::stol(value));
+            },
+            R"pbdoc(Set the float64 value of the FPS key
 
 Parameters:
     key     [in]: Parameter name
@@ -424,14 +389,13 @@ If entry already exists, do not modify it
 Return:
     ret      [out]: error code
 )pbdoc",
-          py::arg("key"), py::arg("value"))
-      .def(
-          "set_param_value_string",
-          [](pyFps &cls, std::string key, std::string value) {
-            return functionparameter_SetParamValue_STRING(cls, key.c_str(),
-                                                          value.c_str());
-          },
-          R"pbdoc(Set the string value of the FPS key
+            py::arg("key"), py::arg("value"))
+        .def(
+            "set_param_value_string",
+            [](pyFps &cls, std::string key, std::string value) {
+                return functionparameter_SetParamValue_STRING(cls, key.c_str(), value.c_str());
+            },
+            R"pbdoc(Set the string value of the FPS key
 
 Parameters:
     key     [in]: Parameter name
@@ -439,12 +403,12 @@ If entry already exists, do not modify it
 Return:
     ret      [out]: error code
 )pbdoc",
-          py::arg("key"), py::arg("value"))
+            py::arg("key"), py::arg("value"))
 
-      .def_property_readonly("keys", [](pyFps &cls) { return cls.keys(); })
+        .def_property_readonly("keys", [](pyFps &cls) { return cls.keys(); })
 
-      .def("CONFstart", &pyFps::CONFstart,
-           R"pbdoc(FPS start CONF process
+        .def("CONFstart", &pyFps::CONFstart,
+             R"pbdoc(FPS start CONF process
 
 Requires setup performed by milk-fpsinit, which performs the following setup
 - creates the FPS shared memory
@@ -455,36 +419,36 @@ Requires setup performed by milk-fpsinit, which performs the following setup
     ret      [out]: error code
 )pbdoc")
 
-      .def("CONFstop", &pyFps::CONFstop,
-           R"pbdoc(FPS stop CONF process
+        .def("CONFstop", &pyFps::CONFstop,
+             R"pbdoc(FPS stop CONF process
 
 Return:
     ret      [out]: error code
 )pbdoc")
 
-      .def("FPCONFexit", &pyFps::FPCONFexit,
-           R"pbdoc(FPS exit FPCONF process
+        .def("FPCONFexit", &pyFps::FPCONFexit,
+             R"pbdoc(FPS exit FPCONF process
 
       Return:
           ret      [out]: error code
       )pbdoc")
 
-      //   .def("FPCONFsetup", &pyFps::FPCONFsetup,
-      //        R"pbdoc(FPS setup FPCONF process
+        //   .def("FPCONFsetup", &pyFps::FPCONFsetup,
+        //        R"pbdoc(FPS setup FPCONF process
 
-      //   Return:
-      //       ret      [out]: error code
-      //   )pbdoc")
+        //   Return:
+        //       ret      [out]: error code
+        //   )pbdoc")
 
-      .def("FPCONFloopstep", &pyFps::FPCONFloopstep,
-           R"pbdoc(FPS loop step FPCONF process
+        .def("FPCONFloopstep", &pyFps::FPCONFloopstep,
+             R"pbdoc(FPS loop step FPCONF process
 
       Return:
           ret      [out]: error code
       )pbdoc")
 
-      .def("RUNstart", &pyFps::RUNstart,
-           R"pbdoc(FPS start RUN process
+        .def("RUNstart", &pyFps::RUNstart,
+             R"pbdoc(FPS start RUN process
 
 Requires setup performed by milk-fpsinit, which performs the following setup
 - creates the FPS shared memory
@@ -495,8 +459,8 @@ Requires setup performed by milk-fpsinit, which performs the following setup
     ret      [out]: error code
 )pbdoc")
 
-      .def("RUNstop", &pyFps::RUNstop,
-           R"pbdoc(FPS stop RUN process
+        .def("RUNstop", &pyFps::RUNstop,
+             R"pbdoc(FPS stop RUN process
 
  Run pre-set function fpsrunstop in tmux ctrl window
 
@@ -504,89 +468,97 @@ Requires setup performed by milk-fpsinit, which performs the following setup
     ret      [out]: error code
 )pbdoc")
 
-      .def("RUNexit", &pyFps::RUNexit,
-           R"pbdoc(FPS exit RUN process
+        .def("RUNexit", &pyFps::RUNexit,
+             R"pbdoc(FPS exit RUN process
 
 Return:
     ret      [out]: error code
 )pbdoc")
-      // Test if CONF process is running
-
-      .def_property_readonly(
-          "CONFrunning",
-          [](pyFps &cls) {
-            pid_t pid = cls->md->confpid;
-            if ((getpgid(pid) >= 0) && (pid > 0)) {
-              return 1;
-            } else  // PID not active
-            {
-              if (cls->md->status & FUNCTION_PARAMETER_STRUCT_STATUS_CMDCONF) {
-                // not clean exit
-                return -1;
-              } else {
-                return 0;
-              }
-            }
-          },
-          R"pbdoc(Test if CONF process is running
+        // Test if CONF process is running
+
+        .def_property_readonly(
+            "CONFrunning",
+            [](pyFps &cls) {
+                pid_t pid = cls->md->confpid;
+                if ((getpgid(pid) >= 0) && (pid > 0))
+                {
+                    return 1;
+                }
+                else // PID not active
+                {
+                    if (cls->md->status & FUNCTION_PARAMETER_STRUCT_STATUS_CMDCONF)
+                    {
+                        // not clean exit
+                        return -1;
+                    }
+                    else
+                    {
+                        return 0;
+                    }
+                }
+            },
+            R"pbdoc(Test if CONF process is running
 
 Return:
     ret      [out]: CONF process is running or not
 )pbdoc")
 
-      .def_property_readonly(
-          "RUNrunning",
-          [](pyFps &cls) {
-            pid_t pid = cls->md->runpid;
-            if ((getpgid(pid) >= 0) && (pid > 0)) {
-              return 1;
-            } else  // PID not active
-            {
-              if (cls->md->status & FUNCTION_PARAMETER_STRUCT_STATUS_CMDRUN) {
-                // not clean exit
-                return -1;
-              } else {
-                return 0;
-              }
-            }
-          },
-          R"pbdoc(Test if RUN process is running
+        .def_property_readonly(
+            "RUNrunning",
+            [](pyFps &cls) {
+                pid_t pid = cls->md->runpid;
+                if ((getpgid(pid) >= 0) && (pid > 0))
+                {
+                    return 1;
+                }
+                else // PID not active
+                {
+                    if (cls->md->status & FUNCTION_PARAMETER_STRUCT_STATUS_CMDRUN)
+                    {
+                        // not clean exit
+                        return -1;
+                    }
+                    else
+                    {
+                        return 0;
+                    }
+                }
+            },
+            R"pbdoc(Test if RUN process is running
 
 Return:
     ret      [out]: RUN process is running or not
 )pbdoc")
 
-      ;
-  py::class_<FUNCTION_PARAMETER_STRUCT_MD>(m, "FPS_md")
-      // .def(py::init([]() {
-      //     return std::unique_ptr<FUNCTION_PARAMETER_STRUCT_MD>(new
-      //     FUNCTION_PARAMETER_STRUCT_MD());
-      // }))
-      .def_readonly("name", &FUNCTION_PARAMETER_STRUCT_MD::name)
-      .def_readonly("description", &FUNCTION_PARAMETER_STRUCT_MD::description)
-      .def_readonly("workdir", &FUNCTION_PARAMETER_STRUCT_MD::workdir)
-      .def_readonly("datadir", &FUNCTION_PARAMETER_STRUCT_MD::datadir)
-      .def_readonly("confdir", &FUNCTION_PARAMETER_STRUCT_MD::confdir)
-      .def_readonly("sourcefname", &FUNCTION_PARAMETER_STRUCT_MD::sourcefname)
-      .def_readonly("sourceline", &FUNCTION_PARAMETER_STRUCT_MD::sourceline)
-      .def_readonly("pname", &FUNCTION_PARAMETER_STRUCT_MD::pname)
-      .def_readonly("callprogname", &FUNCTION_PARAMETER_STRUCT_MD::callprogname)
-      //   .def_readonly("nameindexW",
-      //  &FUNCTION_PARAMETER_STRUCT_MD::nameindexW)
-      .def_readonly("NBnameindex", &FUNCTION_PARAMETER_STRUCT_MD::NBnameindex)
-      .def_readonly("confpid", &FUNCTION_PARAMETER_STRUCT_MD::confpid)
-      .def_readonly("confpidstarttime",
-                    &FUNCTION_PARAMETER_STRUCT_MD::confpidstarttime)
-      .def_readonly("runpid", &FUNCTION_PARAMETER_STRUCT_MD::runpid)
-      .def_readonly("runpidstarttime",
-                    &FUNCTION_PARAMETER_STRUCT_MD::runpidstarttime)
-      .def_readonly("signal", &FUNCTION_PARAMETER_STRUCT_MD::signal)
-      .def_readonly("confwaitus", &FUNCTION_PARAMETER_STRUCT_MD::confwaitus)
-      .def_readonly("status", &FUNCTION_PARAMETER_STRUCT_MD::status)
-      .def_readonly("NBparamMAX", &FUNCTION_PARAMETER_STRUCT_MD::NBparamMAX)
-      //   .def_readonly("message", &FUNCTION_PARAMETER_STRUCT_MD::message)
-      .def_readonly("msgpindex", &FUNCTION_PARAMETER_STRUCT_MD::msgpindex)
-      .def_readonly("msgcode", &FUNCTION_PARAMETER_STRUCT_MD::msgcode)
-      .def_readonly("msgcnt", &FUNCTION_PARAMETER_STRUCT_MD::msgcnt)
-      .def_readonly("conferrcnt", &FUNCTION_PARAMETER_STRUCT_MD::conferrcnt);
+        ;
+    py::class_<FUNCTION_PARAMETER_STRUCT_MD>(m, "FPS_md")
+        // .def(py::init([]() {
+        //     return std::unique_ptr<FUNCTION_PARAMETER_STRUCT_MD>(new
+        //     FUNCTION_PARAMETER_STRUCT_MD());
+        // }))
+        .def_readonly("name", &FUNCTION_PARAMETER_STRUCT_MD::name)
+        .def_readonly("description", &FUNCTION_PARAMETER_STRUCT_MD::description)
+        .def_readonly("workdir", &FUNCTION_PARAMETER_STRUCT_MD::workdir)
+        .def_readonly("datadir", &FUNCTION_PARAMETER_STRUCT_MD::datadir)
+        .def_readonly("confdir", &FUNCTION_PARAMETER_STRUCT_MD::confdir)
+        .def_readonly("sourcefname", &FUNCTION_PARAMETER_STRUCT_MD::sourcefname)
+        .def_readonly("sourceline", &FUNCTION_PARAMETER_STRUCT_MD::sourceline)
+        .def_readonly("pname", &FUNCTION_PARAMETER_STRUCT_MD::pname)
+        .def_readonly("callprogname", &FUNCTION_PARAMETER_STRUCT_MD::callprogname)
+        //   .def_readonly("nameindexW",
+        //  &FUNCTION_PARAMETER_STRUCT_MD::nameindexW)
+        .def_readonly("NBnameindex", &FUNCTION_PARAMETER_STRUCT_MD::NBnameindex)
+        .def_readonly("confpid", &FUNCTION_PARAMETER_STRUCT_MD::confpid)
+        .def_readonly("confpidstarttime", &FUNCTION_PARAMETER_STRUCT_MD::confpidstarttime)
+        .def_readonly("runpid", &FUNCTION_PARAMETER_STRUCT_MD::runpid)
+        .def_readonly("runpidstarttime", &FUNCTION_PARAMETER_STRUCT_MD::runpidstarttime)
+        .def_readonly("signal", &FUNCTION_PARAMETER_STRUCT_MD::signal)
+        .def_readonly("confwaitus", &FUNCTION_PARAMETER_STRUCT_MD::confwaitus)
+        .def_readonly("status", &FUNCTION_PARAMETER_STRUCT_MD::status)
+        .def_readonly("NBparamMAX", &FUNCTION_PARAMETER_STRUCT_MD::NBparamMAX)
+        //   .def_readonly("message", &FUNCTION_PARAMETER_STRUCT_MD::message)
+        .def_readonly("msgpindex", &FUNCTION_PARAMETER_STRUCT_MD::msgpindex)
+        .def_readonly("msgcode", &FUNCTION_PARAMETER_STRUCT_MD::msgcode)
+        .def_readonly("msgcnt", &FUNCTION_PARAMETER_STRUCT_MD::msgcnt)
+        .def_readonly("conferrcnt", &FUNCTION_PARAMETER_STRUCT_MD::conferrcnt);
 }
diff --git a/python_module/pyFps.hpp b/python_module/pyFps.hpp
index 0792460d..291745d1 100644
--- a/python_module/pyFps.hpp
+++ b/python_module/pyFps.hpp
@@ -1,7 +1,8 @@
 #ifndef PYFPS_H
 #define PYFPS_H
 
-extern "C" {
+extern "C"
+{
 #include "CLIcore.h"
 #include "CLIcore_datainit.h"
 #include "fps_CONFstart.h"
@@ -18,139 +19,148 @@ extern "C" {
  *
  */
 
-enum FPS_status : uint32_t {
-  CONF = FUNCTION_PARAMETER_STRUCT_STATUS_CONF,
-  RUN = FUNCTION_PARAMETER_STRUCT_STATUS_RUN,
-  CMDCONF = FUNCTION_PARAMETER_STRUCT_STATUS_CMDCONF,
-  CMDRUN = FUNCTION_PARAMETER_STRUCT_STATUS_CMDRUN,
-  RUNLOOP = FUNCTION_PARAMETER_STRUCT_STATUS_RUNLOOP,
-  CHECKOK = FUNCTION_PARAMETER_STRUCT_STATUS_CHECKOK,
-  TMUXCONF = FUNCTION_PARAMETER_STRUCT_STATUS_TMUXCONF,
-  TMUXRUN = FUNCTION_PARAMETER_STRUCT_STATUS_TMUXRUN,
-  TMUXCTRL = FUNCTION_PARAMETER_STRUCT_STATUS_TMUXCTRL
+enum FPS_status : uint32_t
+{
+    CONF = FUNCTION_PARAMETER_STRUCT_STATUS_CONF,
+    RUN = FUNCTION_PARAMETER_STRUCT_STATUS_RUN,
+    CMDCONF = FUNCTION_PARAMETER_STRUCT_STATUS_CMDCONF,
+    CMDRUN = FUNCTION_PARAMETER_STRUCT_STATUS_CMDRUN,
+    RUNLOOP = FUNCTION_PARAMETER_STRUCT_STATUS_RUNLOOP,
+    CHECKOK = FUNCTION_PARAMETER_STRUCT_STATUS_CHECKOK,
+    TMUXCONF = FUNCTION_PARAMETER_STRUCT_STATUS_TMUXCONF,
+    TMUXRUN = FUNCTION_PARAMETER_STRUCT_STATUS_TMUXRUN,
+    TMUXCTRL = FUNCTION_PARAMETER_STRUCT_STATUS_TMUXCTRL
 };
 
-enum FPS_type : uint32_t {
-  AUTO = FPTYPE_AUTO,
-  UNDEF = FPTYPE_UNDEF,
-  INT32 = FPTYPE_INT32,
-  UINT32 = FPTYPE_UINT32,
-  INT64 = FPTYPE_INT64,
-  UINT64 = FPTYPE_UINT64,
-  FLOAT32 = FPTYPE_FLOAT32,
-  FLOAT64 = FPTYPE_FLOAT64,
-  PID = FPTYPE_PID,
-  TIMESPEC = FPTYPE_TIMESPEC,
-  FILENAME = FPTYPE_FILENAME,
-  FITSFILENAME = FPTYPE_FITSFILENAME,
-  EXECFILENAME = FPTYPE_EXECFILENAME,
-  DIRNAME = FPTYPE_DIRNAME,
-  STREAMNAME = FPTYPE_STREAMNAME,
-  STRING = FPTYPE_STRING,
-  ONOFF = FPTYPE_ONOFF,
-  PROCESS = FPTYPE_PROCESS,
-  FPSNAME = FPTYPE_FPSNAME,
+enum FPS_type : uint32_t
+{
+    AUTO = FPTYPE_AUTO,
+    UNDEF = FPTYPE_UNDEF,
+    INT32 = FPTYPE_INT32,
+    UINT32 = FPTYPE_UINT32,
+    INT64 = FPTYPE_INT64,
+    UINT64 = FPTYPE_UINT64,
+    FLOAT32 = FPTYPE_FLOAT32,
+    FLOAT64 = FPTYPE_FLOAT64,
+    PID = FPTYPE_PID,
+    TIMESPEC = FPTYPE_TIMESPEC,
+    FILENAME = FPTYPE_FILENAME,
+    FITSFILENAME = FPTYPE_FITSFILENAME,
+    EXECFILENAME = FPTYPE_EXECFILENAME,
+    DIRNAME = FPTYPE_DIRNAME,
+    STREAMNAME = FPTYPE_STREAMNAME,
+    STRING = FPTYPE_STRING,
+    ONOFF = FPTYPE_ONOFF,
+    PROCESS = FPTYPE_PROCESS,
+    FPSNAME = FPTYPE_FPSNAME,
 };
 
-class pyFps {
-  std::string name_;
-  FUNCTION_PARAMETER_STRUCT fps_;
-  std::map<std::string, FPS_type> keys_;
-
-  int read_keys() {
-    int k = 0;
-    while ((k < fps_.md->NBparamMAX) &&
-           (fps_.parray[k].keywordfull[0] != '\0')) {
-      int offset = strlen(fps_.parray[k].keyword[0]) + 1;
-      char *key = fps_.parray[k].keywordfull + offset;
-      keys_[key] = static_cast<FPS_type>(fps_.parray[k].type);
-      k++;
-    }
-
-    return EXIT_SUCCESS;
-  };
-
- public:
-  /**
+class pyFps
+{
+    std::string name_;
+    FUNCTION_PARAMETER_STRUCT fps_;
+    std::map<std::string, FPS_type> keys_;
+
+    int read_keys()
+    {
+        int k = 0;
+        while ((k < fps_.md->NBparamMAX) && (fps_.parray[k].keywordfull[0] != '\0'))
+        {
+            int offset = strlen(fps_.parray[k].keyword[0]) + 1;
+            char *key = fps_.parray[k].keywordfull + offset;
+            keys_[key] = static_cast<FPS_type>(fps_.parray[k].type);
+            k++;
+        }
+
+        return EXIT_SUCCESS;
+    };
+
+  public:
+    /**
    * @brief Read / connect to existing shared memory FPS
 
    * @param name : the name of the shared memory file to connect
    */
-  pyFps(std::string name)
-      : pyFps(name, false, FUNCTION_PARAMETER_NBPARAM_DEFAULT){};
+    pyFps(std::string name) : pyFps(name, false, FUNCTION_PARAMETER_NBPARAM_DEFAULT){};
 
-  /**
+    /**
    * @brief Read or create an shared FPS
    *
    * @param fps_name : the name of the shared memory file to connect
    * @param create : flag for creating of shared memory identifier
    * @param NBparamMAX : Max number of parameters
    */
-  pyFps(std::string fps_name, bool create, int NBparamMAX) : name_(fps_name) {
-    fps_.md = nullptr;
-    fps_.parray = nullptr;  // array of function parameters
-
-    // these variables are local to each process
-    fps_.localstatus = 0;  // 1 if conf loop should be active
-    fps_.SMfd = -1;
-    fps_.CMDmode = 0;
-
-    fps_.NBparam = 0;        // number of parameters in array
-    fps_.NBparamActive = 0;  // number of active parameters
-
-    if (create) {
-      create_and_connect(NBparamMAX);
-    } else {
-      if (connect() == -1) {
-        throw std::runtime_error("FPS does not exist");
-      }
-      read_keys();
+    pyFps(std::string fps_name, bool create, int NBparamMAX) : name_(fps_name)
+    {
+        fps_.md = nullptr;
+        fps_.parray = nullptr; // array of function parameters
+
+        // these variables are local to each process
+        fps_.localstatus = 0; // 1 if conf loop should be active
+        fps_.SMfd = -1;
+        fps_.CMDmode = 0;
+
+        fps_.NBparam = 0;       // number of parameters in array
+        fps_.NBparamActive = 0; // number of active parameters
+
+        if (create)
+        {
+            create_and_connect(NBparamMAX);
+        }
+        else
+        {
+            if (connect() == -1)
+            {
+                throw std::runtime_error("FPS does not exist");
+            }
+            read_keys();
+        }
+        std::cout << "FPS connected" << std::endl;
     }
-    std::cout << "FPS connected" << std::endl;
-  }
 
-  /**
+    /**
    * @brief Destroy the py Fps object
    *
    */
-  ~pyFps() = default;
+    ~pyFps() = default;
 
-  FUNCTION_PARAMETER_STRUCT *operator->() { return &fps_; }
-  operator FUNCTION_PARAMETER_STRUCT *() { return &fps_; }
-  const FUNCTION_PARAMETER_STRUCT_MD *md() const { return fps_.md; }
-  const std::map<std::string, FPS_type> &keys() { return keys_; }
-  const FPS_type keys(const std::string &key) { return keys_[key]; }
+    FUNCTION_PARAMETER_STRUCT *operator->() { return &fps_; }
+    operator FUNCTION_PARAMETER_STRUCT *() { return &fps_; }
+    const FUNCTION_PARAMETER_STRUCT_MD *md() const { return fps_.md; }
+    const std::map<std::string, FPS_type> &keys() { return keys_; }
+    const FPS_type keys(const std::string &key) { return keys_[key]; }
 
-  /**
+    /**
    * @brief Create a and connect object
    *
    * @param NBparamMAX
    * @return int
    */
-  int create_and_connect(int NBparamMAX) {
-    if (connect() == -1) {
-      std::cout << "Creating FPS...";
-      function_parameter_struct_create(NBparamMAX, name_.c_str());
-      std::cout << "Done" << std::endl;
-      connect();
-    } else {
-      connect();
-      read_keys();
+    int create_and_connect(int NBparamMAX)
+    {
+        if (connect() == -1)
+        {
+            std::cout << "Creating FPS...";
+            function_parameter_struct_create(NBparamMAX, name_.c_str());
+            std::cout << "Done" << std::endl;
+            connect();
+        }
+        else
+        {
+            connect();
+            read_keys();
+        }
+        return EXIT_SUCCESS;
     }
-    return EXIT_SUCCESS;
-  }
 
-  /**
+    /**
    * @brief Connect to existing shared memory FPS
 
    * @param name : the name of the shared memory file to connect
    */
-  int connect() {
-    return function_parameter_struct_connect(name_.c_str(), &fps_,
-                                             FPSCONNECT_SIMPLE);
-  };
+    int connect() { return function_parameter_struct_connect(name_.c_str(), &fps_, FPSCONNECT_SIMPLE); };
 
-  /**
+    /**
    * @brief Add parameter to database with default settings
    *
    * If entry already exists, do not modify it
@@ -160,70 +170,73 @@ class pyFps {
    * @param fptype : entry type ("int","double","float","string")
    * @return int
    */
-  int add_entry(std::string entry_name, std::string entry_desc,
-                uint32_t fptype) {
-    keys_[entry_name] = static_cast<FPS_type>(fptype);
-    return function_parameter_add_entry(&fps_, entry_name.c_str(),
-                                        entry_desc.c_str(), fptype,
-                                        FPFLAG_DEFAULT_INPUT, nullptr);
-  }
-
-  /**
+    int add_entry(std::string entry_name, std::string entry_desc, uint32_t fptype)
+    {
+        keys_[entry_name] = static_cast<FPS_type>(fptype);
+        return function_parameter_add_entry(&fps_, entry_name.c_str(), entry_desc.c_str(), fptype, FPFLAG_DEFAULT_INPUT,
+                                            nullptr);
+    }
+
+    /**
    * @brief Get the status object
    *
    * @return int
    */
-  int get_status() { return fps_.md->status; }
+    int get_status() { return fps_.md->status; }
 
-  /**
+    /**
    * @brief Set the status object
    *
    * @param status
    * @return int
    */
-  int set_status(int status) {
-    fps_.md->status = status;
-    return EXIT_SUCCESS;
-  }
+    int set_status(int status)
+    {
+        fps_.md->status = status;
+        return EXIT_SUCCESS;
+    }
 
-  /**
+    /**
    * @brief Get the levelKeys object
    *
    * @param level
    * @return std::vector<std::string>
    */
-  std::vector<std::string> get_levelKeys(int level) {
-    std::vector<std::string> levelKeys = std::vector<std::string>();
-    int k = 0;
-    while (fps_.parray[k].keywordfull[0] != '\0' && k < fps_.md->NBparamMAX) {
-      std::string tmp = fps_.parray[k].keyword[level];
-      auto exist = std::find(levelKeys.begin(), levelKeys.end(), tmp);
-      if (exist == levelKeys.end()) {
-        levelKeys.push_back(tmp);
-      }
-      k++;
+    std::vector<std::string> get_levelKeys(int level)
+    {
+        std::vector<std::string> levelKeys = std::vector<std::string>();
+        int k = 0;
+        while (fps_.parray[k].keywordfull[0] != '\0' && k < fps_.md->NBparamMAX)
+        {
+            std::string tmp = fps_.parray[k].keyword[level];
+            auto exist = std::find(levelKeys.begin(), levelKeys.end(), tmp);
+            if (exist == levelKeys.end())
+            {
+                levelKeys.push_back(tmp);
+            }
+            k++;
+        }
+
+        return levelKeys;
     }
 
-    return levelKeys;
-  }
-
-  errno_t CONFstart() { return functionparameter_CONFstart(&fps_); }
+    errno_t CONFstart() { return functionparameter_CONFstart(&fps_); }
 
-  errno_t CONFstop() { return functionparameter_CONFstop(&fps_); }
+    errno_t CONFstop() { return functionparameter_CONFstop(&fps_); }
 
-  errno_t FPCONFexit() { return function_parameter_FPCONFexit(&fps_); }
+    errno_t FPCONFexit() { return function_parameter_FPCONFexit(&fps_); }
 
-  // errno_t  FPCONFsetup(){
-  //   return function_parameter_FPCONFsetup(&fps_);
-  // }
+    // errno_t  FPCONFsetup(){
+    //   return function_parameter_FPCONFsetup(&fps_);
+    // }
 
-  errno_t FPCONFloopstep() { return function_parameter_FPCONFloopstep(&fps_); }
+    errno_t FPCONFloopstep() { return function_parameter_FPCONFloopstep(&fps_); }
 
-  errno_t RUNstart() { return functionparameter_RUNstart(&fps_); }
+    errno_t RUNstart() { return functionparameter_RUNstart(&fps_); }
 
-  errno_t RUNstop() { return functionparameter_RUNstop(&fps_); }
+    errno_t RUNstop() { return functionparameter_RUNstop(&fps_); }
 
-  errno_t RUNexit() { return function_parameter_RUNexit(&fps_); }
+    errno_t RUNexit() { return function_parameter_RUNexit(&fps_); }
 };
 
 #endif
diff --git a/python_module/pyProcessInfo.hpp b/python_module/pyProcessInfo.hpp
index c63a61ef..6cdfeb43 100644
--- a/python_module/pyProcessInfo.hpp
+++ b/python_module/pyProcessInfo.hpp
@@ -2,25 +2,27 @@
 #ifndef PYPROCESSINFO_H
 #define PYPROCESSINFO_H
 
-extern "C" {
+extern "C"
+{
 #include "CLIcore.h"
 #include "CLIcore_datainit.h"
 #include "processinfo.h"
 #include "processtools.h"
 }
 
-class pyProcessInfo {
-  PROCESSINFO *m_pinfo;
-  int m_fd;
+class pyProcessInfo
+{
+    PROCESSINFO *m_pinfo;
+    int m_fd;
 
- public:
-  /**
+  public:
+    /**
    * @brief Construct a empty Process Info object
    *
    */
-  pyProcessInfo() : m_pinfo(nullptr) {}
+    pyProcessInfo() : m_pinfo(nullptr) {}
 
-  /**
+    /**
    * @brief Construct a new Process Info object
    *
    * @param pname : name of the Process Info object (human-readable)
@@ -30,22 +32,24 @@ class pyProcessInfo {
    *                 - 2: increment single step (will go back to 1)
    *                 - 3: exit loop
    */
-  pyProcessInfo(char *pname, int CTRLval) { create(pname, CTRLval); }
+    pyProcessInfo(char *pname, int CTRLval) { create(pname, CTRLval); }
 
-  /**
+    /**
    * @brief Destroy the Process Info object
    *
    */
-  ~pyProcessInfo() {
-    if (m_pinfo != nullptr) {
-      processinfo_cleanExit(m_pinfo);
-      m_pinfo = nullptr;
+    ~pyProcessInfo()
+    {
+        if (m_pinfo != nullptr)
+        {
+            processinfo_cleanExit(m_pinfo);
+            m_pinfo = nullptr;
+        }
     }
-  }
 
-  PROCESSINFO *operator->() { return m_pinfo; }
+    PROCESSINFO *operator->() { return m_pinfo; }
 
-  /**
+    /**
    * @brief Create Process Info object in shared memory
    *
    * The structure holds real-time information about a process, so its status can be monitored and controlled
@@ -59,21 +63,22 @@ class pyProcessInfo {
    *                 - 3: exit loop
    * @return int : error code
    */
-  int create(char *pname, int CTRLval) {
-    // if (m_pinfo != nullptr) {
-    //   processinfo_cleanExit(m_pinfo);
-    // }
-    m_pinfo = processinfo_shm_create(pname, CTRLval);
-    m_pinfo->loopstat = 0;  // loop initialization
-    strcpy(m_pinfo->source_FUNCTION, "\0");
-    strcpy(m_pinfo->source_FILE, "\0");
-    m_pinfo->source_LINE = 0;
-    strcpy(m_pinfo->description, "\0");
-    writeMessage("initialization done");
-    return EXIT_SUCCESS;
-  }
+    int create(char *pname, int CTRLval)
+    {
+        // if (m_pinfo != nullptr) {
+        //   processinfo_cleanExit(m_pinfo);
+        // }
+        m_pinfo = processinfo_shm_create(pname, CTRLval);
+        m_pinfo->loopstat = 0; // loop initialization
+        strcpy(m_pinfo->source_FUNCTION, "\0");
+        strcpy(m_pinfo->source_FILE, "\0");
+        m_pinfo->source_LINE = 0;
+        strcpy(m_pinfo->description, "\0");
+        writeMessage("initialization done");
+        return EXIT_SUCCESS;
+    }
 
-  /**
+    /**
    * @brief Link an existing Process Info object in shared memory
    *
    * The structure holds real-time information about a process, so its status can be monitored and controlled
@@ -82,73 +87,83 @@ class pyProcessInfo {
    * @param pname : name of the Process Info object (human-readable)
    * @return int : error code
    */
-  int link(char *pname){
-    m_pinfo = processinfo_shm_link(pname, &m_fd);
-    return EXIT_SUCCESS;
-  }
+    int link(char *pname)
+    {
+        m_pinfo = processinfo_shm_link(pname, &m_fd);
+        return EXIT_SUCCESS;
+    }
 
-  /**
+    /**
    * @brief Close an existing Process Info object in shared memory
    *
    * @param pname : name of the Process Info object (human-readable)
    * @return int : error code
    */
-  int close(char *pname){
-    processinfo_shm_close(m_pinfo, m_fd);
-    return EXIT_SUCCESS;
-  }
+    int close(char *pname)
+    {
+        processinfo_shm_close(m_pinfo, m_fd);
+        return EXIT_SUCCESS;
+    }
 
-  /**
+    /**
    * @brief Send a signal to a Process Info object
    *
    * @param sig : signal to send
    * @return int : error code
    */
-  int sigexit(int sig) {
-    if (m_pinfo != nullptr) {
-      int ret = processinfo_SIGexit(m_pinfo, sig);
-      m_pinfo = nullptr;
-      return ret;
+    int sigexit(int sig)
+    {
+        if (m_pinfo != nullptr)
+        {
+            int ret = processinfo_SIGexit(m_pinfo, sig);
+            m_pinfo = nullptr;
+            return ret;
+        }
+        return EXIT_FAILURE;
     }
-    return EXIT_FAILURE;
-  }
 
-  /**
+    /**
    * @brief Write a message into a Process Info object
    *
    * @param message : message to write
    * @return int : error code
    */
-  int writeMessage(const char *message) {
-    if (m_pinfo != nullptr) {
-      return processinfo_WriteMessage(m_pinfo, message);
-    }
-    return EXIT_FAILURE;
-  };
+    int writeMessage(const char *message)
+    {
+        if (m_pinfo != nullptr)
+        {
+            return processinfo_WriteMessage(m_pinfo, message);
+        }
+        return EXIT_FAILURE;
+    };
 
-  /**
+    /**
    * @brief Define the start of the process (timing purpose)
    *
    * @return int : error code
    */
-  int exec_start() {
-    if ( (m_pinfo != nullptr) && (m_pinfo->MeasureTiming==1) ) {
-      return processinfo_exec_start(m_pinfo);
-    }
-    return EXIT_FAILURE;
-  };
+    int exec_start()
+    {
+        if ((m_pinfo != nullptr) && (m_pinfo->MeasureTiming == 1))
+        {
+            return processinfo_exec_start(m_pinfo);
+        }
+        return EXIT_FAILURE;
+    };
 
-  /**
+    /**
    * @brief Define the end of the process (timing purpose)
    *
    * @return int : error code
    */
-  int exec_end() {
-    if ( (m_pinfo != nullptr) && (m_pinfo->MeasureTiming==1) ) {
-      return processinfo_exec_end(m_pinfo);
-    }
-    return EXIT_FAILURE;
-  };
+    int exec_end()
+    {
+        if ((m_pinfo != nullptr) && (m_pinfo->MeasureTiming == 1))
+        {
+            return processinfo_exec_end(m_pinfo);
+        }
+        return EXIT_FAILURE;
+    };
 };
 
-#endif
\ No newline at end of file
+#endif
diff --git a/scripts/merge3DfitsTelemetry b/scripts/merge3DfitsTelemetry
index 34c2730f..c6e53128 100755
--- a/scripts/merge3DfitsTelemetry
+++ b/scripts/merge3DfitsTelemetry
@@ -3,12 +3,12 @@
 EXPECTED_ARGS=3
 if [ $# -ne $EXPECTED_ARGS ]
 then
-  echo
-  echo " ---------- merge 3D telemetry FITS cubes ----------- "
-  echo
-  echo " Usage:  $0 <Directory> <File Prefix> <Number of files>"
-  echo 
-  echo "looks for files <File Prefix>.<xxx>, xxx from 000 to number of files"
+    echo
+    echo " ---------- merge 3D telemetry FITS cubes ----------- "
+    echo
+    echo " Usage:  $0 <Directory> <File Prefix> <Number of files>"
+    echo
+    echo "looks for files <File Prefix>.<xxx>, xxx from 000 to number of files"
 fi
 
 pname=$0
diff --git a/scripts/milk-FITS2shm b/scripts/milk-FITS2shm
index 8998b905..f136ba33 100755
--- a/scripts/milk-FITS2shm
+++ b/scripts/milk-FITS2shm
@@ -8,47 +8,47 @@ VERBOSE="0"
 
 
 function printHELP {
-echo "------------------------------------------------------------------------"
-echo "$(tput bold) $pname : Copy FITS files to shared memory $(tput sgr0)"
-echo "------------------------------------------------------------------------"
-echo "  Copy FITS file to shared memory"
-echo "  Writes into ./loadedSM/ what has been loaded"
-echo "  unless -f option, will not re-load unchanged files"
-echo "   "
-echo " $(tput bold)USAGE (conf name output):$(tput sgr0)"
-echo "     $0 [-hfpr] <FITS file> <shared memory stream name>"
-echo " $(tput bold)USAGE (conf name input):$(tput sgr0)"
-echo "     $0 -c [-hfpr] <shared memory stream name>"
-echo ""
-echo " $(tput bold)OPTIONS:$(tput sgr0)"
-echo "     $(tput bold)-h$(tput sgr0)           help"
-echo "     $(tput bold)-f$(tput sgr0)           force load (even if unchanged file)"
-echo "     $(tput bold)-c$(tput sgr0)           read FITS file name from ./conf/shmim.<streamname>.name.txt directory"
-echo "     $(tput bold)-p$(tput sgr0) <pref>    stream prefix"
-echo "     $(tput bold)-r$(tput sgr0)           remove / clear previous stream and associated files"
-echo ""
-echo " $(tput bold)INPUT:$(tput sgr0)"
-echo "   <FITS file>    filesystem FITS file"
-echo "   <stream>       shared memory stream name"
-echo ""
-echo " $(tput bold)EXAMPLES:$(tput sgr0)"
-echo "   $0 -f image32.fits ims10"
-echo "        Load image32.fits to stream ims10"
-echo "        -f option : force load even if image and stream have not changed"
-echo "        write \"image32.fits\" into file \"conf/shmim.ims10.name.txt"
-echo "   echo \"image102.fits\" > conf/shmim.ims10.name.txt"
-echo "   $0 -c ims10"
-echo "        Load image102.fits to stream ims10"
-echo "   $0 -c -p aol3_ ims10"
-echo "        Load image102.fits to stream aol3_ims10"
-echo ""
-echo "------------------------------------------------------------------------"
+    echo "------------------------------------------------------------------------"
+    echo "$(tput bold) $pname : Copy FITS files to shared memory $(tput sgr0)"
+    echo "------------------------------------------------------------------------"
+    echo "  Copy FITS file to shared memory"
+    echo "  Writes into ./loadedSM/ what has been loaded"
+    echo "  unless -f option, will not re-load unchanged files"
+    echo "   "
+    echo " $(tput bold)USAGE (conf name output):$(tput sgr0)"
+    echo "     $0 [-hfpr] <FITS file> <shared memory stream name>"
+    echo " $(tput bold)USAGE (conf name input):$(tput sgr0)"
+    echo "     $0 -c [-hfpr] <shared memory stream name>"
+    echo ""
+    echo " $(tput bold)OPTIONS:$(tput sgr0)"
+    echo "     $(tput bold)-h$(tput sgr0)           help"
+    echo "     $(tput bold)-f$(tput sgr0)           force load (even if unchanged file)"
+    echo "     $(tput bold)-c$(tput sgr0)           read FITS file name from ./conf/shmim.<streamname>.name.txt directory"
+    echo "     $(tput bold)-p$(tput sgr0) <pref>    stream prefix"
+    echo "     $(tput bold)-r$(tput sgr0)           remove / clear previous stream and associated files"
+    echo ""
+    echo " $(tput bold)INPUT:$(tput sgr0)"
+    echo "   <FITS file>    filesystem FITS file"
+    echo "   <stream>       shared memory stream name"
+    echo ""
+    echo " $(tput bold)EXAMPLES:$(tput sgr0)"
+    echo "   $0 -f image32.fits ims10"
+    echo "        Load image32.fits to stream ims10"
+    echo "        -f option : force load even if image and stream have not changed"
+    echo "        write \"image32.fits\" into file \"conf/shmim.ims10.name.txt"
+    echo "   echo \"image102.fits\" > conf/shmim.ims10.name.txt"
+    echo "   $0 -c ims10"
+    echo "        Load image102.fits to stream ims10"
+    echo "   $0 -c -p aol3_ ims10"
+    echo "        Load image102.fits to stream aol3_ims10"
+    echo ""
+    echo "------------------------------------------------------------------------"
 }
 
 
 printHELP1 ()
 {
-    printf "%25s       Copy FITS files to shared memory\n" "$0" 
+    printf "%25s       Copy FITS files to shared memory\n" "$0"
 }
 
 
@@ -58,23 +58,23 @@ printHELP1 ()
 EXITSTATUS=0
 
 function checkFile {
-if [ -f $1 ]
-  then
-    echo "[$(tput setaf 2)$(tput bold)   OK   $(tput sgr0)] File $(tput bold)$1$(tput sgr0) found"
-   else
-    echo "[$(tput setaf 1)$(tput bold) FAILED $(tput sgr0)] File $(tput bold)$1$(tput sgr0) not found"
-    EXITSTATUS=1
-fi
+    if [ -f $1 ]
+    then
+        echo "[$(tput setaf 2)$(tput bold)   OK   $(tput sgr0)] File $(tput bold)$1$(tput sgr0) found"
+    else
+        echo "[$(tput setaf 1)$(tput bold) FAILED $(tput sgr0)] File $(tput bold)$1$(tput sgr0) not found"
+        EXITSTATUS=1
+    fi
 }
 
 function checkDir {
-if [ -d $1 ]
-  then
-    echo "[$(tput setaf 2)$(tput bold)   OK   $(tput sgr0)] Directory $(tput bold)$1$(tput sgr0) found"
-   else
-    echo "[$(tput setaf 1)$(tput bold) FAILED $(tput sgr0)] Directory $(tput bold)$1$(tput sgr0) not found"
-    EXITSTATUS=1
-fi
+    if [ -d $1 ]
+    then
+        echo "[$(tput setaf 2)$(tput bold)   OK   $(tput sgr0)] Directory $(tput bold)$1$(tput sgr0) found"
+    else
+        echo "[$(tput setaf 1)$(tput bold) FAILED $(tput sgr0)] Directory $(tput bold)$1$(tput sgr0) not found"
+        EXITSTATUS=1
+    fi
 }
 
 
@@ -86,15 +86,15 @@ fi
 # Transform long options to short ones
 singlelinehelp=0
 for arg in "$@"; do
-  shift
-  case "$arg" in
-    "--help") set -- "$@" "-h" ;;
-    "--help1") 
-set -- "$@" "-h" 
-singlelinehelp=1;
-;;
-    *)        set -- "$@" "$arg"
-  esac
+    shift
+    case "$arg" in
+        "--help") set -- "$@" "-h" ;;
+        "--help1")
+            set -- "$@" "-h"
+            singlelinehelp=1;
+            ;;
+        *)        set -- "$@" "$arg"
+    esac
 done
 
 
@@ -104,36 +104,36 @@ SMPREFIX=""
 CLEARSTREAM="0"
 
 while getopts :hfcp:r FLAG; do
-  case $FLAG in
-    h)  #show help
-      if [ "$singlelinehelp" -eq "0" ]; then
-      printHELP
-      else
-      printHELP1
-      fi
-      exit
-      ;;
-    c) # read from conf 
-	  READFROMCONF=1
-	  NBARGS=1
-    ;;
-    f)
-    FORCE="1"
-    ;;
-    p)
-    SMPREFIX="$OPTARG"
-    ;;
-    r)
-    CLEARSTREAM="1"
-    ;;
-    \?) #unrecognized option - show help
-      echo -e \\n"Option -${BOLD}$OPTARG${NORM} not allowed."
-      printHELP
-      ;;
-  esac
+    case $FLAG in
+        h)  #show help
+            if [ "$singlelinehelp" -eq "0" ]; then
+                printHELP
+            else
+                printHELP1
+            fi
+            exit
+            ;;
+        c) # read from conf
+            READFROMCONF=1
+            NBARGS=1
+            ;;
+        f)
+            FORCE="1"
+            ;;
+        p)
+            SMPREFIX="$OPTARG"
+            ;;
+        r)
+            CLEARSTREAM="1"
+            ;;
+        \?) #unrecognized option - show help
+            echo -e \\n"Option -${BOLD}$OPTARG${NORM} not allowed."
+            printHELP
+            ;;
+    esac
 done
 
-shift $((OPTIND-1)) 
+shift $((OPTIND-1))
 
 
 
@@ -142,32 +142,32 @@ shift $((OPTIND-1))
 
 
 if [ "$1" = "help" ] || [ "$#" -ne $NBARGS ]; then
-if [ "$#" -ne $NBARGS ]; then
-    echo "$(tput setaf 1)$(tput bold) Illegal number of parameters ($NBARGS params required, $# entered) $(tput sgr0)"
-fi
-printHELP
-        exit
+    if [ "$#" -ne $NBARGS ]; then
+        echo "$(tput setaf 1)$(tput bold) Illegal number of parameters ($NBARGS params required, $# entered) $(tput sgr0)"
+    fi
+    printHELP
+    exit
 fi
 
 
 
 # ======================= CHECK REQUIRED FILES =================================
 if [ "$READFROMCONF" = "0" ]; then
-checkFile $1
+    checkFile $1
 else
-checkFile conf/shmim.$1.name.txt
+    checkFile conf/shmim.$1.name.txt
 fi
 
 
 
 
 if [ $EXITSTATUS -eq 1 ]; then
-echo ""
-echo "$(tput setaf 1)$(tput bold) REQUIRED FILES, COMMANDS NOT FOUND: EXITING $(tput sgr0)"
-echo ""
-exit
+    echo ""
+    echo "$(tput setaf 1)$(tput bold) REQUIRED FILES, COMMANDS NOT FOUND: EXITING $(tput sgr0)"
+    echo ""
+    exit
 else
-echo ""
+    echo ""
 fi
 
 
@@ -179,13 +179,13 @@ fi
 
 
 if [ "$READFROMCONF" = "0" ]; then
-FITSfname="$1"
-STREAMname="$2"
-STREAMname0="$2"
+    FITSfname="$1"
+    STREAMname="$2"
+    STREAMname0="$2"
 else
-STREAMname0="$1"
-STREAMname="${SMPREFIX}$1"
-FITSfname=$( cat ./conf/shmim.$1.name.txt )
+    STREAMname0="$1"
+    STREAMname="${SMPREFIX}$1"
+    FITSfname=$( cat ./conf/shmim.$1.name.txt )
 fi
 
 
@@ -194,9 +194,9 @@ fi
 # if it is, resolve link
 #
 if [ -L "$FITSfname" ]; then
-flink=$( readlink -f $FITSfname )
-rm $FITSfname
-rsync -auL $flink $FITSfname
+    flink=$( readlink -f $FITSfname )
+    rm $FITSfname
+    rsync -auL $flink $FITSfname
 fi
 
 
@@ -212,11 +212,11 @@ mkdir -p loadedSM
 
 
 if [ "$CLEARSTREAM" = "1" ]; then # clear stream and associated files
-rm ./loadedSM/${STREAMname0}.*
-rm $MILK_SHM_DIR/${STREAMname}.im.shm
-rm /dev/shm/sem.${STREAMname}.*
-rm ./conf/shmim.${STREAMname0}.imsize.txt
-rm ./conf/shmim.${STREAMname0}.fits
+    rm ./loadedSM/${STREAMname0}.*
+    rm $MILK_SHM_DIR/${STREAMname}.im.shm
+    rm /dev/shm/sem.${STREAMname}.*
+    rm ./conf/shmim.${STREAMname0}.imsize.txt
+    rm ./conf/shmim.${STREAMname0}.fits
 fi
 
 
@@ -233,22 +233,22 @@ stat -L --format "%n %s %y" ${FITSfname} > ./loadedSM/${STREAMname0}.FITSinfo
 str1=$(cat ./loadedSM/${STREAMname0}.FITSinfo.old)
 str2=$(cat ./loadedSM/${STREAMname0}.FITSinfo)
 if [ "$str1" = "$str2" ]; then
-if [ "$VERBOSE" = "1" ]; then
-echo "======= FITS file unchanged ========"
-echo "======= LOADfile = $LOADfile ========"
-fi
-touch ./loadedSM/${STREAMname0}.FITSsame
-rm ./loadedSM/${STREAMname0}.FITSchanged &> /dev/null
-NEW="0"
+    if [ "$VERBOSE" = "1" ]; then
+        echo "======= FITS file unchanged ========"
+        echo "======= LOADfile = $LOADfile ========"
+    fi
+    touch ./loadedSM/${STREAMname0}.FITSsame
+    rm ./loadedSM/${STREAMname0}.FITSchanged &> /dev/null
+    NEW="0"
 else
-if [ "$VERBOSE" = "1" ]; then
-echo "======= FITS file changed =========="
-echo "======= LOADfile = $LOADfile ========"
-fi
-rm ./loadedSM/${STREAMname0}.FITSsame &> /dev/null
-touch ./loadedSM/${STREAMname0}.FITSchanged
-NEW="1"
-LOADfile="1"
+    if [ "$VERBOSE" = "1" ]; then
+        echo "======= FITS file changed =========="
+        echo "======= LOADfile = $LOADfile ========"
+    fi
+    rm ./loadedSM/${STREAMname0}.FITSsame &> /dev/null
+    touch ./loadedSM/${STREAMname0}.FITSchanged
+    NEW="1"
+    LOADfile="1"
 fi
 rm ./loadedSM/${STREAMname0}.SMloaded.old &> /dev/null
 
@@ -261,22 +261,22 @@ str1=$(cat ./loadedSM/${STREAMname0}.SMinfo.old)
 str2=$(cat ./loadedSM/${STREAMname0}.SMinfo)
 
 if [ "$str1" = "$str2" ]; then
-if [ "$VERBOSE" = "1" ]; then
-echo "======= SM file unchanged ========"
-echo "======= LOADfile = $LOADfile ========"
-fi
-touch ./loadedSM/${STREAMname0}.SMsame
-rm ./loadedSM/${STREAMname0}.SMchanged &> /dev/null
-NEW_SM="0"
+    if [ "$VERBOSE" = "1" ]; then
+        echo "======= SM file unchanged ========"
+        echo "======= LOADfile = $LOADfile ========"
+    fi
+    touch ./loadedSM/${STREAMname0}.SMsame
+    rm ./loadedSM/${STREAMname0}.SMchanged &> /dev/null
+    NEW_SM="0"
 else
-if [ "$VERBOSE" = "1" ]; then
-echo "======= SM file changed =========="
-echo "======= LOADfile = $LOADfile ========"
-fi
-rm ./loadedSM/${STREAMname0}.SMsame &> /dev/null
-touch ./loadedSM/${STREAMname0}.SMchanged
-NEW_SM="1"
-LOADfile="1"
+    if [ "$VERBOSE" = "1" ]; then
+        echo "======= SM file changed =========="
+        echo "======= LOADfile = $LOADfile ========"
+    fi
+    rm ./loadedSM/${STREAMname0}.SMsame &> /dev/null
+    touch ./loadedSM/${STREAMname0}.SMchanged
+    NEW_SM="1"
+    LOADfile="1"
 fi
 rm ./loadedSM/${STREAMname0}.SMinfo.old &> /dev/null
 
@@ -285,28 +285,28 @@ rm ./loadedSM/${STREAMname0}.SMinfo.old &> /dev/null
 
 
 if [ ! -f "$MILK_SHM_DIR/${STREAMname}.im.shm" ]; then
-if [ "$VERBOSE" = "1" ]; then
-echo "======= SM file missing =========="
-echo "======= LOADfile = $LOADfile ========"
-fi
-touch ./loadedSM/${STREAMname0}.missing
-LOADfile="1"
+    if [ "$VERBOSE" = "1" ]; then
+        echo "======= SM file missing =========="
+        echo "======= LOADfile = $LOADfile ========"
+    fi
+    touch ./loadedSM/${STREAMname0}.missing
+    LOADfile="1"
 else
-rm ./loadedSM/${STREAMname0}.missing &> /dev/null
+    rm ./loadedSM/${STREAMname0}.missing &> /dev/null
 fi
 
 
 if [ "$FORCE" = "1" ]; then
-if [ "$VERBOSE" = "1" ]; then
-echo "======= FORCE MODE =========="
-echo "======= LOADfile = $LOADfile ========"
-fi
-LOADfile="1"
+    if [ "$VERBOSE" = "1" ]; then
+        echo "======= FORCE MODE =========="
+        echo "======= LOADfile = $LOADfile ========"
+    fi
+    LOADfile="1"
 fi
 
 
 if [ "$VERBOSE" = "1" ]; then
-echo "======= LOADfile = $LOADfile ========"
+    echo "======= LOADfile = $LOADfile ========"
 fi
 
 
@@ -315,7 +315,7 @@ fi
 if [ "$LOADfile" = "1" ]; then
 
 
-milk -n $pname << EOF
+    milk -n $pname << EOF
 loadfits "${FITSfname}" im
 readshmim "${STREAMname}"
 cpsh im "${STREAMname}"
@@ -323,23 +323,21 @@ readshmimsize ${STREAMname} "./loadedSM/${STREAMname0}.imsize"
 exitCLI
 EOF
 
-# copy imsize to conf
-cp ./loadedSM/${STREAMname0}.imsize ./conf/shmim.${STREAMname0}.imsize.txt
-# add link to conf
-rm ./conf/shmim.${STREAMname0}.fits
-ln -s ${PWD}/${FITSfname} ./conf/shmim.${STREAMname0}.fits
+    # copy imsize to conf
+    cp ./loadedSM/${STREAMname0}.imsize ./conf/shmim.${STREAMname0}.imsize.txt
+    # add link to conf
+    rm ./conf/shmim.${STREAMname0}.fits
+    ln -s ${PWD}/${FITSfname} ./conf/shmim.${STREAMname0}.fits
 
 
-# write SM stat AFTER it has been updated
-stat -L --format "%n %s %y" $MILK_SHM_DIR/${STREAMname}.im.shm > ./loadedSM/${STREAMname0}.SMinfo
-rm ./loadedSM/${STREAMname0}.kept &> /dev/null
-touch ./loadedSM/${STREAMname0}.changed
+    # write SM stat AFTER it has been updated
+    stat -L --format "%n %s %y" $MILK_SHM_DIR/${STREAMname}.im.shm > ./loadedSM/${STREAMname0}.SMinfo
+    rm ./loadedSM/${STREAMname0}.kept &> /dev/null
+    touch ./loadedSM/${STREAMname0}.changed
 
 else
 
-touch ./loadedSM/${STREAMname0}.kept
-rm ./loadedSM/${STREAMname0}.changed &> /dev/null
+    touch ./loadedSM/${STREAMname0}.kept
+    rm ./loadedSM/${STREAMname0}.changed &> /dev/null
 
 fi
-
-
diff --git a/scripts/milk-argparse b/scripts/milk-argparse
index be56f487..43236bc7 100755
--- a/scripts/milk-argparse
+++ b/scripts/milk-argparse
@@ -75,44 +75,44 @@ QUIET=0
 
 
 function checkFile {
-	if [ -f $1 ]; then
-		echo "[$(tput setaf 2)$(tput bold)   OK   $(tput sgr0)] File $(tput bold)$1$(tput sgr0) found"
-	else
-		echo "[$(tput setaf 1)$(tput bold) FAILED $(tput sgr0)] File $(tput bold)$1$(tput sgr0) not found"
-		EXITSTATUS=1
-	fi
+    if [ -f $1 ]; then
+        echo "[$(tput setaf 2)$(tput bold)   OK   $(tput sgr0)] File $(tput bold)$1$(tput sgr0) found"
+    else
+        echo "[$(tput setaf 1)$(tput bold) FAILED $(tput sgr0)] File $(tput bold)$1$(tput sgr0) not found"
+        EXITSTATUS=1
+    fi
 }
 
 function checkDir {
-	if [ -d $1 ]; then
-		echo "[$(tput setaf 2)$(tput bold)   OK   $(tput sgr0)] Directory $(tput bold)$1$(tput sgr0) found"
-	else
-		echo "[$(tput setaf 1)$(tput bold) FAILED $(tput sgr0)] Directory $(tput bold)$1$(tput sgr0) not found"
-		EXITSTATUS=1
-	fi
+    if [ -d $1 ]; then
+        echo "[$(tput setaf 2)$(tput bold)   OK   $(tput sgr0)] Directory $(tput bold)$1$(tput sgr0) found"
+    else
+        echo "[$(tput setaf 1)$(tput bold) FAILED $(tput sgr0)] Directory $(tput bold)$1$(tput sgr0) not found"
+        EXITSTATUS=1
+    fi
 }
 
 
 
 function cmdexists()
 {
-  command -v "$1" >/dev/null 2>&1
+    command -v "$1" >/dev/null 2>&1
 }
 
 
 function checkCommand {
-if cmdexists $1; then
-	if [ ${QUIET} = 0 ]; then
-		echo "[$(tput setaf 2)$(tput bold)   OK   $(tput sgr0)] Command $(tput bold)$1$(tput sgr0) found"
-    fi
-    COMMAND_FOUND=1
-else
-	if [ ${QUIET} = 0 ]; then
-		echo "[$(tput setaf 1)$(tput bold) FAILED $(tput sgr0)] Command $(tput bold)$1$(tput sgr0) not installed.  Aborting."
+    if cmdexists $1; then
+        if [ ${QUIET} = 0 ]; then
+            echo "[$(tput setaf 2)$(tput bold)   OK   $(tput sgr0)] Command $(tput bold)$1$(tput sgr0) found"
+        fi
+        COMMAND_FOUND=1
+    else
+        if [ ${QUIET} = 0 ]; then
+            echo "[$(tput setaf 1)$(tput bold) FAILED $(tput sgr0)] Command $(tput bold)$1$(tput sgr0) not installed.  Aborting."
+        fi
+        COMMAND_FOUND=0
+        EXITSTATUS=1;
     fi
-    COMMAND_FOUND=0
-    EXITSTATUS=1;
-fi
 }
 
 
@@ -122,61 +122,61 @@ fi
 
 function printHELP {
 
-optlistshort=""
-optindex=0
-while [ $optindex -lt ${NBopt} ]; do
-  optlistshort="${optlistshort}[${fgRed}-${inputMSoptshortARRAY[$optindex]}${txReset}]"
-  let optindex+=1
-done
-
-argliststring=""
-argindex=0
-while [ $argindex -lt ${NBarg} ]; do
-  argliststring="${argliststring} ${inputMSargnameARRAY[$argindex]}"
-  let argindex+=1
-done
-
-
-echo "------------------------------------------------------------------------"
-echo "${txBold} ${pname} : ${MSdescr}  ${txReset}"
-echo " $0"
-echo "------------------------------------------------------------------------"
-echo ""
-set +o nounset
-if [ ! -z "${MSextdescr}" ]; then
-printf "${MSextdescr}"
-echo ""
-echo ""
-fi
-set -o nounset
-echo " $(tput bold)USAGE:$(tput sgr0)"
-echo "     ${pname} [OPTION(S)] ${fgYellow}${argliststring}${txReset}"
-echo "     option(s): ${optlistshort}"
-echo ""
-echo " $(tput bold)ARGUMENTS:$(tput sgr0)"
-argindex=0
-while [ $argindex -lt ${NBarg} ]; do
-  printf "  %12s [%s]\n     %s\n" "${fgYellow}${inputMSargnameARRAY[$argindex]}${txReset}" "${fgGreen}${inputMSargtypeARRAY[$argindex]}${txReset}" "${inputMSargdescrARRAY[$argindex]}"
-  let argindex+=1
-done
-echo ""
-echo " $(tput bold)OPTIONS:$(tput sgr0)"
-optindex=0
-while [ $optindex -lt ${NBopt} ]; do
-  echo -e " ${fgRed}-${inputMSoptshortARRAY[$optindex]}${txReset}, ${fgRed}--${inputMSoptlongARRAY[$optindex]}${txReset} ${fgBGreen}${inputMSoptargARRAY[$optindex]}${txReset}"
-  echo "     ${inputMSoptdescrARRAY[$optindex]}"
-  let optindex+=1
-done
-echo ""
-exit
+    optlistshort=""
+    optindex=0
+    while [ $optindex -lt ${NBopt} ]; do
+        optlistshort="${optlistshort}[${fgRed}-${inputMSoptshortARRAY[$optindex]}${txReset}]"
+        let optindex+=1
+    done
+
+    argliststring=""
+    argindex=0
+    while [ $argindex -lt ${NBarg} ]; do
+        argliststring="${argliststring} ${inputMSargnameARRAY[$argindex]}"
+        let argindex+=1
+    done
+
+
+    echo "------------------------------------------------------------------------"
+    echo "${txBold} ${pname} : ${MSdescr}  ${txReset}"
+    echo " $0"
+    echo "------------------------------------------------------------------------"
+    echo ""
+    set +o nounset
+    if [ ! -z "${MSextdescr}" ]; then
+        printf "${MSextdescr}"
+        echo ""
+        echo ""
+    fi
+    set -o nounset
+    echo " $(tput bold)USAGE:$(tput sgr0)"
+    echo "     ${pname} [OPTION(S)] ${fgYellow}${argliststring}${txReset}"
+    echo "     option(s): ${optlistshort}"
+    echo ""
+    echo " $(tput bold)ARGUMENTS:$(tput sgr0)"
+    argindex=0
+    while [ $argindex -lt ${NBarg} ]; do
+        printf "  %12s [%s]\n     %s\n" "${fgYellow}${inputMSargnameARRAY[$argindex]}${txReset}" "${fgGreen}${inputMSargtypeARRAY[$argindex]}${txReset}" "${inputMSargdescrARRAY[$argindex]}"
+        let argindex+=1
+    done
+    echo ""
+    echo " $(tput bold)OPTIONS:$(tput sgr0)"
+    optindex=0
+    while [ $optindex -lt ${NBopt} ]; do
+        echo -e " ${fgRed}-${inputMSoptshortARRAY[$optindex]}${txReset}, ${fgRed}--${inputMSoptlongARRAY[$optindex]}${txReset} ${fgBGreen}${inputMSoptargARRAY[$optindex]}${txReset}"
+        echo "     ${inputMSoptdescrARRAY[$optindex]}"
+        let optindex+=1
+    done
+    echo ""
+    exit
 }
 
 
 
 printHELPshort ()
 {
-	printf "%20s       ${MSdescr}\n" "$0"
-	exit
+    printf "%20s       ${MSdescr}\n" "$0"
+    exit
 }
 
 
@@ -193,25 +193,25 @@ printHELPshort ()
 # =================================================
 function checkallprerequisites()
 {
-set +o nounset
-for cmd in ${RequiredCommands[@]}; do
-  checkCommand $cmd
-done
-
-for fname in ${RequiredFiles[@]}; do
-  checkFile $fname
-done
-
-for dname in ${RequiredDirs[@]}; do
-  checkDir $dname
-done
-set -o nounset
+    set +o nounset
+    for cmd in ${RequiredCommands[@]}; do
+        checkCommand $cmd
+    done
+
+    for fname in ${RequiredFiles[@]}; do
+        checkFile $fname
+    done
+
+    for dname in ${RequiredDirs[@]}; do
+        checkDir $dname
+    done
+    set -o nounset
 }
 
 function checkallprerequisitesExit()
 {
-  checkallprerequisites
-  exit
+    checkallprerequisites
+    exit
 }
 
 
@@ -232,13 +232,13 @@ inputMSargdescrARRAY=( )
 
 NBarg=0
 for argdat in "${MSarg[@]}";do
-  #echo "Argument ${NBarg}: $argdat"
-  IFS=':' read -r -a argarray <<< "$argdat"
-  inputMSargnameARRAY+=( ${argarray[0]} )
-  inputMSargtypeARRAY+=( ${argarray[1]} )
-  inputMSargdescrARRAY+=( "${argarray[2]}" )
-  #echo "    ${inputMSargnameARRAY[$NBarg]}"
-  let NBarg+=1
+    #echo "Argument ${NBarg}: $argdat"
+    IFS=':' read -r -a argarray <<< "$argdat"
+    inputMSargnameARRAY+=( ${argarray[0]} )
+    inputMSargtypeARRAY+=( ${argarray[1]} )
+    inputMSargdescrARRAY+=( "${argarray[2]}" )
+    #echo "    ${inputMSargnameARRAY[$NBarg]}"
+    let NBarg+=1
 done
 
 #echo "NBarg = ${NBarg}"
@@ -268,18 +268,18 @@ optactlist=( )
 
 NBopt=0
 for optdat in "${MSopt[@]}";do
-  #echo "Option ${NBopt}: $optdat"
-  IFS=':' read -r -a optarray <<< "$optdat"
-  let NBopt+=1
-  inputMSoptshortARRAY+=( ${optarray[0]} )
-  inputMSoptlongARRAY+=( ${optarray[1]} )
-  inputMSoptfuncARRAY+=( ${optarray[2]} )
-  inputMSoptargARRAY+=( "${optarray[3]}" )
-  inputMSoptdescrARRAY+=( "${optarray[4]}" )
-  OPTlong[${optarray[0]}]="${optarray[1]}"
-  OPTfunc[${optarray[0]}]="${optarray[2]}"
-  OPTarg[${optarray[0]}]="${optarray[3]}"
-  OPTlong2short[${OPTlong[${optarray[0]}]}]=${optarray[0]}
+    #echo "Option ${NBopt}: $optdat"
+    IFS=':' read -r -a optarray <<< "$optdat"
+    let NBopt+=1
+    inputMSoptshortARRAY+=( ${optarray[0]} )
+    inputMSoptlongARRAY+=( ${optarray[1]} )
+    inputMSoptfuncARRAY+=( ${optarray[2]} )
+    inputMSoptargARRAY+=( "${optarray[3]}" )
+    inputMSoptdescrARRAY+=( "${optarray[4]}" )
+    OPTlong[${optarray[0]}]="${optarray[1]}"
+    OPTfunc[${optarray[0]}]="${optarray[2]}"
+    OPTarg[${optarray[0]}]="${optarray[3]}"
+    OPTlong2short[${OPTlong[${optarray[0]}]}]=${optarray[0]}
 done
 
 
@@ -294,53 +294,53 @@ optargstring=""
 inputParamString=( )
 
 function getoptargs {
-	optargstring=""
-	shiftcnt=0
-	nboptarg=$( wc -w <<< "${OPTarg[${shortopt}]}" )
-	#echo "nboptarg = ${nboptarg} from $@"
-	optargindex=0
+    optargstring=""
+    shiftcnt=0
+    nboptarg=$( wc -w <<< "${OPTarg[${shortopt}]}" )
+    #echo "nboptarg = ${nboptarg} from $@"
+    optargindex=0
     while [ $optargindex -lt ${nboptarg} ]; do
-	  let shiftcnt+=1
-	  let optargindex+=1
-	  optargstring="${optargstring} $1"
-	  shift
-	done
+        let shiftcnt+=1
+        let optargindex+=1
+        optargstring="${optargstring} $1"
+        shift
+    done
 }
 
 
 while (( "$#" )); do
-  case "$1" in
-  --*) # long option
-    #echo "long option: $1"
-    inputMSoptlongARRAY+=( $1 )
-    longopt=$1
-    longopt="${longopt:2}"
-    shortopt=${OPTlong2short[$longopt]}
-    #echo "func $1 $shortopt : ${OPTfunc[${shortopt}]}"
-    optactlist+=( $shortopt )
-    shift
-    getoptargs $@
-    OPTargstring[${shortopt}]=${optargstring}
-    shift ${shiftcnt}
-  ;;
-  -*) # short option
-    inputMSoptshortARRAY+=( $1 )
-    shortopt=$1
-    shortopt="${shortopt:1}"
-    #echo "func $1 $shortopt : ${OPTfunc[${shortopt}]}"
-    optactlist+=( $shortopt )
-    shift
-    getoptargs $@
-    OPTargstring[${shortopt}]=${optargstring}
-	shift ${shiftcnt}
-  ;;
-  *)
-    #echo "param: $1"
-    inputMSargARRAY+=( "$1" )
-    inputParamString+=( "$1" )
-    shift
-  ;;
-  esac
+    case "$1" in
+        --*) # long option
+            #echo "long option: $1"
+            inputMSoptlongARRAY+=( $1 )
+            longopt=$1
+            longopt="${longopt:2}"
+            shortopt=${OPTlong2short[$longopt]}
+            #echo "func $1 $shortopt : ${OPTfunc[${shortopt}]}"
+            optactlist+=( $shortopt )
+            shift
+            getoptargs $@
+            OPTargstring[${shortopt}]=${optargstring}
+            shift ${shiftcnt}
+            ;;
+        -*) # short option
+            inputMSoptshortARRAY+=( $1 )
+            shortopt=$1
+            shortopt="${shortopt:1}"
+            #echo "func $1 $shortopt : ${OPTfunc[${shortopt}]}"
+            optactlist+=( $shortopt )
+            shift
+            getoptargs $@
+            OPTargstring[${shortopt}]=${optargstring}
+            shift ${shiftcnt}
+            ;;
+        *)
+            #echo "param: $1"
+            inputMSargARRAY+=( "$1" )
+            inputParamString+=( "$1" )
+            shift
+            ;;
+    esac
 done
 
 
@@ -348,9 +348,9 @@ done
 set +o nounset
 NBoptact=0
 for MSopt in "${optactlist[@]}";do
-  #echo "   input option   ${NBoptact} : $MSopt -> ${OPTfunc[$MSopt]} ${OPTargstring[$MSopt]}"
-  ${OPTfunc[$MSopt]} ${OPTargstring[$MSopt]}
-  let NBoptact+=1
+    #echo "   input option   ${NBoptact} : $MSopt -> ${OPTfunc[$MSopt]} ${OPTargstring[$MSopt]}"
+    ${OPTfunc[$MSopt]} ${OPTargstring[$MSopt]}
+    let NBoptact+=1
 done
 set -o nounset
 
@@ -367,13 +367,13 @@ checkallprerequisites
 NBargin=0
 #for MSarg in "${inputMSargARRAY[@]}";do
 for MSarg in "${inputParamString[@]}";do
-#  echo "   input argument ${NBargin} : $MSarg"
-  let NBargin+=1
+    #  echo "   input argument ${NBargin} : $MSarg"
+    let NBargin+=1
 done
 
 if [[ ${NBargin} -ne ${NBarg} ]]; then
-  echo "${fgRed} ERROR: ${NBarg} arguments expected, ${NBargin} entered ${txReset}"
-  exit
+    echo "${fgRed} ERROR: ${NBarg} arguments expected, ${NBargin} entered ${txReset}"
+    exit
 fi
 
 
@@ -382,16 +382,16 @@ fi
 
 function cleanup()
 {
-	echo ""
-	# optional custom cleanup provided by application
-	customcleanup
-	echo "Exiting script ${pname}"
-	echo ""
+    echo ""
+    # optional custom cleanup provided by application
+    customcleanup
+    echo "Exiting script ${pname}"
+    echo ""
 }
 
 function settrap()
 {
-	trap cleanup EXIT
+    trap cleanup EXIT
 }
 
 # call settrap function
diff --git a/scripts/milk-debug b/scripts/milk-debug
index eafdf566..bb486ca1 100755
--- a/scripts/milk-debug
+++ b/scripts/milk-debug
@@ -16,4 +16,3 @@ OPTION="$OPTION --max-stackframe=4442392"
 
 valgrind ${OPTION} ./milkdebugtest
 rm ./milkdebugtest
-
diff --git a/scripts/milk-exec b/scripts/milk-exec
index bac5ed68..ba4955cc 100755
--- a/scripts/milk-exec
+++ b/scripts/milk-exec
@@ -18,12 +18,12 @@ MSarg+=( "commandstring:string:command string" )
 
 MSopt+=( "n:name:set_pname:pname[string]:(n)ame process" )
 function set_pname() {
-	pname="$1"
+    pname="$1"
 }
 
 MSopt+=( "T:testmode:set_testmode::(T)est mode" )
 function set_testmode() {
-	echo "CTEST_FULL_OUTPUT"
+    echo "CTEST_FULL_OUTPUT"
 }
 
 
@@ -54,5 +54,3 @@ echo "exitCLI" >> $SF
 milk -n ${pname} -f -s ${SF}
 
 rm ${SF}
-
-
diff --git a/scripts/milk-fpsCTRL b/scripts/milk-fpsCTRL
index 71daae5a..b9b1806b 100755
--- a/scripts/milk-fpsCTRL
+++ b/scripts/milk-fpsCTRL
@@ -11,35 +11,35 @@ echo "pname = ${pname}"
 
 
 function printHELP {
-echo "------------------------------------------------------------------------"
-echo "$(tput bold) $pname : function parameters control  $(tput sgr0)"
-echo "------------------------------------------------------------------------"
-echo "  Monitors and controls function parameters"
-echo "  Connects to <name>.fps.shm shared memory structures"
-echo "  Argument is string match filter to select fps structures"
-echo "   "
-echo " $(tput bold)USAGE:$(tput sgr0)"
-echo "     $0 [-hlmD] <stringfilter>"
-echo ""
-echo " $(tput bold)ARGUMENTS:$(tput sgr0)"
-echo "     <stringfilter>                      string filter (optional)"
-echo ""
-echo " $(tput bold)OPTIONS:$(tput sgr0)"
-echo "     $(tput bold)-h$(tput sgr0)          help"
-echo "     $(tput bold)-f$(tput sgr0) <fname>  input (f)ifo name"
-echo "     $(tput bold)-l$(tput sgr0)          (l)ist fps structures"
-echo "     $(tput bold)-m$(tput sgr0)          must (m)atch fpscmd/fpslist.txt"
-echo "     $(tput bold)-s$(tput sgr0)          use (s)tdio instead of ncurses"
-echo "     $(tput bold)-q$(tput sgr0)          (q)uiet mode, do not print"
-echo "     $(tput bold)-D$(tput sgr0)          (D)ebug mode, uses valgrind"
-echo ""
-echo "------------------------------------------------------------------------"
+    echo "------------------------------------------------------------------------"
+    echo "$(tput bold) $pname : function parameters control  $(tput sgr0)"
+    echo "------------------------------------------------------------------------"
+    echo "  Monitors and controls function parameters"
+    echo "  Connects to <name>.fps.shm shared memory structures"
+    echo "  Argument is string match filter to select fps structures"
+    echo "   "
+    echo " $(tput bold)USAGE:$(tput sgr0)"
+    echo "     $0 [-hlmD] <stringfilter>"
+    echo ""
+    echo " $(tput bold)ARGUMENTS:$(tput sgr0)"
+    echo "     <stringfilter>                      string filter (optional)"
+    echo ""
+    echo " $(tput bold)OPTIONS:$(tput sgr0)"
+    echo "     $(tput bold)-h$(tput sgr0)          help"
+    echo "     $(tput bold)-f$(tput sgr0) <fname>  input (f)ifo name"
+    echo "     $(tput bold)-l$(tput sgr0)          (l)ist fps structures"
+    echo "     $(tput bold)-m$(tput sgr0)          must (m)atch fpscmd/fpslist.txt"
+    echo "     $(tput bold)-s$(tput sgr0)          use (s)tdio instead of ncurses"
+    echo "     $(tput bold)-q$(tput sgr0)          (q)uiet mode, do not print"
+    echo "     $(tput bold)-D$(tput sgr0)          (D)ebug mode, uses valgrind"
+    echo ""
+    echo "------------------------------------------------------------------------"
 }
 
 
 printHELP1 ()
 {
-	printf "%20s       Monitor and control function parameters\n" "$0" 
+    printf "%20s       Monitor and control function parameters\n" "$0"
 }
 
 
@@ -53,15 +53,15 @@ echo -n "sh-${shortpname}" > /proc/self/comm
 # Transform long options to short ones
 singlelinehelp=0
 for arg in "$@"; do
-  shift
-  case "$arg" in
-    "--help") set -- "$@" "-h" ;;
-    "--help1") 
-set -- "$@" "-h" 
-singlelinehelp=1;
-;;
-    *)        set -- "$@" "$arg"
-  esac
+    shift
+    case "$arg" in
+        "--help") set -- "$@" "-h" ;;
+        "--help1")
+            set -- "$@" "-h"
+            singlelinehelp=1;
+            ;;
+        *)        set -- "$@" "$arg"
+    esac
 done
 
 
@@ -78,45 +78,45 @@ fifoname="$MILK_SHM_DIR/milkCLIfifo.${pname}.${ttystring}"
 outlogname="$MILK_SHM_DIR/milkCLIlog.${pname}.${ttystring}"
 
 while getopts :hlmDf:o:sq FLAG; do
-  case $FLAG in
-    h)  #show help
-      if [ "$singlelinehelp" -eq "0" ]; then
-      printHELP
-      else
-      printHELP1
-      fi
-      exit
-      ;;
-    l) # list fps structures
-	  echo ""
-	  ls -l $MILK_SHM_DIR/*.fps.shm
-	  echo ""
-	  exit
-    ;;
-    f) # fifo name
-	 fifoname=${OPTARG}
-	 echo "using fifo name : ${fifoname}"
-    ;;
-    m)
-		MODE="1"
-    ;;
-    s) # use stdio instead of ncurses
-		export MILK_TUIPRINT_STDIO=1
-    ;;
-    q) # quiet mode - don't print status
-		export MILK_TUIPRINT_NONE=1
-    ;;
-    D)
-		DEBUG="1"
-	;;
-    \?) 
-      echo -e \\n"Option -${BOLD}$OPTARG${NORM} not allowed."
-      printHELP
-      ;;
-  esac
+    case $FLAG in
+        h)  #show help
+            if [ "$singlelinehelp" -eq "0" ]; then
+                printHELP
+            else
+                printHELP1
+            fi
+            exit
+            ;;
+        l) # list fps structures
+            echo ""
+            ls -l $MILK_SHM_DIR/*.fps.shm
+            echo ""
+            exit
+            ;;
+        f) # fifo name
+            fifoname=${OPTARG}
+            echo "using fifo name : ${fifoname}"
+            ;;
+        m)
+            MODE="1"
+            ;;
+        s) # use stdio instead of ncurses
+            export MILK_TUIPRINT_STDIO=1
+            ;;
+        q) # quiet mode - don't print status
+            export MILK_TUIPRINT_NONE=1
+            ;;
+        D)
+            DEBUG="1"
+            ;;
+        \?)
+            echo -e \\n"Option -${BOLD}$OPTARG${NORM} not allowed."
+            printHELP
+            ;;
+    esac
 done
 
-shift $((OPTIND-1))  
+shift $((OPTIND-1))
 
 ### End getopts code ###
 
@@ -125,18 +125,18 @@ NBargInput="$#"
 arg1="$1"
 
 if [ "$#" -eq 0 ]; then
-arg1="_ALL"
-NBargInput="1"
+    arg1="_ALL"
+    NBargInput="1"
 fi
 
 
 
 if [ "$arg1" = "help" ] || [ "$NBargInput" -ne $NBARGS ]; then
-if [ "$#" -ne $NBARGS ]; then
-    echo "$(tput setaf 1)$(tput bold) Illegal number of parameters ($NBARGS params required, $# entered) $(tput sgr0)"
-fi
-printHELP
-        exit
+    if [ "$#" -ne $NBARGS ]; then
+        echo "$(tput setaf 1)$(tput bold) Illegal number of parameters ($NBARGS params required, $# entered) $(tput sgr0)"
+    fi
+    printHELP
+    exit
 fi
 
 
@@ -154,24 +154,24 @@ echo "SF       = ${SF}"
 
 if [ "$DEBUG" = "1" ]; then
 
-cp $(which milk) milkdebugtest
-OPTION="--leak-check=full --show-leak-kinds=all"
-OPTION="$OPTION --track-origins=yes"
-OPTION="$OPTION --num-callers=200"
-OPTION="$OPTION --show-reachable=yes"
-#OPTION="$OPTION --gen-suppressions=all"
-OPTION="$OPTION --log-file=milk.memcheck.log"
-OPTION="$OPTION --suppressions=$MILK_ROOT/milk.memcheck.supp"
-OPTION="$OPTION --max-stackframe=4442392"
+    cp $(which milk) milkdebugtest
+    OPTION="--leak-check=full --show-leak-kinds=all"
+    OPTION="$OPTION --track-origins=yes"
+    OPTION="$OPTION --num-callers=200"
+    OPTION="$OPTION --show-reachable=yes"
+    #OPTION="$OPTION --gen-suppressions=all"
+    OPTION="$OPTION --log-file=milk.memcheck.log"
+    OPTION="$OPTION --suppressions=$MILK_ROOT/milk.memcheck.supp"
+    OPTION="$OPTION --max-stackframe=4442392"
 
-valgrind ${OPTION} ./milkdebugtest -n ${pname} -f ${CLIfifoname} -s ${SF}
-rm ./milkdebugtest
+    valgrind ${OPTION} ./milkdebugtest -n ${pname} -f ${CLIfifoname} -s ${SF}
+    rm ./milkdebugtest
 
 else
-echo "Running: milk -n ${shortpname} -f ${CLIfifoname} -s ${SF}"
-export MILK_QUIET=1
-milk -n ${shortpname} -f ${CLIfifoname} -s ${SF} 
-#2> testout.txt
+    echo "Running: milk -n ${shortpname} -f ${CLIfifoname} -s ${SF}"
+    export MILK_QUIET=1
+    milk -n ${shortpname} -f ${CLIfifoname} -s ${SF}
+    #2> testout.txt
 
 fi
 
@@ -185,8 +185,7 @@ rm ${fifoname}
 
 exitscriptname="${pname}-exitscript"
 if [ -f ${exitscriptname} ]; then
-  echo "running script ${exitscriptname}"
-  source ${exitscriptname}
-  rm ${exitscriptname}
+    echo "running script ${exitscriptname}"
+    source ${exitscriptname}
+    rm ${exitscriptname}
 fi
-
diff --git a/scripts/milk-fpsinit b/scripts/milk-fpsinit
index 78f3a980..70124041 100755
--- a/scripts/milk-fpsinit
+++ b/scripts/milk-fpsinit
@@ -6,33 +6,33 @@ MSdescr="initialize Function Parameter Structures (FPS)"
 scriptname=$(basename $0)
 
 MSextdescr="Reads file fpslist.txt
- For each entry, initialize the FPS :
-  - Create and initialize FPS
-  - Create tmux session and functions in tmux sessions
- Run without argument to print FPSs status
+For each entry, initialize the FPS :
+- Create and initialize FPS
+- Create tmux session and functions in tmux sessions
+Run without argument to print FPSs status
 
 $(tput bold)fpslist.txt file format$(tput sgr0)
-   One line per entry: <FPS root name> <CLI command> <optional args>
-   Add modules with \"+module1;module2\" line directly before entry
-   Optional arguments may be parsed by code, or simply used for FPS naming
+One line per entry: <FPS root name> <CLI command> <optional args>
+Add modules with \"+module1;module2\" line directly before entry
+Optional arguments may be parsed by code, or simply used for FPS naming
 
 $(tput bold)Example use$(tput sgr0)
 
- [1] Create fpslist.txt file:
-   +mycustommodule;othercustommodule
-   myfpsname custommod.customcommand im1 304
+[1] Create fpslist.txt file:
++mycustommodule;othercustommodule
+myfpsname custommod.customcommand im1 304
 
- [2] Run ${scriptname} :
-   > ${scriptname} -c 0
-   Will create FPS named \"myfpsname-im1-304\"
+[2] Run ${scriptname} :
+> ${scriptname} -c 0
+Will create FPS named \"myfpsname-im1-304\"
 
- [3] Launch milk-fpsCTRL to manage and control
+[3] Launch milk-fpsCTRL to manage and control
 
 
 $(tput bold)Related scripts:$(tput sgr0)
-  milk-fpsCTRL
-  milk-procCTRL
- "
+milk-fpsCTRL
+milk-procCTRL
+"
 
 
 source milk-script-std-config
@@ -346,9 +346,3 @@ for i in "${!FPSNAMEARRAY[@]}"; do
 
   fi
 done
-
-
-
-
-
-
diff --git a/scripts/milk-fpsmkcmd b/scripts/milk-fpsmkcmd
index ee5ac818..5341a018 100755
--- a/scripts/milk-fpsmkcmd
+++ b/scripts/milk-fpsmkcmd
@@ -35,147 +35,147 @@ chmod +x ${FPScmddir}/fpsrunstopscript
 cat "$FPSlistfilename" | while read LINE; do
     nw=$( echo "$LINE" | wc -w )
     if [ "$nw" -gt 1 ]; then
-    if [[ $LINE != \#* ]]; then
-
-	declare -a OPTARG
-
-		stringarr=($LINE)
-		nbarg=$(( $nw - 2 ))
-		
-		FPSrootname=${stringarr[0]}
-		#$( echo "$LINE" | awk '{print $1}' )
-		CLIname=${stringarr[1]}
-		#$( echo "$LINE" | awk '{print $2}' )
-		
-		FPSname="${FPSrootname}"
-		echo "    FPS root name = ${FPSname}"
-		echo "    CLI cmd       = ${CLIname}"
-		
-		for arg in `seq 1 $nbarg`;
-        do
-				i=$(( $arg + 1 ))				
-				OPTARG[$arg]=${stringarr[$i]}				                
+        if [[ $LINE != \#* ]]; then
+
+            declare -a OPTARG
+
+            stringarr=($LINE)
+            nbarg=$(( $nw - 2 ))
+
+            FPSrootname=${stringarr[0]}
+            #$( echo "$LINE" | awk '{print $1}' )
+            CLIname=${stringarr[1]}
+            #$( echo "$LINE" | awk '{print $2}' )
+
+            FPSname="${FPSrootname}"
+            echo "    FPS root name = ${FPSname}"
+            echo "    CLI cmd       = ${CLIname}"
+
+            for arg in `seq 1 $nbarg`;
+            do
+                i=$(( $arg + 1 ))
+                OPTARG[$arg]=${stringarr[$i]}
                 echo "    Argument $arg =" ${OPTARG[$arg]}
                 FPSname+="-"${OPTARG[$arg]}
-        done
-        
-        echo "    FPS name      = ${FPSname}"
-
-
-	# write to list of FPS names
-	echo "${FPSname}" >> ./${FPScmddir}/fpslist.txt
-
-	# write scripts
-	for CMDCODE in "FPSINIT" "CONFSTART" "CONFSTOP" "RUNSTART" "RUNSTOP"; do
-		
-		pnamestr="$(echo "$CMDCODE" | awk '{print tolower($0)}')"
-		
-		fname="./${FPScmddir}/${FPSrootname}-${pnamestr}"		
-		
-		if [ "$CMDCODE" != "CONFSTOP" ];  # CONFSTOP does not run a program. Instead, C-c char sent to tmux session
-		then
-		
-		if [ -f ${fname} ]; then
-			echo "File  $fname  exists - no write"
-		else
-			echo "Writing  $fname"
-			
-			echo "#!/bin/bash" > $fname
-			echo "# This script was automatically written by $0" >> $fname
-			echo "" >> $fname
-			for arg in `seq 1 $nbarg`;
-			do 
-				echo "arg${arg}=\"\$${arg}\"" >> $fname
-			done
-			
-			pname="${FPSrootname}"
-			CLIcmdstring="${CLIname} _${CMDCODE}_"
-			for arg in `seq 1 $nbarg`; do 
-				pname+="-\${arg$arg}"
-				CLIcmdstring+=" \${arg$arg}"
-			done 
-			echo "" >> $fname
-			echo "pname=\"${pname}.${pnamestr}\"" >> $fname
-			echo "" >> $fname
-			
-			redirect=""
-			if [ "$CMDCODE" = "RUNSTOP" ]; then
-			redirect="&>> ./${FPScmdlogdir}/${pname}.runstop.log"
-			fi
-			
-			# create fifo
-			#if [ "$CMDCODE" = "CONFSTART" ]; then
-			#echo "mkfifo ${MILK_SHM_DIR}/${pname}.fpsconf.fifo" >> $fname
-			#echo "" >> $fname
-			#fi
-			
-			echo "cacao -n \${pname} ${redirect} << EOF" >> $fname
-			
-			echo "$CLIcmdstring" >> $fname
-			echo "exitCLI" >> $fname
-			echo "EOF" >> $fname
-		
-			chmod +x $fname
-		fi
-		
-		fi
-		
-
-
-
-		if [ "$CMDCODE" = "FPSINIT" ]; then
-			echo ""  >> ${FPScmddir}/fpsinitscript
-			cmdstring="$fname"
-			for arg in `seq 1 $nbarg`; do 
-				cmdstring+=" "${OPTARG[$arg]}
-			done
-			echo "${cmdstring}" >> ${FPScmddir}/fpsinitscript
-		fi
-
-		if [ "$CMDCODE" = "CONFSTART" ]; then
-			echo "" >> ${FPScmddir}/fpsconfstartscript
-			cmdstring="$fname"
-			tmuxname="${FPSname}-conf"
-			echo "tmux new-session -d -s ${tmuxname}" >> ${FPScmddir}/fpsconfstartscript
-			for arg in `seq 1 $nbarg`; do 
-				cmdstring+=" "${OPTARG[$arg]}
-			done
-			echo "tmux send-keys -t ${tmuxname} \"${cmdstring}\" C-m" >> ${FPScmddir}/fpsconfstartscript
-		fi
-		
-		if [ "$CMDCODE" = "CONFSTOP" ]; then
-			echo "" >> ${FPScmddir}/fpsconfstopscript
-			tmuxname="${FPSname}-conf"
-			echo "tmux send-keys -t ${tmuxname} C-c" >> ${FPScmddir}/fpsconfstopscript
-		fi
-
-
-		if [ "$CMDCODE" = "RUNSTART" ]; then
-			echo "" >> ${FPScmddir}/fpsrunstartscript
-			cmdstring="$fname"
-			tmuxname="${FPSname}-run"
-			echo "tmux new-session -d -s ${tmuxname}" >> ${FPScmddir}/fpsrunstartscript
-			for arg in `seq 1 $nbarg`; do 
-				cmdstring+=" "${OPTARG[$arg]}
-			done
-			echo "tmux send-keys -t ${tmuxname} \"${cmdstring}\" C-m" >> ${FPScmddir}/fpsrunstartscript
-		fi
-		
-		if [ "$CMDCODE" = "RUNSTOP" ]; then
-			echo "" >> ${FPScmddir}/fpsrunstopscript
-			cmdstring="$fname"
-			for arg in `seq 1 $nbarg`; do 
-				cmdstring+=" "${OPTARG[$arg]}
-			done
-			echo "${cmdstring}" >> ${FPScmddir}/fpsrunstopscript
-		fi
-								
-		
-	done
-        
-
-        
-		echo ""
-    fi
+            done
+
+            echo "    FPS name      = ${FPSname}"
+
+
+            # write to list of FPS names
+            echo "${FPSname}" >> ./${FPScmddir}/fpslist.txt
+
+            # write scripts
+            for CMDCODE in "FPSINIT" "CONFSTART" "CONFSTOP" "RUNSTART" "RUNSTOP"; do
+
+                pnamestr="$(echo "$CMDCODE" | awk '{print tolower($0)}')"
+
+                fname="./${FPScmddir}/${FPSrootname}-${pnamestr}"
+
+                if [ "$CMDCODE" != "CONFSTOP" ];  # CONFSTOP does not run a program. Instead, C-c char sent to tmux session
+                then
+
+                    if [ -f ${fname} ]; then
+                        echo "File  $fname  exists - no write"
+                    else
+                        echo "Writing  $fname"
+
+                        echo "#!/bin/bash" > $fname
+                        echo "# This script was automatically written by $0" >> $fname
+                        echo "" >> $fname
+                        for arg in `seq 1 $nbarg`;
+                        do
+                            echo "arg${arg}=\"\$${arg}\"" >> $fname
+                        done
+
+                        pname="${FPSrootname}"
+                        CLIcmdstring="${CLIname} _${CMDCODE}_"
+                        for arg in `seq 1 $nbarg`; do
+                            pname+="-\${arg$arg}"
+                            CLIcmdstring+=" \${arg$arg}"
+                        done
+                        echo "" >> $fname
+                        echo "pname=\"${pname}.${pnamestr}\"" >> $fname
+                        echo "" >> $fname
+
+                        redirect=""
+                        if [ "$CMDCODE" = "RUNSTOP" ]; then
+                            redirect="&>> ./${FPScmdlogdir}/${pname}.runstop.log"
+                        fi
+
+                        # create fifo
+                        #if [ "$CMDCODE" = "CONFSTART" ]; then
+                        #echo "mkfifo ${MILK_SHM_DIR}/${pname}.fpsconf.fifo" >> $fname
+                        #echo "" >> $fname
+                        #fi
+
+                        echo "cacao -n \${pname} ${redirect} << EOF" >> $fname
+
+                        echo "$CLIcmdstring" >> $fname
+                        echo "exitCLI" >> $fname
+                        echo "EOF" >> $fname
+
+                        chmod +x $fname
+                    fi
+
+                fi
+
+
+
+
+                if [ "$CMDCODE" = "FPSINIT" ]; then
+                    echo ""  >> ${FPScmddir}/fpsinitscript
+                    cmdstring="$fname"
+                    for arg in `seq 1 $nbarg`; do
+                        cmdstring+=" "${OPTARG[$arg]}
+                    done
+                    echo "${cmdstring}" >> ${FPScmddir}/fpsinitscript
+                fi
+
+                if [ "$CMDCODE" = "CONFSTART" ]; then
+                    echo "" >> ${FPScmddir}/fpsconfstartscript
+                    cmdstring="$fname"
+                    tmuxname="${FPSname}-conf"
+                    echo "tmux new-session -d -s ${tmuxname}" >> ${FPScmddir}/fpsconfstartscript
+                    for arg in `seq 1 $nbarg`; do
+                        cmdstring+=" "${OPTARG[$arg]}
+                    done
+                    echo "tmux send-keys -t ${tmuxname} \"${cmdstring}\" C-m" >> ${FPScmddir}/fpsconfstartscript
+                fi
+
+                if [ "$CMDCODE" = "CONFSTOP" ]; then
+                    echo "" >> ${FPScmddir}/fpsconfstopscript
+                    tmuxname="${FPSname}-conf"
+                    echo "tmux send-keys -t ${tmuxname} C-c" >> ${FPScmddir}/fpsconfstopscript
+                fi
+
+
+                if [ "$CMDCODE" = "RUNSTART" ]; then
+                    echo "" >> ${FPScmddir}/fpsrunstartscript
+                    cmdstring="$fname"
+                    tmuxname="${FPSname}-run"
+                    echo "tmux new-session -d -s ${tmuxname}" >> ${FPScmddir}/fpsrunstartscript
+                    for arg in `seq 1 $nbarg`; do
+                        cmdstring+=" "${OPTARG[$arg]}
+                    done
+                    echo "tmux send-keys -t ${tmuxname} \"${cmdstring}\" C-m" >> ${FPScmddir}/fpsrunstartscript
+                fi
+
+                if [ "$CMDCODE" = "RUNSTOP" ]; then
+                    echo "" >> ${FPScmddir}/fpsrunstopscript
+                    cmdstring="$fname"
+                    for arg in `seq 1 $nbarg`; do
+                        cmdstring+=" "${OPTARG[$arg]}
+                    done
+                    echo "${cmdstring}" >> ${FPScmddir}/fpsrunstopscript
+                fi
+
+
+            done
+
+
+
+            echo ""
+        fi
     fi
 done
diff --git a/scripts/milk-logshim b/scripts/milk-logshim
index 531e1c22..1334cfbb 100755
--- a/scripts/milk-logshim
+++ b/scripts/milk-logshim
@@ -12,33 +12,33 @@ pname="logshim-$1"
 
 
 function printHELP {
-echo "------------------------------------------------------------------------"
-echo "$(tput bold) $pname : Log image stream $(tput sgr0)"
-echo "------------------------------------------------------------------------"
-echo "  Start process to log image stream to disk"
-echo "   "
-echo " $(tput bold)USAGE:$(tput sgr0)"
-echo "     $0 [-h c <CPUset>] <stream> <blocksize> <directory>"
-echo ""
-echo " $(tput bold)OPTIONS:$(tput sgr0)"
-echo "     $(tput bold)-h$(tput sgr0)              help"
-echo "     $(tput bold)-c$(tput sgr0) <CPUset>     move process to CPUset"
-echo ""
-echo " $(tput bold)INPUT:$(tput sgr0)"
-echo "     <stream>            Shared memory stream name. Actual file is $MILK_SHM_DIR/<stream name>.im.shm"
-echo "     <blocksize>         Number of slices in each data cube saved"
-echo "     <directory>         Destination directory"
-echo ""
-echo " $(tput bold)EXAMPLE:$(tput sgr0)"
-echo "     logshim ircam2 10000 /media/data/20150222/ircamlog/"
-echo ""
-echo "------------------------------------------------------------------------"
+    echo "------------------------------------------------------------------------"
+    echo "$(tput bold) $pname : Log image stream $(tput sgr0)"
+    echo "------------------------------------------------------------------------"
+    echo "  Start process to log image stream to disk"
+    echo "   "
+    echo " $(tput bold)USAGE:$(tput sgr0)"
+    echo "     $0 [-h c <CPUset>] <stream> <blocksize> <directory>"
+    echo ""
+    echo " $(tput bold)OPTIONS:$(tput sgr0)"
+    echo "     $(tput bold)-h$(tput sgr0)              help"
+    echo "     $(tput bold)-c$(tput sgr0) <CPUset>     move process to CPUset"
+    echo ""
+    echo " $(tput bold)INPUT:$(tput sgr0)"
+    echo "     <stream>            Shared memory stream name. Actual file is $MILK_SHM_DIR/<stream name>.im.shm"
+    echo "     <blocksize>         Number of slices in each data cube saved"
+    echo "     <directory>         Destination directory"
+    echo ""
+    echo " $(tput bold)EXAMPLE:$(tput sgr0)"
+    echo "     logshim ircam2 10000 /media/data/20150222/ircamlog/"
+    echo ""
+    echo "------------------------------------------------------------------------"
 }
 
 
 printHELP1 ()
 {
-    printf "%20s       Start process to log image stream to disk\n" "$0" 
+    printf "%20s       Start process to log image stream to disk\n" "$0"
 }
 
 
@@ -50,38 +50,38 @@ EXITSTATUS=0
 
 
 function checkFile {
-if [ -f $1 ]
-  then
-    echo "[$(tput setaf 2)$(tput bold)   OK   $(tput sgr0)] File $(tput bold)$1$(tput sgr0) found"
-   else
-    echo "[$(tput setaf 1)$(tput bold) FAILED $(tput sgr0)] File $(tput bold)$1$(tput sgr0) not found"
-    EXITSTATUS=1
-fi
+    if [ -f $1 ]
+    then
+        echo "[$(tput setaf 2)$(tput bold)   OK   $(tput sgr0)] File $(tput bold)$1$(tput sgr0) found"
+    else
+        echo "[$(tput setaf 1)$(tput bold) FAILED $(tput sgr0)] File $(tput bold)$1$(tput sgr0) not found"
+        EXITSTATUS=1
+    fi
 }
 
 
 function checkDir {
-if [ -d $1 ]
-  then
-    echo "[$(tput setaf 2)$(tput bold)   OK   $(tput sgr0)] Directory $(tput bold)$1$(tput sgr0) found"
-   else
-    echo "[$(tput setaf 1)$(tput bold) FAILED $(tput sgr0)] Directory $(tput bold)$1$(tput sgr0) not found"
-    EXITSTATUS=1
-fi
+    if [ -d $1 ]
+    then
+        echo "[$(tput setaf 2)$(tput bold)   OK   $(tput sgr0)] Directory $(tput bold)$1$(tput sgr0) found"
+    else
+        echo "[$(tput setaf 1)$(tput bold) FAILED $(tput sgr0)] Directory $(tput bold)$1$(tput sgr0) not found"
+        EXITSTATUS=1
+    fi
 }
 
 function cmdexists()
 {
-  command -v "$1" >/dev/null 2>&1
+    command -v "$1" >/dev/null 2>&1
 }
 
 
 function checkCommand {
-if cmdexists $1; then
-    echo "[$(tput setaf 2)$(tput bold)   OK   $(tput sgr0)] Command $(tput bold)$1$(tput sgr0) found"
-else
-    echo "[$(tput setaf 1)$(tput bold) FAILED $(tput sgr0)] Command $(tput bold)$1$(tput sgr0) not installed.  Aborting."; EXITSTATUS=1;
-fi
+    if cmdexists $1; then
+        echo "[$(tput setaf 2)$(tput bold)   OK   $(tput sgr0)] Command $(tput bold)$1$(tput sgr0) found"
+    else
+        echo "[$(tput setaf 1)$(tput bold) FAILED $(tput sgr0)] Command $(tput bold)$1$(tput sgr0) not installed.  Aborting."; EXITSTATUS=1;
+    fi
 
 }
 
@@ -96,15 +96,15 @@ fi
 # Transform long options to short ones
 singlelinehelp=0
 for arg in "$@"; do
-  shift
-  case "$arg" in
-    "--help") set -- "$@" "-h" ;;
-    "--help1") 
-set -- "$@" "-h" 
-singlelinehelp=1;
-;;
-    *)        set -- "$@" "$arg"
-  esac
+    shift
+    case "$arg" in
+        "--help") set -- "$@" "-h" ;;
+        "--help1")
+            set -- "$@" "-h"
+            singlelinehelp=1;
+            ;;
+        *)        set -- "$@" "$arg"
+    esac
 done
 
 
@@ -113,23 +113,23 @@ done
 CPUset="NULL"
 
 while getopts :hc: FLAG; do
-  case $FLAG in
-    h)  #show help
-      if [ "$singlelinehelp" -eq "0" ]; then
-      printHELP
-      else
-      printHELP1
-      fi
-      exit
-      ;;
-    c) # CPU set
-    CPUset="$OPTARG"
-    ;;
-    \?) #unrecognized option - show help
-      echo -e \\n"Option -${BOLD}$OPTARG${NORM} not allowed."
-      printHELP
-      ;;
-  esac
+    case $FLAG in
+        h)  #show help
+            if [ "$singlelinehelp" -eq "0" ]; then
+                printHELP
+            else
+                printHELP1
+            fi
+            exit
+            ;;
+        c) # CPU set
+            CPUset="$OPTARG"
+            ;;
+        \?) #unrecognized option - show help
+            echo -e \\n"Option -${BOLD}$OPTARG${NORM} not allowed."
+            printHELP
+            ;;
+    esac
 done
 
 shift $((OPTIND-1))
@@ -142,11 +142,11 @@ shift $((OPTIND-1))
 
 
 if [ "$1" = "help" ] || [ "$#" -ne $NBARGS ]; then
-if [ "$#" -ne $NBARGS ]; then
-    echo "$(tput setaf 1)$(tput bold) Illegal number of parameters ($NBARGS params required, $# entered) $(tput sgr0)"
-fi
-printHELP
-        exit
+    if [ "$#" -ne $NBARGS ]; then
+        echo "$(tput setaf 1)$(tput bold) Illegal number of parameters ($NBARGS params required, $# entered) $(tput sgr0)"
+    fi
+    printHELP
+    exit
 fi
 
 
@@ -164,12 +164,12 @@ checkCommand milk
 
 
 if [ $EXITSTATUS -eq 1 ]; then
-echo ""
-echo "$(tput setaf 1)$(tput bold) REQUIRED FILES, COMMANDS NOT FOUND: EXITING $(tput sgr0)"
-echo ""
-exit
+    echo ""
+    echo "$(tput setaf 1)$(tput bold) REQUIRED FILES, COMMANDS NOT FOUND: EXITING $(tput sgr0)"
+    echo ""
+    exit
 else
-echo ""
+    echo ""
 fi
 
 
diff --git a/scripts/milk-logshimkill b/scripts/milk-logshimkill
index 21e47dc4..2c2d4d2c 100755
--- a/scripts/milk-logshimkill
+++ b/scripts/milk-logshimkill
@@ -4,16 +4,16 @@ EXPECTED_ARGS=1
 
 if [ $# -ne $EXPECTED_ARGS ]
 then
-  echo
-  echo "-------- KILL LOG SHARED MEMORY DATA STREAM ---------"
- echo " "
- echo "Usage: $0 <data stream name>"
- echo " "
- echo "  INPUT <data stream name>   : shared memory stream name. Actual file is $MILK_SHM_DIR/<stream name>.im.shm"
- echo " "
- echo "EXAMPLE :  $0 ircam2"
- echo " "
- exit
+    echo
+    echo "-------- KILL LOG SHARED MEMORY DATA STREAM ---------"
+    echo " "
+    echo "Usage: $0 <data stream name>"
+    echo " "
+    echo "  INPUT <data stream name>   : shared memory stream name. Actual file is $MILK_SHM_DIR/<stream name>.im.shm"
+    echo " "
+    echo "EXAMPLE :  $0 ircam2"
+    echo " "
+    exit
 fi
 
 pname="$0-$1"
diff --git a/scripts/milk-logshimoff b/scripts/milk-logshimoff
index ee624d2c..edd07c51 100755
--- a/scripts/milk-logshimoff
+++ b/scripts/milk-logshimoff
@@ -4,16 +4,16 @@ EXPECTED_ARGS=1
 
 if [ $# -ne $EXPECTED_ARGS ]
 then
-  echo
-  echo "-------- STOP LOG SHARED MEMORY DATA STREAM ---------"
- echo " "
- echo "Usage: $0 <data stream name>"
- echo " "
- echo "  INPUT <data stream name>   : shared memory stream name. Actual file is $MILK_SHM_DIR/<stream name>.im.shm"
- echo " "
- echo "EXAMPLE :  $0 ircam2"
- echo " "
- exit
+    echo
+    echo "-------- STOP LOG SHARED MEMORY DATA STREAM ---------"
+    echo " "
+    echo "Usage: $0 <data stream name>"
+    echo " "
+    echo "  INPUT <data stream name>   : shared memory stream name. Actual file is $MILK_SHM_DIR/<stream name>.im.shm"
+    echo " "
+    echo "EXAMPLE :  $0 ircam2"
+    echo " "
+    exit
 fi
 
 pname="$0-$1"
diff --git a/scripts/milk-logshimon b/scripts/milk-logshimon
index d5aecc0e..5fc05ace 100755
--- a/scripts/milk-logshimon
+++ b/scripts/milk-logshimon
@@ -4,16 +4,16 @@ EXPECTED_ARGS=1
 
 if [ $# -ne $EXPECTED_ARGS ]
 then
-  echo
-  echo "-------- RESUME LOG SHARED MEMORY DATA STREAM ---------"
- echo " "
- echo "Usage: $0 <data stream name>"
- echo " "
- echo "  INPUT <data stream name>   : shared memory stream name. Actual file is $MILK_SHM_DIR/<stream name>.im.shm"
- echo " "
- echo "EXAMPLE :  $0 ircam2"
- echo " "
- exit
+    echo
+    echo "-------- RESUME LOG SHARED MEMORY DATA STREAM ---------"
+    echo " "
+    echo "Usage: $0 <data stream name>"
+    echo " "
+    echo "  INPUT <data stream name>   : shared memory stream name. Actual file is $MILK_SHM_DIR/<stream name>.im.shm"
+    echo " "
+    echo "EXAMPLE :  $0 ircam2"
+    echo " "
+    exit
 fi
 
 pname="$0-$1"
diff --git a/scripts/milk-logshimstat b/scripts/milk-logshimstat
index 51b13957..82573eb9 100755
--- a/scripts/milk-logshimstat
+++ b/scripts/milk-logshimstat
@@ -4,16 +4,16 @@ EXPECTED_ARGS=1
 
 if [ $# -ne $EXPECTED_ARGS ]
 then
-  echo
-  echo "-------- LOG SHARED MEMORY DATA STREAM STATUS ---------"
- echo " "
- echo "Usage: $0 <data stream name>"
- echo " "
- echo "  INPUT <data stream name>   : shared memory stream name. Actual file is $MILK_SHM_DIR/<stream name>.im.shm"
- echo " "
- echo "EXAMPLE :  $0 ircam2"
- echo " "
- exit
+    echo
+    echo "-------- LOG SHARED MEMORY DATA STREAM STATUS ---------"
+    echo " "
+    echo "Usage: $0 <data stream name>"
+    echo " "
+    echo "  INPUT <data stream name>   : shared memory stream name. Actual file is $MILK_SHM_DIR/<stream name>.im.shm"
+    echo " "
+    echo "EXAMPLE :  $0 ircam2"
+    echo " "
+    exit
 fi
 
 pname="logshimstat-$1"
diff --git a/scripts/milk-makecsetandrt b/scripts/milk-makecsetandrt
index e23f15ae..ddbf2327 100755
--- a/scripts/milk-makecsetandrt
+++ b/scripts/milk-makecsetandrt
@@ -4,18 +4,18 @@ EXPECTED_ARGS=3
 
 if [ $# -ne $EXPECTED_ARGS ]
 then
-  echo
-  echo "-------- MOVE PID TO CSET AND ASSIGN RT PRIORITY ---------"
-  echo " "
-  echo "Usage: $0 <PID> <CPU set> <PRIO>"
-  echo " "
-  echo "  INPUT <PID>      : PID to move/elevate"
-  echo "  INPUT <CPU set>  : Name of CPU set"
-  echo "  INPUT <PRIO>     : RT priority to give to PID - 0 to ignore"
-  echo " "
-  echo "EXAMPLE :  $0 33654 ircam0_edt 80"
-  echo " "
-  exit
+    echo
+    echo "-------- MOVE PID TO CSET AND ASSIGN RT PRIORITY ---------"
+    echo " "
+    echo "Usage: $0 <PID> <CPU set> <PRIO>"
+    echo " "
+    echo "  INPUT <PID>      : PID to move/elevate"
+    echo "  INPUT <CPU set>  : Name of CPU set"
+    echo "  INPUT <PRIO>     : RT priority to give to PID - 0 to ignore"
+    echo " "
+    echo "EXAMPLE :  $0 33654 ircam0_edt 80"
+    echo " "
+    exit
 fi
 
 pname="$0-$1-$2"
diff --git a/scripts/milk-procCTRL b/scripts/milk-procCTRL
index a8ac1264..034a076c 100755
--- a/scripts/milk-procCTRL
+++ b/scripts/milk-procCTRL
@@ -10,26 +10,26 @@ echo "pname = $pname"
 
 
 function printHELP {
-echo "------------------------------------------------------------------------"
-echo "$(tput bold) $pname : loop processes control  $(tput sgr0)"
-echo "------------------------------------------------------------------------"
-echo "  Monitors and controls loop processes"
-echo "   "
-echo " $(tput bold)USAGE:$(tput sgr0)"
-echo "     $0 [-hD]"
-echo ""
-echo " $(tput bold)OPTIONS:$(tput sgr0)"
-echo "     $(tput bold)-D$(tput sgr0)          (D)ebug mode, uses valgrind"
-echo "     $(tput bold)-s$(tput sgr0)          use (s)tdio instead of ncurses"
-echo "     $(tput bold)-q$(tput sgr0)          (q)uiet mode, do not print"
-echo ""
-echo "------------------------------------------------------------------------"
+    echo "------------------------------------------------------------------------"
+    echo "$(tput bold) $pname : loop processes control  $(tput sgr0)"
+    echo "------------------------------------------------------------------------"
+    echo "  Monitors and controls loop processes"
+    echo "   "
+    echo " $(tput bold)USAGE:$(tput sgr0)"
+    echo "     $0 [-hD]"
+    echo ""
+    echo " $(tput bold)OPTIONS:$(tput sgr0)"
+    echo "     $(tput bold)-D$(tput sgr0)          (D)ebug mode, uses valgrind"
+    echo "     $(tput bold)-s$(tput sgr0)          use (s)tdio instead of ncurses"
+    echo "     $(tput bold)-q$(tput sgr0)          (q)uiet mode, do not print"
+    echo ""
+    echo "------------------------------------------------------------------------"
 }
 
 
 printHELP1 ()
 {
-	printf "%20s       Monitor and control loop processes\n" "$0" 
+    printf "%20s       Monitor and control loop processes\n" "$0"
 }
 
 
@@ -40,15 +40,15 @@ printHELP1 ()
 # Transform long options to short ones
 singlelinehelp=0
 for arg in "$@"; do
-  shift
-  case "$arg" in
-    "--help") set -- "$@" "-h" ;;
-    "--help1") 
-set -- "$@" "-h" 
-singlelinehelp=1;
-;;
-    *)        set -- "$@" "$arg"
-  esac
+    shift
+    case "$arg" in
+        "--help") set -- "$@" "-h" ;;
+        "--help1")
+            set -- "$@" "-h"
+            singlelinehelp=1;
+            ;;
+        *)        set -- "$@" "$arg"
+    esac
 done
 
 
@@ -56,32 +56,32 @@ done
 DEBUG="0"
 
 while getopts :hDsq FLAG; do
-  case $FLAG in
-    h)  #show help
-      if [ "$singlelinehelp" -eq "0" ]; then
-      printHELP
-      else
-      printHELP1
-      fi
-      exit
-      ;;
-    s) # use stdio instead of ncurses
-		export MILK_TUIPRINT_STDIO=1
-    ;;
-    q) # quiet mode - don't print status
-		export MILK_TUIPRINT_NONE=1
-    ;;
-    D)
-		DEBUG="1"
-	;;
-    \?) 
-      echo -e \\n"Option -${BOLD}$OPTARG${NORM} not allowed."
-      printHELP
-      ;;
-  esac
+    case $FLAG in
+        h)  #show help
+            if [ "$singlelinehelp" -eq "0" ]; then
+                printHELP
+            else
+                printHELP1
+            fi
+            exit
+            ;;
+        s) # use stdio instead of ncurses
+            export MILK_TUIPRINT_STDIO=1
+            ;;
+        q) # quiet mode - don't print status
+            export MILK_TUIPRINT_NONE=1
+            ;;
+        D)
+            DEBUG="1"
+            ;;
+        \?)
+            echo -e \\n"Option -${BOLD}$OPTARG${NORM} not allowed."
+            printHELP
+            ;;
+    esac
 done
 
-shift $((OPTIND-1))  
+shift $((OPTIND-1))
 
 ### End getopts code ###
 
@@ -91,11 +91,11 @@ shift $((OPTIND-1))
 
 
 if [ "$1" = "help" ] || [ "$#" -ne $NBARGS ]; then
-if [ "$#" -ne $NBARGS ]; then
-    echo "$(tput setaf 1)$(tput bold) Illegal number of parameters ($NBARGS params required, $# entered) $(tput sgr0)"
-fi
-printHELP
-        exit
+    if [ "$#" -ne $NBARGS ]; then
+        echo "$(tput setaf 1)$(tput bold) Illegal number of parameters ($NBARGS params required, $# entered) $(tput sgr0)"
+    fi
+    printHELP
+    exit
 fi
 
 
@@ -108,25 +108,23 @@ echo "exitCLI" >> $SF
 
 if [ "$DEBUG" = "1" ]; then
 
-cp $(which milk) milkdebugtest
-OPTION="--leak-check=full --show-leak-kinds=all"
-OPTION="$OPTION --track-origins=yes"
-OPTION="$OPTION --num-callers=200"
-OPTION="$OPTION --show-reachable=yes"
-#OPTION="$OPTION --gen-suppressions=all"
-OPTION="$OPTION --log-file=milk.memcheck.log"
-OPTION="$OPTION --suppressions=$MILK_ROOT/milk.memcheck.supp"
-OPTION="$OPTION --max-stackframe=4442392"
+    cp $(which milk) milkdebugtest
+    OPTION="--leak-check=full --show-leak-kinds=all"
+    OPTION="$OPTION --track-origins=yes"
+    OPTION="$OPTION --num-callers=200"
+    OPTION="$OPTION --show-reachable=yes"
+    #OPTION="$OPTION --gen-suppressions=all"
+    OPTION="$OPTION --log-file=milk.memcheck.log"
+    OPTION="$OPTION --suppressions=$MILK_ROOT/milk.memcheck.supp"
+    OPTION="$OPTION --max-stackframe=4442392"
 
-valgrind ${OPTION} ./milkdebugtest -n ${pname} -f ${fifoname} -s ${SF}
-rm ./milkdebugtest
+    valgrind ${OPTION} ./milkdebugtest -n ${pname} -f ${fifoname} -s ${SF}
+    rm ./milkdebugtest
 
 else
 
-milk -n ${pname} -f ${fifoname} -s ${SF}
+    milk -n ${pname} -f ${fifoname} -s ${SF}
 
 fi
 
 rm ${SF}
-
-
diff --git a/scripts/milk-script-std-config b/scripts/milk-script-std-config
index 5f9c1578..576e1dde 100755
--- a/scripts/milk-script-std-config
+++ b/scripts/milk-script-std-config
@@ -12,7 +12,7 @@ set -o pipefail
 
 function customcleanup()
 {
-	echo "default cleanup"
+    echo "default cleanup"
 }
 
 
@@ -69,55 +69,55 @@ MSopt+=( "chkp:check-prerequ:checkallprerequisitesExit::check all prerequisites
 
 spin()
 {
-	local CPU=0
-	local cpuprobecntlim=10
-	local cpuprobecnt=0
-	local delay=0.1
-	local spincnt=0
-	spinstr="▏▎▍▌▋▊▉▊▋▌▍▎"
-	#spinstr="▁▃▄▅▆▇▆▅▄▃▁ "
-	#spinstr="/|\\-/|\\-"
-
-	let cpuprobecnt=cpuprobecntlim+1
-	echo -n "STARTED $(date -u)  "
-	while :
-	do
-	  if [[ "${cpuprobecnt}" -gt "${cpuprobecntlim}" ]]; then
-	    CPU=$( pstree -p $THIS_PID | grep -o '([0-9]\+)' | grep -o '[0-9]\+' |\
-	    xargs ps -o %cpu,cmd -p | awk '{cpu+=$1} END {print cpu}' )  
-	    cpuprobecnt=0
-	  fi
-	  let cpuprobecnt+=1
-
-	  t1=$( echo "scale=2;${spincnt}*${delay}" | bc )
-	  local temp=${spinstr#?}
-	  local temp1=${temp:0:4}
-
-	  printf " [%s CPU %3.0f%%] %5.1f s" "$temp1" "${CPU}" "${t1}"
-	  local spinstr=$temp${spinstr%"$temp"}
-	  sleep $delay
-	  printf "\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b"
-	  let spincnt+=1
+    local CPU=0
+    local cpuprobecntlim=10
+    local cpuprobecnt=0
+    local delay=0.1
+    local spincnt=0
+    spinstr="▏▎▍▌▋▊▉▊▋▌▍▎"
+    #spinstr="▁▃▄▅▆▇▆▅▄▃▁ "
+    #spinstr="/|\\-/|\\-"
+
+    let cpuprobecnt=cpuprobecntlim+1
+    echo -n "STARTED $(date -u)  "
+    while :
+    do
+        if [[ "${cpuprobecnt}" -gt "${cpuprobecntlim}" ]]; then
+            CPU=$( pstree -p $THIS_PID | grep -o '([0-9]\+)' | grep -o '[0-9]\+' |\
+                xargs ps -o %cpu,cmd -p | awk '{cpu+=$1} END {print cpu}' )
+            cpuprobecnt=0
+        fi
+        let cpuprobecnt+=1
+
+        t1=$( echo "scale=2;${spincnt}*${delay}" | bc )
+        local temp=${spinstr#?}
+        local temp1=${temp:0:4}
+
+        printf " [%s CPU %3.0f%%] %5.1f s" "$temp1" "${CPU}" "${t1}"
+        local spinstr=$temp${spinstr%"$temp"}
+        sleep $delay
+        printf "\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b"
+        let spincnt+=1
     done
 }
 
 startspin()
 {
-	tput civis
-	# Start the Spinner:
-	THIS_PID=$$
-	spin &
-	SPIN_PID=$!
-	#echo "SPIN_PID ${SPIN_PID}"
-	#echo "THIS_PID ${THIS_PID}"
-	# Kill the spinner on any signal, including our own exit.
-	trap "kill -9 $SPIN_PID &> /dev/null" `seq 0 15`
+    tput civis
+    # Start the Spinner:
+    THIS_PID=$$
+    spin &
+    SPIN_PID=$!
+    #echo "SPIN_PID ${SPIN_PID}"
+    #echo "THIS_PID ${THIS_PID}"
+    # Kill the spinner on any signal, including our own exit.
+    trap "kill -9 $SPIN_PID &> /dev/null" `seq 0 15`
 }
 
 stopspin()
 {
-	kill -9 $SPIN_PID &> /dev/null
-	echo ""
-	tput cnorm
-	#settrap
+    kill -9 $SPIN_PID &> /dev/null
+    echo ""
+    tput cnorm
+    #settrap
 }
diff --git a/scripts/milk-scriptexample b/scripts/milk-scriptexample
index 6ae0e163..bbadfa28 100755
--- a/scripts/milk-scriptexample
+++ b/scripts/milk-scriptexample
@@ -8,7 +8,7 @@ Can span muliple lines
 "
 
 # standard configuration
-# 
+#
 source milk-script-std-config
 
 
@@ -97,7 +97,7 @@ exit
 
 function redraw() {
         local str width height length
-        
+
         width=$(tput cols)
         height=$(tput lines)
         str="Width = $width Height = $height"
@@ -113,5 +113,3 @@ redraw
 while true; do
         :
 done
-    
-
diff --git a/scripts/milk-shm2FITS b/scripts/milk-shm2FITS
index 814b6a79..cce2f3d7 100755
--- a/scripts/milk-shm2FITS
+++ b/scripts/milk-shm2FITS
@@ -3,11 +3,11 @@
 EXPECTED_ARGS=2
 if [ $# -ne $EXPECTED_ARGS ]
 then
-  echo
-  echo " ---------- write shared memory to FITS file ----------- "
-  echo
-  echo " Usage:  $0 <shm stream> <FITS file>"
-  echo 
+    echo
+    echo " ---------- write shared memory to FITS file ----------- "
+    echo
+    echo " Usage:  $0 <shm stream> <FITS file>"
+    echo
 fi
 
 pname=$0
diff --git a/scripts/milk-shm2FITSloop b/scripts/milk-shm2FITSloop
index 45d23409..09156538 100755
--- a/scripts/milk-shm2FITSloop
+++ b/scripts/milk-shm2FITSloop
@@ -6,12 +6,12 @@ trap cleanup EXIT
 EXPECTED_ARGS=2
 if [ $# -ne $EXPECTED_ARGS ]
 then
-  echo
-  echo " ---------- write shared memory to FITS file ----------- "
-  echo "runs as a simple loop"
-  echo ""
-  echo " Usage:  $0 <shm stream> <delay[sec]>"
-  echo 
+    echo
+    echo " ---------- write shared memory to FITS file ----------- "
+    echo "runs as a simple loop"
+    echo ""
+    echo " Usage:  $0 <shm stream> <delay[sec]>"
+    echo
 fi
 
 progname=`basename "$0"`
@@ -20,8 +20,8 @@ pname=${tmuxname}
 
 
 function cleanup {
-	echo "clean exit"
-	tmux send-keys -t ${tmuxname} "exitCLI" C-m
+    echo "clean exit"
+    tmux send-keys -t ${tmuxname} "exitCLI" C-m
 }
 
 
@@ -39,10 +39,8 @@ IMCNT=0
 
 while :
 do
-	echo "saving count ${IMCNT}"
-	tmux send-keys -t ${tmuxname} "savefits $1 \"!$1.fits\"" C-m
-	let IMCNT=IMCNT+1
-	sleep $2
+    echo "saving count ${IMCNT}"
+    tmux send-keys -t ${tmuxname} "savefits $1 \"!$1.fits\"" C-m
+    let IMCNT=IMCNT+1
+    sleep $2
 done
-
-
diff --git a/scripts/milk-shmimmon b/scripts/milk-shmimmon
index 1efcc989..7844ff69 100755
--- a/scripts/milk-shmimmon
+++ b/scripts/milk-shmimmon
@@ -6,38 +6,38 @@ NBARGS=1
 
 
 function printHELP {
-echo "------------------------------------------------------------------------"
-echo "$(tput bold) $0 : EXAMPLE SCRIPT $(tput sgr0)"
-echo "------------------------------------------------------------------------"
-echo "  Monitor image stream"
-echo "   "
-echo " $(tput bold)USAGE:$(tput sgr0)"
-echo "     $0 [-h] <stream>"
-echo ""
-echo " $(tput bold)OPTIONS:$(tput sgr0)"
-echo "     $(tput bold)-h$(tput sgr0)          help"
-echo ""
-echo " $(tput bold)INPUT:$(tput sgr0)"
-echo "     <stream>     data stream"
-echo ""
-echo "------------------------------------------------------------------------"
+    echo "------------------------------------------------------------------------"
+    echo "$(tput bold) $0 : EXAMPLE SCRIPT $(tput sgr0)"
+    echo "------------------------------------------------------------------------"
+    echo "  Monitor image stream"
+    echo "   "
+    echo " $(tput bold)USAGE:$(tput sgr0)"
+    echo "     $0 [-h] <stream>"
+    echo ""
+    echo " $(tput bold)OPTIONS:$(tput sgr0)"
+    echo "     $(tput bold)-h$(tput sgr0)          help"
+    echo ""
+    echo " $(tput bold)INPUT:$(tput sgr0)"
+    echo "     <stream>     data stream"
+    echo ""
+    echo "------------------------------------------------------------------------"
 }
 
 
 printHELP1 ()
 {
-	printf "%20s       Monitor stream\n" "$0" 
+    printf "%20s       Monitor stream\n" "$0"
 }
 
 
 function checkFile {
-if [ -f $1 ]
-  then
-    echo "[$(tput setaf 2)$(tput bold)   OK   $(tput sgr0)] File $(tput bold)$1$(tput sgr0) found"
-   else
-    echo "[$(tput setaf 1)$(tput bold) FAILED $(tput sgr0)] File $(tput bold)$1$(tput sgr0) not found"
-    EXITSTATUS=1
-fi
+    if [ -f $1 ]
+    then
+        echo "[$(tput setaf 2)$(tput bold)   OK   $(tput sgr0)] File $(tput bold)$1$(tput sgr0) found"
+    else
+        echo "[$(tput setaf 1)$(tput bold) FAILED $(tput sgr0)] File $(tput bold)$1$(tput sgr0) not found"
+        EXITSTATUS=1
+    fi
 }
 
 
@@ -50,34 +50,34 @@ fi
 # Transform long options to short ones
 singlelinehelp=0
 for arg in "$@"; do
-  shift
-  case "$arg" in
-    "--help") set -- "$@" "-h" ;;
-    "--help1") 
-set -- "$@" "-h" 
-singlelinehelp=1;
-;;
-    *)        set -- "$@" "$arg"
-  esac
+    shift
+    case "$arg" in
+        "--help") set -- "$@" "-h" ;;
+        "--help1")
+            set -- "$@" "-h"
+            singlelinehelp=1;
+            ;;
+        *)        set -- "$@" "$arg"
+    esac
 done
 
 
 
 while getopts :h FLAG; do
-  case $FLAG in
-    h)  #show help
-      if [ "$singlelinehelp" -eq "0" ]; then
-      printHELP
-      else
-      printHELP1
-      fi
-      exit
-      ;;
-    \?) #unrecognized option - show help
-      echo -e \\n"Option -${BOLD}$OPTARG${NORM} not allowed."
-      printHELP
-      ;;
-  esac
+    case $FLAG in
+        h)  #show help
+            if [ "$singlelinehelp" -eq "0" ]; then
+                printHELP
+            else
+                printHELP1
+            fi
+            exit
+            ;;
+        \?) #unrecognized option - show help
+            echo -e \\n"Option -${BOLD}$OPTARG${NORM} not allowed."
+            printHELP
+            ;;
+    esac
 done
 
 shift $((OPTIND-1))  #This tells getopts to move on to the next argument.
@@ -88,11 +88,11 @@ shift $((OPTIND-1))  #This tells getopts to move on to the next argument.
 
 
 if [ "$1" = "help" ] || [ "$#" -ne $NBARGS ]; then
-if [ "$#" -ne $NBARGS ]; then
-    echo "$(tput setaf 1)$(tput bold) Illegal number of parameters ($NBARGS params required, $# entered) $(tput sgr0)"
-fi
-printHELP
-        exit
+    if [ "$#" -ne $NBARGS ]; then
+        echo "$(tput setaf 1)$(tput bold) Illegal number of parameters ($NBARGS params required, $# entered) $(tput sgr0)"
+    fi
+    printHELP
+    exit
 fi
 
 
@@ -103,12 +103,12 @@ checkFile ${MILK_SHM_DIR}/$1.im.shm
 
 
 if [ $EXITSTATUS -eq 1 ]; then
-echo ""
-echo "$(tput setaf 1)$(tput bold) REQUIRED FILE NOT FOUND: EXITING $(tput sgr0)"
-echo ""
-exit
+    echo ""
+    echo "$(tput setaf 1)$(tput bold) REQUIRED FILE NOT FOUND: EXITING $(tput sgr0)"
+    echo ""
+    exit
 else
-echo ""
+    echo ""
 fi
 
 
diff --git a/scripts/milk-streamCTRL b/scripts/milk-streamCTRL
index 7b5f71f3..cc0bfe30 100755
--- a/scripts/milk-streamCTRL
+++ b/scripts/milk-streamCTRL
@@ -10,26 +10,26 @@ pname=`echo "$0" | sed "s/\.\///g"`
 
 
 function printHELP {
-echo "------------------------------------------------------------------------"
-echo "$(tput bold) $pname : data streams control  $(tput sgr0)"
-echo "------------------------------------------------------------------------"
-echo "  Monitors and controls shared memory data streams"
-echo "   "
-echo " $(tput bold)USAGE:$(tput sgr0)"
-echo "     $0 [-hD]"
-echo ""
-echo " $(tput bold)OPTIONS:$(tput sgr0)"
-echo "     $(tput bold)-D$(tput sgr0)          (D)ebug mode, uses valgrind"
-echo "     $(tput bold)-s$(tput sgr0)          use (s)tdio instead of ncurses"
-echo "     $(tput bold)-q$(tput sgr0)          (q)uiet mode, do not print"
-echo ""
-echo "------------------------------------------------------------------------"
+    echo "------------------------------------------------------------------------"
+    echo "$(tput bold) $pname : data streams control  $(tput sgr0)"
+    echo "------------------------------------------------------------------------"
+    echo "  Monitors and controls shared memory data streams"
+    echo "   "
+    echo " $(tput bold)USAGE:$(tput sgr0)"
+    echo "     $0 [-hD]"
+    echo ""
+    echo " $(tput bold)OPTIONS:$(tput sgr0)"
+    echo "     $(tput bold)-D$(tput sgr0)          (D)ebug mode, uses valgrind"
+    echo "     $(tput bold)-s$(tput sgr0)          use (s)tdio instead of ncurses"
+    echo "     $(tput bold)-q$(tput sgr0)          (q)uiet mode, do not print"
+    echo ""
+    echo "------------------------------------------------------------------------"
 }
 
 
 printHELP1 ()
 {
-	printf "%20s       Monitor and control loop processes\n" "$0" 
+    printf "%20s       Monitor and control loop processes\n" "$0"
 }
 
 
@@ -40,15 +40,15 @@ printHELP1 ()
 # Transform long options to short ones
 singlelinehelp=0
 for arg in "$@"; do
-  shift
-  case "$arg" in
-    "--help") set -- "$@" "-h" ;;
-    "--help1") 
-set -- "$@" "-h" 
-singlelinehelp=1;
-;;
-    *)        set -- "$@" "$arg"
-  esac
+    shift
+    case "$arg" in
+        "--help") set -- "$@" "-h" ;;
+        "--help1")
+            set -- "$@" "-h"
+            singlelinehelp=1;
+            ;;
+        *)        set -- "$@" "$arg"
+    esac
 done
 
 
@@ -56,32 +56,32 @@ done
 DEBUG="0"
 
 while getopts :hDsq FLAG; do
-  case $FLAG in
-    h)  #show help
-      if [ "$singlelinehelp" -eq "0" ]; then
-      printHELP
-      else
-      printHELP1
-      fi
-      exit
-      ;;
-    s) # use stdio instead of ncurses
-		export MILK_TUIPRINT_STDIO=1
-    ;;
-    q) # quiet mode - don't print status
-		export MILK_TUIPRINT_NONE=1
-    ;;
-    D)
-		DEBUG="1"
-	;;
-    \?) 
-      echo -e \\n"Option -${BOLD}$OPTARG${NORM} not allowed."
-      printHELP
-      ;;
-  esac
+    case $FLAG in
+        h)  #show help
+            if [ "$singlelinehelp" -eq "0" ]; then
+                printHELP
+            else
+                printHELP1
+            fi
+            exit
+            ;;
+        s) # use stdio instead of ncurses
+            export MILK_TUIPRINT_STDIO=1
+            ;;
+        q) # quiet mode - don't print status
+            export MILK_TUIPRINT_NONE=1
+            ;;
+        D)
+            DEBUG="1"
+            ;;
+        \?)
+            echo -e \\n"Option -${BOLD}$OPTARG${NORM} not allowed."
+            printHELP
+            ;;
+    esac
 done
 
-shift $((OPTIND-1))  
+shift $((OPTIND-1))
 
 ### End getopts code ###
 
@@ -91,11 +91,11 @@ shift $((OPTIND-1))
 
 
 if [ "$1" = "help" ] || [ "$#" -ne $NBARGS ]; then
-if [ "$#" -ne $NBARGS ]; then
-    echo "$(tput setaf 1)$(tput bold) Illegal number of parameters ($NBARGS params required, $# entered) $(tput sgr0)"
-fi
-printHELP
-        exit
+    if [ "$#" -ne $NBARGS ]; then
+        echo "$(tput setaf 1)$(tput bold) Illegal number of parameters ($NBARGS params required, $# entered) $(tput sgr0)"
+    fi
+    printHELP
+    exit
 fi
 
 
@@ -111,22 +111,22 @@ echo "exitCLI" >> $SF
 
 if [ "$DEBUG" = "1" ]; then
 
-cp $(which milk) milkdebugtest
-OPTION="--leak-check=full --show-leak-kinds=all"
-OPTION="$OPTION --track-origins=yes"
-OPTION="$OPTION --num-callers=200"
-OPTION="$OPTION --show-reachable=yes"
-#OPTION="$OPTION --gen-suppressions=all"
-OPTION="$OPTION --log-file=milk.memcheck.log"
-OPTION="$OPTION --suppressions=$MILK_ROOT/milk.memcheck.supp"
-OPTION="$OPTION --max-stackframe=4442392"
+    cp $(which milk) milkdebugtest
+    OPTION="--leak-check=full --show-leak-kinds=all"
+    OPTION="$OPTION --track-origins=yes"
+    OPTION="$OPTION --num-callers=200"
+    OPTION="$OPTION --show-reachable=yes"
+    #OPTION="$OPTION --gen-suppressions=all"
+    OPTION="$OPTION --log-file=milk.memcheck.log"
+    OPTION="$OPTION --suppressions=$MILK_ROOT/milk.memcheck.supp"
+    OPTION="$OPTION --max-stackframe=4442392"
 
-valgrind ${OPTION} ./milkdebugtest -n ${pname} -f ${fifoname} -s ${SF}
-rm ./milkdebugtest
+    valgrind ${OPTION} ./milkdebugtest -n ${pname} -f ${fifoname} -s ${SF}
+    rm ./milkdebugtest
 
 else
 
-MILK_QUIET=1 milk -n ${pname} -f ${fifoname} -s $SF
+    MILK_QUIET=1 milk -n ${pname} -f ${fifoname} -s $SF
 
 fi
 
diff --git a/scripts/milk-streamlink b/scripts/milk-streamlink
index 9720fff2..4b2bc8c3 100755
--- a/scripts/milk-streamlink
+++ b/scripts/milk-streamlink
@@ -8,35 +8,35 @@ NBARGS=1
 pname=`basename "$0"`
 
 function printHELP {
-echo "------------------------------------------------------------------------"
-echo "$(tput bold) $pname : CONNECT TO STREAM $(tput sgr0)"
-echo " Full path name : $0"
-echo "------------------------------------------------------------------------"
-echo "  Establishes a stream sym link from TARGET=<sourcestrem> to LINKNAME=<streamname>."
-echo "  Reads conf/streamlink.<streamname>.name.txt to identify source stream."
-echo "  - Create $MILK_SHM_DIR/<streamname>.im.shm that points to $MI_SHM_DIR/<sourcestream>.im.shm"
-echo "  - Runs milk, connects to <streamname> and writes its size to ./conf/streamlink.<streamname>.imsize.txt"
-echo "   "
-echo " $(tput bold)USAGE:$(tput sgr0)"
-echo "     $0 [-h] <streamname>"
-echo ""
-echo " $(tput bold)OPTIONS:$(tput sgr0)"
-echo "     $(tput bold)-h$(tput sgr0)                help"
-echo "     $(tput bold)-p$(tput sgr0) <prefix>       stream prefix"
-echo ""
-echo " $(tput bold)INPUT:$(tput sgr0)"
-echo "     <streamname>           stream name (full name: <prefix><streamname>)"
-echo ""
-echo " $(tput bold)OUTPUT:$(tput sgr0)"
-echo "  ./conf/streamlink.<streamname>.imsize.txt :   stream aimage size"
-echo ""
-echo "------------------------------------------------------------------------"
+    echo "------------------------------------------------------------------------"
+    echo "$(tput bold) $pname : CONNECT TO STREAM $(tput sgr0)"
+    echo " Full path name : $0"
+    echo "------------------------------------------------------------------------"
+    echo "  Establishes a stream sym link from TARGET=<sourcestrem> to LINKNAME=<streamname>."
+    echo "  Reads conf/streamlink.<streamname>.name.txt to identify source stream."
+    echo "  - Create $MILK_SHM_DIR/<streamname>.im.shm that points to $MI_SHM_DIR/<sourcestream>.im.shm"
+    echo "  - Runs milk, connects to <streamname> and writes its size to ./conf/streamlink.<streamname>.imsize.txt"
+    echo "   "
+    echo " $(tput bold)USAGE:$(tput sgr0)"
+    echo "     $0 [-h] <streamname>"
+    echo ""
+    echo " $(tput bold)OPTIONS:$(tput sgr0)"
+    echo "     $(tput bold)-h$(tput sgr0)                help"
+    echo "     $(tput bold)-p$(tput sgr0) <prefix>       stream prefix"
+    echo ""
+    echo " $(tput bold)INPUT:$(tput sgr0)"
+    echo "     <streamname>           stream name (full name: <prefix><streamname>)"
+    echo ""
+    echo " $(tput bold)OUTPUT:$(tput sgr0)"
+    echo "  ./conf/streamlink.<streamname>.imsize.txt :   stream aimage size"
+    echo ""
+    echo "------------------------------------------------------------------------"
 }
 
 
 printHELP1 ()
 {
-    printf "     $(tput bold)%-25s$(tput sgr0)       Connect to shared memory stream\n" "$0" 
+    printf "     $(tput bold)%-25s$(tput sgr0)       Connect to shared memory stream\n" "$0"
 }
 
 
@@ -46,41 +46,41 @@ printHELP1 ()
 # Transform long options to short ones
 singlelinehelp=0
 for arg in "$@"; do
-  shift
-  case "$arg" in
-    "--help") set -- "$@" "-h" ;;
-    "--help1") 
-set -- "$@" "-h" 
-singlelinehelp=1;
-;;
-    *)        set -- "$@" "$arg"
-  esac
+    shift
+    case "$arg" in
+        "--help") set -- "$@" "-h" ;;
+        "--help1")
+            set -- "$@" "-h"
+            singlelinehelp=1;
+            ;;
+        *)        set -- "$@" "$arg"
+    esac
 done
 
 
 
 SMPREFIX=""
 while getopts :hp: FLAG; do
-  case $FLAG in
-    h)  #show help
-      if [ "$singlelinehelp" -eq "0" ]; then
-      printHELP
-      else
-      printHELP1
-      fi
-      exit
-      ;;
-    p)
-    SMPREFIX="$OPTARG"
-    ;;
-    \?) #unrecognized option - show help
-      echo -e \\n"Option -${BOLD}$OPTARG${NORM} not allowed."
-      printHELP
-      ;;
-  esac
+    case $FLAG in
+        h)  #show help
+            if [ "$singlelinehelp" -eq "0" ]; then
+                printHELP
+            else
+                printHELP1
+            fi
+            exit
+            ;;
+        p)
+            SMPREFIX="$OPTARG"
+            ;;
+        \?) #unrecognized option - show help
+            echo -e \\n"Option -${BOLD}$OPTARG${NORM} not allowed."
+            printHELP
+            ;;
+    esac
 done
 
-shift $((OPTIND-1)) 
+shift $((OPTIND-1))
 
 
 fullname="${SMPREFIX}$1"
@@ -92,10 +92,10 @@ fullname="${SMPREFIX}$1"
 
 
 if [[ -z "${MILK_SHM_DIR}" ]]; then
-  echo "ERROR: MILK_SHM_DIR environment variable does not exist: cannot find/access shared memory"
-  exit
+    echo "ERROR: MILK_SHM_DIR environment variable does not exist: cannot find/access shared memory"
+    exit
 else
-  SHMDIR="${MILK_SHM_DIR}"
+    SHMDIR="${MILK_SHM_DIR}"
 fi
 echo "SHMDIR = $SHMDIR"
 
@@ -107,16 +107,15 @@ echo "SHMDIR = $SHMDIR"
 file="./conf/streamlink.$1.name.txt"
 if [ -a $file ]; then
 
-streamname=$( head -1 $file )  # source
-rm $SHMDIR/${fullname}.im.shm  # remove dest
-ln -s $SHMDIR/${streamname}.im.shm $SHMDIR/${fullname}.im.shm  # establish link
+    streamname=$( head -1 $file )  # source
+    rm $SHMDIR/${fullname}.im.shm  # remove dest
+    ln -s $SHMDIR/${streamname}.im.shm $SHMDIR/${fullname}.im.shm  # establish link
 
 
-milk << EOF
+    milk << EOF
 readshmim ${fullname}
 readshmimsize ${fullname} "./conf/streamlink.$1.imsize.txt"
 exitCLI
 EOF
 
 fi
-
diff --git a/scripts/milkFits2shm b/scripts/milkFits2shm
index 560ef1b3..018b8e4b 100755
--- a/scripts/milkFits2shm
+++ b/scripts/milkFits2shm
@@ -9,48 +9,48 @@ VERBOSE="0"
 
 
 function printHELP {
-echo "------------------------------------------------------------------------"
-echo "$(tput bold) $pname : Load FITS files to shared memory $(tput sgr0)"
-echo " Full path name : $0"
-echo "------------------------------------------------------------------------"
-echo "  Load FITS file to shared memory"
-echo "  Writes into ./loadedSM/ what has been loaded"
-echo "  unless -f option, will not re-load unchanged files"
-echo "   "
-echo " $(tput bold)USAGE (conf name output):$(tput sgr0)"
-echo "     $pname [-hfpr] <FITS file> <streamname>"
-echo " $(tput bold)USAGE (conf name input):$(tput sgr0)"
-echo "     $pname -c [-hfpr] <streamname>"
-echo ""
-echo " $(tput bold)OPTIONS:$(tput sgr0)"
-echo "     $(tput bold)-h$(tput sgr0)           help"
-echo "     $(tput bold)-f$(tput sgr0)           force load (even if unchanged file)"
-echo "     $(tput bold)-c$(tput sgr0)           read FITS file name from ./conf/shmim.<streamname>.name.txt directory"
-echo "     $(tput bold)-p$(tput sgr0) <pref>    stream prefix"
-echo "     $(tput bold)-r$(tput sgr0)           remove / clear previous stream and associated files"
-echo ""
-echo " $(tput bold)INPUT:$(tput sgr0)"
-echo "   <FITS file>    filesystem FITS file"
-echo "   <stream>       shared memory stream name"
-echo ""
-echo " $(tput bold)EXAMPLES:$(tput sgr0)"
-echo "   $pname -f image32.fits ims10"
-echo "        Load image32.fits to stream ims10"
-echo "        -f option : force load even if image and stream have not changed"
-echo "        write \"image32.fits\" into file \"conf/shmim.ims10.name.txt"
-echo "   echo \"image102.fits\" > conf/shmim.ims10.name.txt"
-echo "   $pname -c ims10"
-echo "        Load image102.fits to stream ims10"
-echo "   $pname -c -p aol3_ ims10"
-echo "        Load image102.fits to stream aol3_ims10"
-echo ""
-echo "------------------------------------------------------------------------"
+    echo "------------------------------------------------------------------------"
+    echo "$(tput bold) $pname : Load FITS files to shared memory $(tput sgr0)"
+    echo " Full path name : $0"
+    echo "------------------------------------------------------------------------"
+    echo "  Load FITS file to shared memory"
+    echo "  Writes into ./loadedSM/ what has been loaded"
+    echo "  unless -f option, will not re-load unchanged files"
+    echo "   "
+    echo " $(tput bold)USAGE (conf name output):$(tput sgr0)"
+    echo "     $pname [-hfpr] <FITS file> <streamname>"
+    echo " $(tput bold)USAGE (conf name input):$(tput sgr0)"
+    echo "     $pname -c [-hfpr] <streamname>"
+    echo ""
+    echo " $(tput bold)OPTIONS:$(tput sgr0)"
+    echo "     $(tput bold)-h$(tput sgr0)           help"
+    echo "     $(tput bold)-f$(tput sgr0)           force load (even if unchanged file)"
+    echo "     $(tput bold)-c$(tput sgr0)           read FITS file name from ./conf/shmim.<streamname>.name.txt directory"
+    echo "     $(tput bold)-p$(tput sgr0) <pref>    stream prefix"
+    echo "     $(tput bold)-r$(tput sgr0)           remove / clear previous stream and associated files"
+    echo ""
+    echo " $(tput bold)INPUT:$(tput sgr0)"
+    echo "   <FITS file>    filesystem FITS file"
+    echo "   <stream>       shared memory stream name"
+    echo ""
+    echo " $(tput bold)EXAMPLES:$(tput sgr0)"
+    echo "   $pname -f image32.fits ims10"
+    echo "        Load image32.fits to stream ims10"
+    echo "        -f option : force load even if image and stream have not changed"
+    echo "        write \"image32.fits\" into file \"conf/shmim.ims10.name.txt"
+    echo "   echo \"image102.fits\" > conf/shmim.ims10.name.txt"
+    echo "   $pname -c ims10"
+    echo "        Load image102.fits to stream ims10"
+    echo "   $pname -c -p aol3_ ims10"
+    echo "        Load image102.fits to stream aol3_ims10"
+    echo ""
+    echo "------------------------------------------------------------------------"
 }
 
 
 printHELP1 ()
 {
-    printf "%25s       Copy FITS files to shared memory\n" "$0" 
+    printf "%25s       Copy FITS files to shared memory\n" "$0"
 }
 
 
@@ -60,23 +60,23 @@ printHELP1 ()
 EXITSTATUS=0
 
 function checkFile {
-if [ -f $1 ]
-  then
-    echo "[$(tput setaf 2)$(tput bold)   OK   $(tput sgr0)] File $(tput bold)$1$(tput sgr0) found"
-   else
-    echo "[$(tput setaf 1)$(tput bold) FAILED $(tput sgr0)] File $(tput bold)$1$(tput sgr0) not found"
-    EXITSTATUS=1
-fi
+    if [ -f $1 ]
+    then
+        echo "[$(tput setaf 2)$(tput bold)   OK   $(tput sgr0)] File $(tput bold)$1$(tput sgr0) found"
+    else
+        echo "[$(tput setaf 1)$(tput bold) FAILED $(tput sgr0)] File $(tput bold)$1$(tput sgr0) not found"
+        EXITSTATUS=1
+    fi
 }
 
 function checkDir {
-if [ -d $1 ]
-  then
-    echo "[$(tput setaf 2)$(tput bold)   OK   $(tput sgr0)] Directory $(tput bold)$1$(tput sgr0) found"
-   else
-    echo "[$(tput setaf 1)$(tput bold) FAILED $(tput sgr0)] Directory $(tput bold)$1$(tput sgr0) not found"
-    EXITSTATUS=1
-fi
+    if [ -d $1 ]
+    then
+        echo "[$(tput setaf 2)$(tput bold)   OK   $(tput sgr0)] Directory $(tput bold)$1$(tput sgr0) found"
+    else
+        echo "[$(tput setaf 1)$(tput bold) FAILED $(tput sgr0)] Directory $(tput bold)$1$(tput sgr0) not found"
+        EXITSTATUS=1
+    fi
 }
 
 
@@ -88,15 +88,15 @@ fi
 # Transform long options to short ones
 singlelinehelp=0
 for arg in "$@"; do
-  shift
-  case "$arg" in
-    "--help") set -- "$@" "-h" ;;
-    "--help1") 
-set -- "$@" "-h" 
-singlelinehelp=1;
-;;
-    *)        set -- "$@" "$arg"
-  esac
+    shift
+    case "$arg" in
+        "--help") set -- "$@" "-h" ;;
+        "--help1")
+            set -- "$@" "-h"
+            singlelinehelp=1;
+            ;;
+        *)        set -- "$@" "$arg"
+    esac
 done
 
 
@@ -106,36 +106,36 @@ SMPREFIX=""
 CLEARSTREAM="0"
 
 while getopts :hfcp:r FLAG; do
-  case $FLAG in
-    h)  #show help
-      if [ "$singlelinehelp" -eq "0" ]; then
-      printHELP
-      else
-      printHELP1
-      fi
-      exit
-      ;;
-    c) # read from conf 
-	  READFROMCONF=1
-	  NBARGS=1
-    ;;
-    f)
-    FORCE="1"
-    ;;
-    p)
-    SMPREFIX="$OPTARG"
-    ;;
-    r)
-    CLEARSTREAM="1"
-    ;;
-    \?) #unrecognized option - show help
-      echo -e \\n"Option -${BOLD}$OPTARG${NORM} not allowed."
-      printHELP
-      ;;
-  esac
+    case $FLAG in
+        h)  #show help
+            if [ "$singlelinehelp" -eq "0" ]; then
+                printHELP
+            else
+                printHELP1
+            fi
+            exit
+            ;;
+        c) # read from conf
+            READFROMCONF=1
+            NBARGS=1
+            ;;
+        f)
+            FORCE="1"
+            ;;
+        p)
+            SMPREFIX="$OPTARG"
+            ;;
+        r)
+            CLEARSTREAM="1"
+            ;;
+        \?) #unrecognized option - show help
+            echo -e \\n"Option -${BOLD}$OPTARG${NORM} not allowed."
+            printHELP
+            ;;
+    esac
 done
 
-shift $((OPTIND-1)) 
+shift $((OPTIND-1))
 
 
 
@@ -144,42 +144,42 @@ shift $((OPTIND-1))
 
 
 if [ "$1" = "help" ] || [ "$#" -ne $NBARGS ]; then
-if [ "$#" -ne $NBARGS ]; then
-    echo "$(tput setaf 1)$(tput bold) Illegal number of parameters ($NBARGS params required, $# entered) $(tput sgr0)"
-fi
-printHELP
-        exit
+    if [ "$#" -ne $NBARGS ]; then
+        echo "$(tput setaf 1)$(tput bold) Illegal number of parameters ($NBARGS params required, $# entered) $(tput sgr0)"
+    fi
+    printHELP
+    exit
 fi
 
 
 
 # ======================= CHECK REQUIRED FILES =================================
 if [ "$READFROMCONF" = "0" ]; then
-checkFile $1
+    checkFile $1
 else
-checkFile conf/shmim.$1.name.txt
+    checkFile conf/shmim.$1.name.txt
 fi
 
 
 
 
 if [ $EXITSTATUS -eq 1 ]; then
-echo ""
-echo "$(tput setaf 1)$(tput bold) REQUIRED FILES, COMMANDS NOT FOUND: EXITING $(tput sgr0)"
-echo ""
-exit
+    echo ""
+    echo "$(tput setaf 1)$(tput bold) REQUIRED FILES, COMMANDS NOT FOUND: EXITING $(tput sgr0)"
+    echo ""
+    exit
 else
-echo ""
+    echo ""
 fi
 
 
 
 
 if [[ -z "${MILK_SHM_DIR}" ]]; then
-  echo "ERROR: MILK_SHM_DIR environment variable does not exist: cannot find/access shared memory"
-  exit
+    echo "ERROR: MILK_SHM_DIR environment variable does not exist: cannot find/access shared memory"
+    exit
 else
-  SHMDIR="${MILK_SHM_DIR}"
+    SHMDIR="${MILK_SHM_DIR}"
 fi
 echo "SHMDIR = $SHMDIR"
 
@@ -191,13 +191,13 @@ echo "SHMDIR = $SHMDIR"
 
 
 if [ "$READFROMCONF" = "0" ]; then
-FITSfname="$1"
-STREAMname="$2"
-STREAMname0="$2"
+    FITSfname="$1"
+    STREAMname="$2"
+    STREAMname0="$2"
 else
-STREAMname0="$1"
-STREAMname="${SMPREFIX}$1"
-FITSfname=$( cat ./conf/shmim.$1.name.txt )
+    STREAMname0="$1"
+    STREAMname="${SMPREFIX}$1"
+    FITSfname=$( cat ./conf/shmim.$1.name.txt )
 fi
 
 
@@ -206,9 +206,9 @@ fi
 # if it is, resolve link
 #
 if [ -L "$FITSfname" ]; then
-flink=$( readlink -f $FITSfname )
-rm $FITSfname
-rsync -auL $flink $FITSfname
+    flink=$( readlink -f $FITSfname )
+    rm $FITSfname
+    rsync -auL $flink $FITSfname
 fi
 
 
@@ -224,11 +224,11 @@ mkdir -p loadedSM
 
 
 if [ "$CLEARSTREAM" = "1" ]; then # clear stream and associated files
-rm ./loadedSM/${STREAMname0}.*
-rm $MILK_SHM_DIR/${STREAMname}.im.shm
-rm /dev/shm/sem.${STREAMname}.*
-rm ./conf/shmim.${STREAMname0}.imsize.txt
-rm ./conf/shmim.${STREAMname0}.fits
+    rm ./loadedSM/${STREAMname0}.*
+    rm $MILK_SHM_DIR/${STREAMname}.im.shm
+    rm /dev/shm/sem.${STREAMname}.*
+    rm ./conf/shmim.${STREAMname0}.imsize.txt
+    rm ./conf/shmim.${STREAMname0}.fits
 fi
 
 
@@ -245,22 +245,22 @@ stat -L --format "%n %s %y" ${FITSfname} > ./loadedSM/${STREAMname0}.FITSinfo
 str1=$(cat ./loadedSM/${STREAMname0}.FITSinfo.old)
 str2=$(cat ./loadedSM/${STREAMname0}.FITSinfo)
 if [ "$str1" = "$str2" ]; then
-if [ "$VERBOSE" = "1" ]; then
-echo "======= FITS file unchanged ========"
-echo "======= LOADfile = $LOADfile ========"
-fi
-touch ./loadedSM/${STREAMname0}.FITSsame
-rm ./loadedSM/${STREAMname0}.FITSchanged &> /dev/null
-NEW="0"
+    if [ "$VERBOSE" = "1" ]; then
+        echo "======= FITS file unchanged ========"
+        echo "======= LOADfile = $LOADfile ========"
+    fi
+    touch ./loadedSM/${STREAMname0}.FITSsame
+    rm ./loadedSM/${STREAMname0}.FITSchanged &> /dev/null
+    NEW="0"
 else
-if [ "$VERBOSE" = "1" ]; then
-echo "======= FITS file changed =========="
-echo "======= LOADfile = $LOADfile ========"
-fi
-rm ./loadedSM/${STREAMname0}.FITSsame &> /dev/null
-touch ./loadedSM/${STREAMname0}.FITSchanged
-NEW="1"
-LOADfile="1"
+    if [ "$VERBOSE" = "1" ]; then
+        echo "======= FITS file changed =========="
+        echo "======= LOADfile = $LOADfile ========"
+    fi
+    rm ./loadedSM/${STREAMname0}.FITSsame &> /dev/null
+    touch ./loadedSM/${STREAMname0}.FITSchanged
+    NEW="1"
+    LOADfile="1"
 fi
 rm ./loadedSM/${STREAMname0}.SMloaded.old &> /dev/null
 
@@ -273,22 +273,22 @@ str1=$(cat ./loadedSM/${STREAMname0}.SMinfo.old)
 str2=$(cat ./loadedSM/${STREAMname0}.SMinfo)
 
 if [ "$str1" = "$str2" ]; then
-if [ "$VERBOSE" = "1" ]; then
-echo "======= SM file unchanged ========"
-echo "======= LOADfile = $LOADfile ========"
-fi
-touch ./loadedSM/${STREAMname0}.SMsame
-rm ./loadedSM/${STREAMname0}.SMchanged &> /dev/null
-NEW_SM="0"
+    if [ "$VERBOSE" = "1" ]; then
+        echo "======= SM file unchanged ========"
+        echo "======= LOADfile = $LOADfile ========"
+    fi
+    touch ./loadedSM/${STREAMname0}.SMsame
+    rm ./loadedSM/${STREAMname0}.SMchanged &> /dev/null
+    NEW_SM="0"
 else
-if [ "$VERBOSE" = "1" ]; then
-echo "======= SM file changed =========="
-echo "======= LOADfile = $LOADfile ========"
-fi
-rm ./loadedSM/${STREAMname0}.SMsame &> /dev/null
-touch ./loadedSM/${STREAMname0}.SMchanged
-NEW_SM="1"
-LOADfile="1"
+    if [ "$VERBOSE" = "1" ]; then
+        echo "======= SM file changed =========="
+        echo "======= LOADfile = $LOADfile ========"
+    fi
+    rm ./loadedSM/${STREAMname0}.SMsame &> /dev/null
+    touch ./loadedSM/${STREAMname0}.SMchanged
+    NEW_SM="1"
+    LOADfile="1"
 fi
 rm ./loadedSM/${STREAMname0}.SMinfo.old &> /dev/null
 
@@ -297,28 +297,28 @@ rm ./loadedSM/${STREAMname0}.SMinfo.old &> /dev/null
 
 
 if [ ! -f "$MILK_SHM_DIR/${STREAMname}.im.shm" ]; then
-if [ "$VERBOSE" = "1" ]; then
-echo "======= SM file missing =========="
-echo "======= LOADfile = $LOADfile ========"
-fi
-touch ./loadedSM/${STREAMname0}.missing
-LOADfile="1"
+    if [ "$VERBOSE" = "1" ]; then
+        echo "======= SM file missing =========="
+        echo "======= LOADfile = $LOADfile ========"
+    fi
+    touch ./loadedSM/${STREAMname0}.missing
+    LOADfile="1"
 else
-rm ./loadedSM/${STREAMname0}.missing &> /dev/null
+    rm ./loadedSM/${STREAMname0}.missing &> /dev/null
 fi
 
 
 if [ "$FORCE" = "1" ]; then
-if [ "$VERBOSE" = "1" ]; then
-echo "======= FORCE MODE =========="
-echo "======= LOADfile = $LOADfile ========"
-fi
-LOADfile="1"
+    if [ "$VERBOSE" = "1" ]; then
+        echo "======= FORCE MODE =========="
+        echo "======= LOADfile = $LOADfile ========"
+    fi
+    LOADfile="1"
 fi
 
 
 if [ "$VERBOSE" = "1" ]; then
-echo "======= LOADfile = $LOADfile ========"
+    echo "======= LOADfile = $LOADfile ========"
 fi
 
 
@@ -327,7 +327,7 @@ fi
 if [ "$LOADfile" = "1" ]; then
 
 
-./AOloopControl -n $pname << EOF
+    ./AOloopControl -n $pname << EOF
 loadfits "${FITSfname}" im
 readshmim "${STREAMname}"
 cpsh im "${STREAMname}"
@@ -335,23 +335,21 @@ readshmimsize ${STREAMname} "./loadedSM/${STREAMname0}.imsize"
 exitCLI
 EOF
 
-# copy imsize to conf
-cp ./loadedSM/${STREAMname0}.imsize ./conf/shmim.${STREAMname0}.imsize.txt
-# add link to conf
-rm ./conf/shmim.${STREAMname0}.fits
-ln -s ${PWD}/${FITSfname} ./conf/shmim.${STREAMname0}.fits
+    # copy imsize to conf
+    cp ./loadedSM/${STREAMname0}.imsize ./conf/shmim.${STREAMname0}.imsize.txt
+    # add link to conf
+    rm ./conf/shmim.${STREAMname0}.fits
+    ln -s ${PWD}/${FITSfname} ./conf/shmim.${STREAMname0}.fits
 
 
-# write SM stat AFTER it has been updated
-stat -L --format "%n %s %y" $MILK_SHM_DIR/${STREAMname}.im.shm > ./loadedSM/${STREAMname0}.SMinfo
-rm ./loadedSM/${STREAMname0}.kept &> /dev/null
-touch ./loadedSM/${STREAMname0}.changed
+    # write SM stat AFTER it has been updated
+    stat -L --format "%n %s %y" $MILK_SHM_DIR/${STREAMname}.im.shm > ./loadedSM/${STREAMname0}.SMinfo
+    rm ./loadedSM/${STREAMname0}.kept &> /dev/null
+    touch ./loadedSM/${STREAMname0}.changed
 
 else
 
-touch ./loadedSM/${STREAMname0}.kept
-rm ./loadedSM/${STREAMname0}.changed &> /dev/null
+    touch ./loadedSM/${STREAMname0}.kept
+    rm ./loadedSM/${STREAMname0}.changed &> /dev/null
 
 fi
-
-
diff --git a/scripts/pyshmimview b/scripts/pyshmimview
index 0ce3c23d..246a1aa7 100755
--- a/scripts/pyshmimview
+++ b/scripts/pyshmimview
@@ -9,12 +9,10 @@ import time
 from PIL import Image
 
 home = os.getenv('HOME')
-sys.path.append(home+'/src/lib/python/')
+sys.path.append(home + '/src/lib/python/')
 import matplotlib.colors as cmaps
 #import colormaps as cmaps
-from   scexao_shm   import shm
-
-
+from scexao_shm import shm
 
 hmsg = """
 
@@ -48,9 +46,9 @@ ESC   : quit shmview
 
 """
 args = sys.argv[1:]
-if args == []: 
+if args == []:
     print(hmsg)
-    cam = shm("$MILK_SHM_DIR/ircam%d.im.shm" % (2,))
+    cam = shm("$MILK_SHM_DIR/ircam%d.im.shm" % (2, ))
 else:
     cam = shm(args[0])
 
@@ -73,7 +71,7 @@ else:
 # -----------------------
 pygame.init()
 
-FPS = 20                        # frames per second setting
+FPS = 20  # frames per second setting
 fpsClock = pygame.time.Clock()  # start the pygame clock!
 XW, YW = 650, 712
 XW, YW = zoom * xsize, zoom * ysize
@@ -81,6 +79,7 @@ XW, YW = zoom * xsize, zoom * ysize
 screen = pygame.display.set_mode((XW, YW), 0, 32)
 pygame.display.set_caption('shared memory live viewer')
 
+
 # ------------------------------------------------------------------
 #             short hands for shared memory data access
 # ------------------------------------------------------------------
@@ -91,41 +90,43 @@ def get_img_data(check=False):
     Reads from the already-opened shared memory
     data structure.
     ---------------------------------------- '''
-    return(cam.get_data(check, True).astype(float))
+    return (cam.get_data(check, True).astype(float))
+
 
 # ------------------------------------------------------------------
 #  another short hand to convert numpy array into image for display
 # ------------------------------------------------------------------
 def arr2im(arr, vmin=0., vmax=10000.0, pwr=1.0):
-    
+
     arr2 = arr.astype('float')**pwr
-    mmin,mmax = arr2.min(), arr2.max()
+    mmin, mmax = arr2.min(), arr2.max()
     #mmax = np.percentile(arr2, 99)
     arr2 -= mmin
-    arr2 /= (mmax-mmin)
+    arr2 /= (mmax - mmin)
 
     if zoom != 1:
         img = Image.fromarray(arr2)
-        rimg = img.resize((zoom*ysize, zoom*xsize))
+        rimg = img.resize((zoom * ysize, zoom * xsize))
         rarr = np.asarray(rimg)
         test = mycmap(rarr)
     else:
         test = mycmap(arr2)
-    return((255*test[:,:,:3]).astype('int'))
+    return ((255 * test[:, :, :3]).astype('int'))
+
 
 # ------------------------------------------------------------------
 #              !!! now we are in business !!!!
 # ------------------------------------------------------------------
 
 WHITE = (255, 255, 255)
-GREEN = (  0, 255,   0) 
-BLUE  = (  0,   0, 255)
-RED   = (255,   0,   0)
-BLK   = (  0,   0,   0)
+GREEN = (0, 255, 0)
+BLUE = (0, 0, 255)
+RED = (255, 0, 0)
+BLK = (0, 0, 0)
 
 FGCOL = WHITE  # foreground color (text)
-BGCOL = BLK    # background color
-BTCOL = BLUE   # *button* color
+BGCOL = BLK  # background color
+BTCOL = BLUE  # *button* color
 
 background = pygame.Surface(screen.get_size())
 background = background.convert()
@@ -134,34 +135,32 @@ background.fill(BLK)
 # ----------------------------
 #          labels
 # ----------------------------
-font1 = pygame.font.SysFont("default",   48)
-font2 = pygame.font.SysFont("default",   30)
+font1 = pygame.font.SysFont("default", 48)
+font2 = pygame.font.SysFont("default", 30)
 font3 = pygame.font.SysFont("monospace", 16)
 
-xws = xsize*zoom
-yws = ysize*zoom
+xws = xsize * zoom
+yws = ysize * zoom
 
 imin, imax = 0, 0
-surf_live = pygame.surface.Surface((zoom*xsize, zoom*ysize))
+surf_live = pygame.surface.Surface((zoom * xsize, zoom * ysize))
 #screen.blit(surf_live, (5,5))
 
 rect1 = surf_live.get_rect()
-rect1.center = (xws/2, yws/2)
-
-temp      = get_img_data()
+rect1.center = (xws / 2, yws / 2)
 
+temp = get_img_data()
 
 plot_cross = True  # flag for display of the crosses
-subt_bias  = False # flag for bias subtraction
-cont_acq   = False 
-lin_scale  = True  # flag for linear range
-clr_scale  = False # flag for the display color scale
+subt_bias = False  # flag for bias subtraction
+cont_acq = False
+lin_scale = True  # flag for linear range
+clr_scale = False  # flag for the display color scale
 bias = np.zeros_like(temp)
 
-
 # =======================================================
 # =======================================================
-while True: # the main game loop
+while True:  # the main game loop
     clicked = False
 
     pwr0 = 1.0
@@ -173,20 +172,19 @@ while True: # the main game loop
         mycmap = cmaps.inferno
 
     # read image
-    temp      = get_img_data()
+    temp = get_img_data()
 
     imin, imax = temp.min(), temp.max()
     temp -= imin
-    myim      = arr2im(temp.transpose(), pwr=pwr0)
+    myim = arr2im(temp.transpose(), pwr=pwr0)
 
     imax = np.percentile(temp, 99.95)
-    msg = ""#"(min,max) = (%5d,%5d)" % (imin, imax)
+    msg = ""  #"(min,max) = (%5d,%5d)" % (imin, imax)
 
     # display information
     pygame.surfarray.blit_array(surf_live, myim)
     screen.blit(surf_live, rect1)
 
-
     # =====================================
     for event in pygame.event.get():
 
@@ -195,7 +193,7 @@ while True: # the main game loop
 
             # close shared memory access
             # --------------------------
-            cam.close()          # global disp map
+            cam.close()  # global disp map
             print("shmview has ended normally.")
             sys.exit()
         elif event.type == KEYDOWN:
@@ -204,7 +202,7 @@ while True: # the main game loop
                 pygame.quit()
                 # close shared memory access
                 # --------------------------
-                cam.close()          # global disp map
+                cam.close()  # global disp map
                 print("shmview has ended normally.")
                 sys.exit()
             if event.key == K_m:
diff --git a/scripts/runidle b/scripts/runidle
index e2176866..dcb09ec1 100755
--- a/scripts/runidle
+++ b/scripts/runidle
@@ -13,22 +13,22 @@ tidle=2000 # 2 sec
 while [ 1 ];
 do
 
-if ps -p $PID > /dev/null
-then
-#  echo "$PID is running"
-  if [ `xprintidle` -gt "$tidle" ];
-  then
-    echo "idle for more than $tidle ms -> continue process $PID"
-    kill -CONT $PID
-  else
-    echo "stopping process $PID"
-    kill -STOP $PID
-  fi
-else
- echo "$PID is not running -> exit runidle"
- exit
-fi
+    if ps -p $PID > /dev/null
+    then
+        #  echo "$PID is running"
+        if [ `xprintidle` -gt "$tidle" ];
+        then
+            echo "idle for more than $tidle ms -> continue process $PID"
+            kill -CONT $PID
+        else
+            echo "stopping process $PID"
+            kill -STOP $PID
+        fi
+    else
+        echo "$PID is not running -> exit runidle"
+        exit
+    fi
 
-sleep 1
+    sleep 1
 
 done
diff --git a/scripts/shmimview2 b/scripts/shmimview2
index 2c9fde47..87ca0d8d 100755
--- a/scripts/shmimview2
+++ b/scripts/shmimview2
@@ -6,135 +6,124 @@ import numpy as np
 import matplotlib.pyplot as plt
 import matplotlib.cm as cm
 #import pyfits as pf
-import pdb
 import threading
 import mmap
-import struct 
+import struct
 import os
 #import Image
 import time
 from PIL import Image
 
 
-
-
-
-
 class shm:
     ''' -------------------------------------------------------------
-    Shared memory data structure for images 
+    Shared memory data structure for images
     ------------------------------------------------------------- '''
 
     def __init__(self, fname=None, verbose=True):
         if fname == None:
             print("No shared memory file name provided")
-            return(None)
+            return (None)
         try:
             self.fd = os.open(fname, os.O_RDWR)
         except:
-            print("File %s is not a shared memory file" % (fname,))
-            return(None)
+            print("File %s is not a shared memory file" % (fname, ))
+            return (None)
 
         fsz = os.path.getsize(fname)
         #print ("file %s size = %d bytes" % (fname, fsz))
         self.buf = mmap.mmap(self.fd, 0, mmap.MAP_SHARED)
         self.read_meta_data(verbose=verbose)
 
-
-    def close(self,):
+    def close(self, ):
         self.buf.close()
         os.close(self.fd)
 
-
     def read_meta_data(self, verbose=True):
         buf = self.buf
-        self.imname  = str(buf[0:80]).strip('\x00')       # image name
-        self.naxis,  = struct.unpack('l',   buf[80:88])   # array dimension
-        self.size    = struct.unpack('lll', buf[88:112])  # array size
-        self.nel,    = struct.unpack('l',   buf[112:120]) # nb. elements
-        self.idtype, = struct.unpack('l',   buf[120:128]) # image dtype
-        self.crtime, = struct.unpack('d',   buf[128:136]) # creation time
-        self.latime, = struct.unpack('d',   buf[136:144]) # last access time
-
-        self.shared, = struct.unpack('i',   buf[164:168]) # flag
-        self.write,  = struct.unpack('i',   buf[168:172]) # flag
-
-        self.status, = struct.unpack('i',   buf[172:176])   
-        self.cnt0,   = struct.unpack('l',   buf[176:184]) # counter
-        self.cnt1,   = struct.unpack('l',   buf[184:192]) # counter
-        self.nbkw    = struct.unpack('l',   buf[192:200]) # nb of keywords
+        self.imname = str(buf[0:80]).strip('\x00')  # image name
+        self.naxis, = struct.unpack('l', buf[80:88])  # array dimension
+        self.size = struct.unpack('lll', buf[88:112])  # array size
+        self.nel, = struct.unpack('l', buf[112:120])  # nb. elements
+        self.idtype, = struct.unpack('l', buf[120:128])  # image dtype
+        self.crtime, = struct.unpack('d', buf[128:136])  # creation time
+        self.latime, = struct.unpack('d', buf[136:144])  # last access time
+
+        self.shared, = struct.unpack('i', buf[164:168])  # flag
+        self.write, = struct.unpack('i', buf[168:172])  # flag
+
+        self.status, = struct.unpack('i', buf[172:176])
+        self.cnt0, = struct.unpack('l', buf[176:184])  # counter
+        self.cnt1, = struct.unpack('l', buf[184:192])  # counter
+        self.nbkw = struct.unpack('l', buf[192:200])  # nb of keywords
 
         self.naxis = 2
         self.size = (self.size[0], self.size[1], 0)
-	self.nel = self.size[0]*self.size[1]
+        self.nel = self.size[0] * self.size[1]
         self.elt_sz = 2
         self.ddtype = np.int32
 
-        if self.idtype == 1: # C-char
+        if self.idtype == 1:  # C-char
             self.elt_sz = 1
             self.ddtype = np.str
 
-        if self.idtype == 2: # C-long
+        if self.idtype == 2:  # C-long
             self.elt_sz = 4
             self.ddtype = np.int32
-                
-        if self.idtype == 3: # C-float
-            self.elt_sz = 4 
+
+        if self.idtype == 3:  # C-float
+            self.elt_sz = 4
             self.ddtype = np.float32
 
-        if self.idtype == 4: # C-double
-            self.elt_sz= 8
+        if self.idtype == 4:  # C-double
+            self.elt_sz = 8
             self.ddtype = np.float64
 
-        if self.idtype == 7: # C-ushort
-            self.elt_sz= 2
+        if self.idtype == 7:  # C-ushort
+            self.elt_sz = 2
             self.ddtype = np.ushort
 
         if verbose:
-            print("imname = %s"             % (self.imname,))
-            print("naxis = %d"              % (self.naxis,))
-            print("xs, ys, zs = %d, %d, %d" %  self.size)
-            print("image data type %d"      % (self.idtype,))
-            print("image counter = %d"      % (self.cnt0,))
-            print("SHARED %d"               % (self.shared,))
+            print("imname = %s" % (self.imname, ))
+            print("naxis = %d" % (self.naxis, ))
+            print("xs, ys, zs = %d, %d, %d" % self.size)
+            print("image data type %d" % (self.idtype, ))
+            print("image counter = %d" % (self.cnt0, ))
+            print("SHARED %d" % (self.shared, ))
 
     # ------
-    def get_data(self,check=False,reform=True):
+    def get_data(self, check=False, reform=True):
         if check:
-            cnt, = struct.unpack('l',   self.buf[176:184]) # current counter val
+            cnt, = struct.unpack('l', self.buf[176:184])  # current counter val
             while (cnt <= self.cnt0):
                 time.sleep(0.001)
-                cnt, = struct.unpack('l',   self.buf[168:176])
+                cnt, = struct.unpack('l', self.buf[168:176])
             self.cnt0 = cnt
-            
-        data = np.fromstring(
-            self.buf[200:200+self.nel*self.elt_sz], dtype=self.ddtype)
+
+        data = np.fromstring(self.buf[200:200 + self.nel * self.elt_sz],
+                             dtype=self.ddtype)
 
         if reform:
             data = data.reshape(self.size[:self.naxis][::-1])
 
-        return(data)
+        return (data)
 
     # ------
     def get_counter(self):
-        self.cnt0,   = struct.unpack('l',   self.buf[176:184]) # counter
+        self.cnt0, = struct.unpack('l', self.buf[176:184])  # counter
         return self.cnt0
 
     # ------
     def set_data(self, data):
         aa = array.array('f', (np.hstack(data.astype('f'))).tolist())
         try:
-            self.buf[200:200+self.nel*self.elt_sz] = aa.tostring()
-            counter, = struct.unpack('l',   self.buf[176:184])
+            self.buf[200:200 + self.nel * self.elt_sz] = aa.tostring()
+            counter, = struct.unpack('l', self.buf[176:184])
             counter += 1
             self.buf[176:184] = struct.pack('l', counter)
         except:
             print("Failed to write buffer to shared mem structure")
-        return(True)
-
-
-
-
+        return (True)
 
 
 hmsg = """
@@ -172,9 +161,9 @@ ESC   : quit shmview
 
 """
 args = sys.argv[1:]
-if args == []: 
+if args == []:
     print(hmsg)
-    cam = shm("$MILK_SHM_DIR/ircam%d.im.shm" % (2,))
+    cam = shm("$MILK_SHM_DIR/ircam%d.im.shm" % (2, ))
 else:
     cam = shm(args[0])
 
@@ -209,7 +198,7 @@ else:
 # -----------------------
 pygame.init()
 
-FPS = 20                        # frames per second setting
+FPS = 20  # frames per second setting
 fpsClock = pygame.time.Clock()  # start the pygame clock!
 XW, YW = 650, 712
 XW, YW = zoom * xsize, zoom * ysize
@@ -218,6 +207,7 @@ screen = pygame.display.set_mode((XW, YW), 0, 32)
 #pygame.display.set_caption('shared memory live viewer')
 pygame.display.set_caption(args[0])
 
+
 # ------------------------------------------------------------------
 #             short hands for shared memory data access
 # ------------------------------------------------------------------
@@ -228,42 +218,44 @@ def get_img_data(check=False):
     Reads from the already-opened shared memory
     data structure.
     ---------------------------------------- '''
-    return(cam.get_data(check, True).astype(float))
+    return (cam.get_data(check, True).astype(float))
+
 
 # ------------------------------------------------------------------
 #  another short hand to convert numpy array into image for display
 # ------------------------------------------------------------------
 def arr2im(arr, vmin=0., vmax=10000.0, pwr=1.0, mmin=None, mmax=None):
-    
-    arr2 = arr.astype('float') 
-    if mmin is None or mmax is None: mmin,mmax = arr2.min(), arr2.max()
+
+    arr2 = arr.astype('float')
+    if mmin is None or mmax is None: mmin, mmax = arr2.min(), arr2.max()
     #mmax = np.percentile(arr2, 99)
     arr2 -= mmin
-    arr2 /= (mmax-mmin)
+    arr2 /= (mmax - mmin)
     if not lin_scale:
         arr2 = arr2**pwr
-    
+
     if zoom != 1:
         img = Image.fromarray(arr2)
-        rimg = img.resize((zoom*ysize, zoom*xsize))
+        rimg = img.resize((zoom * ysize, zoom * xsize))
         rarr = np.asarray(rimg)
         test = mycmap(rarr)
     else:
         test = mycmap(arr2)
-    return((255*test[:,:,:3]).astype('int'))
+    return ((255 * test[:, :, :3]).astype('int'))
+
 
 # ------------------------------------------------------------------
 #              !!! now we are in business !!!!
 # ------------------------------------------------------------------
 
 WHITE = (255, 255, 255)
-GREEN = (  0, 255,   0) 
-BLUE  = (  0,   0, 255)
-RED   = (255,   0,   0)
-BLK   = (  0,   0,   0)
+GREEN = (0, 255, 0)
+BLUE = (0, 0, 255)
+RED = (255, 0, 0)
+BLK = (0, 0, 0)
 FGCOL = WHITE  # foreground color (text)
-BGCOL = BLK    # background color
-BTCOL = BLUE   # *button* color
+BGCOL = BLK  # background color
+BTCOL = BLUE  # *button* color
 
 background = pygame.Surface(screen.get_size())
 background = background.convert()
@@ -272,34 +264,32 @@ background.fill(BLK)
 # ----------------------------
 #          labels
 # ----------------------------
-font1 = pygame.font.SysFont("default",   48)
-font2 = pygame.font.SysFont("default",   30)
+font1 = pygame.font.SysFont("default", 48)
+font2 = pygame.font.SysFont("default", 30)
 font3 = pygame.font.SysFont("monospace", 16)
 
-xws = xsize*zoom
-yws = ysize*zoom
+xws = xsize * zoom
+yws = ysize * zoom
 
 imin, imax = 0, 0
-surf_live = pygame.surface.Surface((zoom*xsize, zoom*ysize))
+surf_live = pygame.surface.Surface((zoom * xsize, zoom * ysize))
 #screen.blit(surf_live, (5,5))
 
 rect1 = surf_live.get_rect()
-rect1.center = (xws/2, yws/2)
-
-temp      = get_img_data()
+rect1.center = (xws / 2, yws / 2)
 
+temp = get_img_data()
 
 #plot_cross = True  # flag for display of the crosses
 #subt_bias  = False # flag for bias subtraction
-#cont_acq   = False 
-lin_scale  = True  # flag for linear range
-clr_scale  = False # flag for the display color scale
+#cont_acq   = False
+lin_scale = True  # flag for linear range
+clr_scale = False  # flag for the display color scale
 #bias = np.zeros_like(temp)
 
-
 # =======================================================
 # =======================================================
-while True: # the main game loop
+while True:  # the main game loop
     clicked = False
 
     pwr0 = 1.0
@@ -311,11 +301,11 @@ while True: # the main game loop
         mycmap = cm.jet
 
     # read image
-    temp      = get_img_data()
+    temp = get_img_data()
 
     imin, imax = temp.min(), temp.max()
     temp -= imin
-    myim      = arr2im(temp.transpose(), pwr=pwr0, mmin=mindisp, mmax=maxdisp)
+    myim = arr2im(temp.transpose(), pwr=pwr0, mmin=mindisp, mmax=maxdisp)
 
     #imax = np.percentile(temp, 99.95)
     #msg = "(min,max) = (%5d,%5d)" % (imin, imax)
@@ -324,7 +314,6 @@ while True: # the main game loop
     pygame.surfarray.blit_array(surf_live, myim)
     screen.blit(surf_live, rect1)
 
-
     # =====================================
     for event in pygame.event.get():
 
@@ -333,7 +322,7 @@ while True: # the main game loop
 
             # close shared memory access
             # --------------------------
-            cam.close()          # global disp map
+            cam.close()  # global disp map
             print("shmview has ended normally.")
             sys.exit()
         elif event.type == KEYDOWN:
@@ -342,7 +331,7 @@ while True: # the main game loop
                 pygame.quit()
                 # close shared memory access
                 # --------------------------
-                cam.close()          # global disp map
+                cam.close()  # global disp map
                 print("shmview has ended normally.")
                 sys.exit()
             if event.key == K_m:
diff --git a/setup.py b/setup.py
index 0b7e36ba..ab65fba1 100644
--- a/setup.py
+++ b/setup.py
@@ -10,24 +10,26 @@
 
 
 class CMakeExtension(Extension):
+
     def __init__(self, name, sourcedir=''):
         Extension.__init__(self, name, sources=[])
         self.sourcedir = os.path.abspath(sourcedir)
 
 
 class CMakeBuildExt(build_ext):
+
     def run(self):
         try:
             import pybind11
             out = subprocess.check_output(['cmake', '--version'])
         except:
             raise RuntimeError(
-                "CMake and pybind11 must be installed to build the following extensions: " +
-                ", ".join(e.name for e in self.extensions))
+                    "CMake and pybind11 must be installed to build the following extensions: "
+                    + ", ".join(e.name for e in self.extensions))
 
         if platform.system() == "Windows":
             cmake_version = LooseVersion(
-                re.search(r'version\s*([\d.]+)', out.decode()).group(1))
+                    re.search(r'version\s*([\d.]+)', out.decode()).group(1))
             if cmake_version < '3.1.0':
                 raise RuntimeError("CMake >= 3.1.0 is required on Windows")
 
@@ -40,11 +42,11 @@ def build_extension(self, ext):
         self.announce("Preparing the build environment", level=3)
 
         extdir = os.path.abspath(
-            os.path.dirname(self.get_ext_fullpath(ext.name)))
+                os.path.dirname(self.get_ext_fullpath(ext.name)))
 
         cmake_args = [
-            '-DCMAKE_LIBRARY_OUTPUT_DIRECTORY=' + extdir,
-            '-DPYTHON_EXECUTABLE=' + sys.executable,
+                '-DCMAKE_LIBRARY_OUTPUT_DIRECTORY=' + extdir,
+                '-DPYTHON_EXECUTABLE=' + sys.executable,
         ]
 
         cfg = 'Debug' if self.debug else 'Release'
@@ -52,8 +54,8 @@ def build_extension(self, ext):
 
         if platform.system() == "Windows":
             cmake_args += [
-                '-DCMAKE_LIBRARY_OUTPUT_DIRECTORY_{}={}'.format(
-                    cfg.upper(), extdir)
+                    '-DCMAKE_LIBRARY_OUTPUT_DIRECTORY_{}={}'.format(
+                            cfg.upper(), extdir)
             ]
             if sys.maxsize > 2**32:
                 cmake_args += ['-A', 'x64']
@@ -82,23 +84,23 @@ def build_extension(self, ext):
         os.makedirs(self.build_temp, exist_ok=True)
 
         self.announce("Configuring cmake project", level=3)
-        subprocess.check_call(
-            ['cmake', ext.sourcedir] + cmake_args, cwd=self.build_temp)
-        subprocess.check_call(
-            ['cmake', '--build', '.'] + build_args, cwd=self.build_temp)
+        subprocess.check_call(['cmake', ext.sourcedir] + cmake_args,
+                              cwd=self.build_temp)
+        subprocess.check_call(['cmake', '--build', '.'] + build_args,
+                              cwd=self.build_temp)
 
 
 setup(
-    name='CacaoProcessTools',
-    version='1.0.0',
-    author=['Arnaud Sevin'],
-    author_email=['Arnaud.Sevin@obspm.fr'],
-    description='A wrap project to use milk with python',
-    long_description='A wrap project to use milk with python',
-    ext_modules=[CMakeExtension('CacaoProcessTools')],
-    install_requires=['pybind11>=2.4', 'wheel', 'cmake'],
-    setup_requires=['pybind11>=2.4', 'wheel', 'cmake'],
-    python_requires='>=3',
-    cmdclass={'build_ext': CMakeBuildExt},
-    zip_safe=False,
+        name='CacaoProcessTools',
+        version='1.0.0',
+        author=['Arnaud Sevin'],
+        author_email=['Arnaud.Sevin@obspm.fr'],
+        description='A wrap project to use milk with python',
+        long_description='A wrap project to use milk with python',
+        ext_modules=[CMakeExtension('CacaoProcessTools')],
+        install_requires=['pybind11>=2.4', 'wheel', 'cmake'],
+        setup_requires=['pybind11>=2.4', 'wheel', 'cmake'],
+        python_requires='>=3',
+        cmdclass={'build_ext': CMakeBuildExt},
+        zip_safe=False,
 )
diff --git a/src/CLImain.c b/src/CLImain.c
index 19929c55..a7a59318 100644
--- a/src/CLImain.c
+++ b/src/CLImain.c
@@ -1,44 +1,37 @@
 #include "milk_config.h"
 
+#include <assert.h>
+#include <omp.h>
+#include <pthread.h>
+#include <sched.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stdio.h>
-#include <sched.h>
-#include <omp.h>
-#include <assert.h>
-#include <pthread.h>
 
-#include <CommandLineInterface/CLIcore.h>
 #include "CLIcore_UI.h"
+#include <CommandLineInterface/CLIcore.h>
 
-
-#define STYLE_BOLD    "\033[1m"
+#define STYLE_BOLD "\033[1m"
 #define STYLE_NO_BOLD "\033[22m"
 
-
 #define STRINGMAXLEN_VERSIONSTRING 80
 #define STRINGMAXLEN_APPNAME 40
 
-int main(
-    int argc,
-    char *argv[]
-)
+int main(int argc, char *argv[])
 {
     char AppName[STRINGMAXLEN_APPNAME];
 
     char *CLI_APPNAME = getenv("MILKCLI_APPNAME");
-    if(CLI_APPNAME != NULL)
+    if (CLI_APPNAME != NULL)
     {
-        strncpy(AppName, CLI_APPNAME, STRINGMAXLEN_APPNAME-1);
+        strncpy(AppName, CLI_APPNAME, STRINGMAXLEN_APPNAME - 1);
     }
     else
     {
-        strncpy(AppName, "milk", STRINGMAXLEN_APPNAME-1);
+        strncpy(AppName, "milk", STRINGMAXLEN_APPNAME - 1);
     }
 
-
-    if(getenv("MILK_QUIET"))
+    if (getenv("MILK_QUIET"))
     {
         data.quiet = 1;
     }
@@ -47,7 +40,7 @@ int main(
         data.quiet = 0;
     }
 
-    if(getenv("MILK_ERROREXIT"))
+    if (getenv("MILK_ERROREXIT"))
     {
         data.errorexit = 1;
     }
@@ -56,28 +49,24 @@ int main(
         data.errorexit = 0;
     }
 
-
     // Allocate data.testpointarray
 #ifndef NDEBUG
     printf("        [ENABLED]  Code test point tracing\n");
-// allocate circular buffer memory
-    data.testpointarray = (CODETESTPOINT *) malloc(sizeof(CODETESTPOINT) * CODETESTPOINTARRAY_NBCNT);
+    // allocate circular buffer memory
+    data.testpointarray = (CODETESTPOINT *)malloc(sizeof(CODETESTPOINT) * CODETESTPOINTARRAY_NBCNT);
     data.testpointarrayinit = 1;
-// initialize loop counter
-// loop counter increments when reaching end of circular buffer
+    // initialize loop counter
+    // loop counter increments when reaching end of circular buffer
     data.testpointloopcnt = 0;
-// set current entry index to zero
+    // set current entry index to zero
     data.testpointcnt = 0;
 #endif
 
-
-
-
     char versionstring[STRINGMAXLEN_VERSIONSTRING];
-    snprintf(versionstring, STRINGMAXLEN_VERSIONSTRING, "%d.%02d.%02d%s",
-             VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH, VERSION_OPTION);
+    snprintf(versionstring, STRINGMAXLEN_VERSIONSTRING, "%d.%02d.%02d%s", VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH,
+             VERSION_OPTION);
 
-    if(data.quiet == 0)
+    if (data.quiet == 0)
     {
         printf(STYLE_BOLD);
         printf("\n        milk  v %s\n", versionstring);
@@ -85,7 +74,7 @@ int main(
         printf("        === DEBUG MODE : assert() & DEBUG_TRACEPOINT  enabled ===\n");
 #endif
         printf(STYLE_NO_BOLD);
-        if(data.errorexit == 1)
+        if (data.errorexit == 1)
         {
             printf("        EXIT-ON-ERROR mode\n");
         }
@@ -93,7 +82,6 @@ int main(
 
     strcpy(data.package_name, PACKAGE_NAME);
 
-
     data.package_version_major = VERSION_MAJOR;
     data.package_version_minor = VERSION_MINOR;
     data.package_version_patch = VERSION_PATCH;
@@ -104,8 +92,7 @@ int main(
     strcpy(data.configdir, CONFIGDIR);
     strcpy(data.installdir, INSTALLDIR);
 
-
-    if(data.quiet == 0)
+    if (data.quiet == 0)
     {
         //printf("        %s version %s\n", data.package_name, data.package_version);
 #ifdef IMAGESTRUCT_VERSION
@@ -122,10 +109,10 @@ int main(
 
     runCLI(argc, argv, AppName);
 
-
     //errno_t CLIretval = RETURN_SUCCESS;
 
-    if(data.quiet == 0) {
+    if (data.quiet == 0)
+    {
         printf("EXIT CODE %d\n", data.exitcode);
     }
     else
@@ -133,13 +120,12 @@ int main(
         printf("\n");
     }
 
-
     // clean-up calling thread
     //pthread_exit(NULL);
 
 #ifndef NDEBUG
 
-    if(getenv("MILK_WRITECODETRACE"))
+    if (getenv("MILK_WRITECODETRACE"))
     {
         write_tracedebugfile();
     }
diff --git a/src/COREMOD_arith/COREMOD_arith.c b/src/COREMOD_arith/COREMOD_arith.c
index c6ddd268..0b6d2e05 100644
--- a/src/COREMOD_arith/COREMOD_arith.c
+++ b/src/COREMOD_arith/COREMOD_arith.c
@@ -7,7 +7,6 @@
  *
  */
 
-
 /* ================================================================== */
 /* ================================================================== */
 /*            MODULE INFO                                             */
@@ -20,13 +19,7 @@
 #define MODULE_SHORTNAME_DEFAULT ""
 
 // Module short description
-#define MODULE_DESCRIPTION       "Image arithmetic operations"
-
-
-
-
-
-
+#define MODULE_DESCRIPTION "Image arithmetic operations"
 
 /* ================================================================== */
 /* ================================================================== */
@@ -34,69 +27,53 @@
 /* ================================================================== */
 /* ================================================================== */
 
-
-
-
-#include <stdint.h>
-#include <string.h>
-#include <stdio.h>
 #include <ctype.h>
+#include <errno.h>
 #include <math.h>
+#include <stdint.h>
+#include <stdio.h>
 #include <stdlib.h>
-#include <errno.h>
+#include <string.h>
 
 #include <fitsio.h>
 
-
 #ifdef _OPENMP
 #include <omp.h>
 #define OMP_NELEMENT_LIMIT 1000000
 #endif
 
-
-#include "CommandLineInterface/CLIcore.h"
 #include "COREMOD_memory/COREMOD_memory.h"
 #include "COREMOD_tools/COREMOD_tools.h"
-
+#include "CommandLineInterface/CLIcore.h"
 
 //#include "COREMOD_arith/COREMOD_arith.h"
 
-
-#include "set_pixel.h"
 #include "image_crop.h"
+#include "image_dxdy.h"
 #include "image_merge3D.h"
-#include "image_total.h"
 #include "image_stats.h"
-#include "image_dxdy.h"
+#include "image_total.h"
 #include "imfunctions.h"
+#include "set_pixel.h"
 
-#include "mathfuncs.h"
 #include "image_arith__im__im.h"
-#include "image_arith__im_im__im.h"
 #include "image_arith__im_f__im.h"
 #include "image_arith__im_f_f__im.h"
+#include "image_arith__im_im__im.h"
+#include "mathfuncs.h"
 
 #include "execute_arith.h"
 
-
-
 /* ================================================================== */
 /* ================================================================== */
 /*           MACROS, DEFINES                                          */
 /* ================================================================== */
 /* ================================================================== */
 
-
 #ifndef M_PI
 #define M_PI 3.14159265358979323846
 #endif
 
-
-
-
-
-
-
 /* ================================================================== */
 /* ================================================================== */
 /*            INITIALIZE LIBRARY                                      */
@@ -108,64 +85,31 @@
 //
 INIT_MODULE_LIB(COREMOD_arith)
 
-
-
-
-
 /* ================================================================== */
 /* ================================================================== */
 /*            COMMAND LINE INTERFACE (CLI) FUNCTIONS                  */
 /* ================================================================== */
 /* ================================================================== */
 
-
-
-
-
-
-
 static errno_t init_module_CLI()
 {
 
-	image_crop_addCLIcmd();
+    image_crop_addCLIcmd();
 
-	set_pixel_addCLIcmd();
+    set_pixel_addCLIcmd();
 
-	image_arith__im_f_f__im_addCLIcmd();
-	
-	image_merge3D_addCLIcmd();
+    image_arith__im_f_f__im_addCLIcmd();
 
+    image_merge3D_addCLIcmd();
 
     // add atexit functions here
 
     return RETURN_SUCCESS;
 }
 
-
-
-
-
-
 errno_t init_COREMOD_arith()
 {
     init_module_CLI();
 
     return RETURN_SUCCESS;
 }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/COREMOD_arith/COREMOD_arith.h b/src/COREMOD_arith/COREMOD_arith.h
index 7932cb51..203820fa 100644
--- a/src/COREMOD_arith/COREMOD_arith.h
+++ b/src/COREMOD_arith/COREMOD_arith.h
@@ -1,26 +1,24 @@
 #ifndef _ARITH_H
 #define _ARITH_H
 
-
 //void __attribute__ ((constructor)) libinit_COREMOD_arith();
 
 //int init_COREMOD_arith();
 
-#include "COREMOD_arith/set_pixel.h"
+#include "COREMOD_arith/execute_arith.h"
+#include "COREMOD_arith/image_arith__Cim_Cim__Cim.h"
+#include "COREMOD_arith/image_arith__im__im.h"
+#include "COREMOD_arith/image_arith__im_f__im.h"
+#include "COREMOD_arith/image_arith__im_f_f__im.h"
+#include "COREMOD_arith/image_arith__im_im__im.h"
 #include "COREMOD_arith/image_crop.h"
+#include "COREMOD_arith/image_dxdy.h"
 #include "COREMOD_arith/image_merge3D.h"
-#include "COREMOD_arith/image_total.h"
 #include "COREMOD_arith/image_stats.h"
-#include "COREMOD_arith/image_dxdy.h"
+#include "COREMOD_arith/image_total.h"
 #include "COREMOD_arith/imfunctions.h"
-#include "COREMOD_arith/image_arith__im__im.h"
-#include "COREMOD_arith/image_arith__im_im__im.h"
-#include "COREMOD_arith/image_arith__Cim_Cim__Cim.h"
-#include "COREMOD_arith/image_arith__im_f__im.h"
-#include "COREMOD_arith/image_arith__im_f_f__im.h"
-#include "COREMOD_arith/execute_arith.h"
+#include "COREMOD_arith/set_pixel.h"
 
 //imageID arith_make_slopexy(const char *ID_name, long l1,long l2, double sx, double sy);
 
-
 #endif
diff --git a/src/COREMOD_arith/execute_arith.c b/src/COREMOD_arith/execute_arith.c
index 80886c85..b4e8ffa4 100644
--- a/src/COREMOD_arith/execute_arith.c
+++ b/src/COREMOD_arith/execute_arith.c
@@ -5,173 +5,167 @@
  *
  */
 
-#include <math.h>
 #include <ctype.h>
+#include <math.h>
 
-#include "CommandLineInterface/CLIcore.h"
 #include "COREMOD_memory/COREMOD_memory.h"
+#include "CommandLineInterface/CLIcore.h"
 
-#include "set_pixel.h"
+#include "image_arith__Cim_Cim__Cim.h"
+#include "image_arith__im__im.h"
+#include "image_arith__im_f__im.h"
+#include "image_arith__im_f_f__im.h"
+#include "image_arith__im_im__im.h"
 #include "image_crop.h"
+#include "image_dxdy.h"
 #include "image_merge3D.h"
-#include "image_total.h"
 #include "image_stats.h"
-#include "image_dxdy.h"
+#include "image_total.h"
 #include "imfunctions.h"
-#include "image_arith__im__im.h"
-#include "image_arith__im_im__im.h"
-#include "image_arith__Cim_Cim__Cim.h"
-#include "image_arith__im_f__im.h"
-#include "image_arith__im_f_f__im.h"
-
-
-
-#define ARITHTOKENTYPE_UNKNOWN    0
-#define ARITHTOKENTYPE_NOTEXIST   1  // non-existing variable or image
-#define ARITHTOKENTYPE_VARIABLE   2
-#define ARITHTOKENTYPE_NUMBER     3
-#define ARITHTOKENTYPE_OPERAND    4
-#define ARITHTOKENTYPE_OPENPAR    5
-#define ARITHTOKENTYPE_CLOSEPAR   6
-#define ARITHTOKENTYPE_COMA       7
-#define ARITHTOKENTYPE_FUNCTION   8
-#define ARITHTOKENTYPE_EQUAL      9
-#define ARITHTOKENTYPE_IMAGE     10
-#define ARITHTOKENTYPE_MULTFUNC  11 // function of several variables/images, returning one variable/image
-
+#include "set_pixel.h"
 
+#define ARITHTOKENTYPE_UNKNOWN 0
+#define ARITHTOKENTYPE_NOTEXIST 1 // non-existing variable or image
+#define ARITHTOKENTYPE_VARIABLE 2
+#define ARITHTOKENTYPE_NUMBER 3
+#define ARITHTOKENTYPE_OPERAND 4
+#define ARITHTOKENTYPE_OPENPAR 5
+#define ARITHTOKENTYPE_CLOSEPAR 6
+#define ARITHTOKENTYPE_COMA 7
+#define ARITHTOKENTYPE_FUNCTION 8
+#define ARITHTOKENTYPE_EQUAL 9
+#define ARITHTOKENTYPE_IMAGE 10
+#define ARITHTOKENTYPE_MULTFUNC 11 // function of several variables/images, returning one variable/image
 
 int isoperand(const char *word)
 {
     int value = 0;
 
-    if(strcmp(word, "+") == 0)
+    if (strcmp(word, "+") == 0)
     {
         value = 1;
     }
-    if(strcmp(word, "-") == 0)
+    if (strcmp(word, "-") == 0)
     {
         value = 1;
     }
-    if(strcmp(word, "/") == 0)
+    if (strcmp(word, "/") == 0)
     {
         value = 1;
     }
-    if(strcmp(word, "*") == 0)
+    if (strcmp(word, "*") == 0)
     {
         value = 1;
     }
-    if(strcmp(word, "^") == 0)
+    if (strcmp(word, "^") == 0)
     {
         value = 1;
     }
 
-    return(value);
+    return (value);
 }
 
-
 int isfunction(const char *word)
 {
     int value = 0;
 
-    if(strcmp(word, "acos") == 0)
+    if (strcmp(word, "acos") == 0)
     {
         value = 1;
     }
-    if(strcmp(word, "asin") == 0)
+    if (strcmp(word, "asin") == 0)
     {
         value = 1;
     }
-    if(strcmp(word, "atan") == 0)
+    if (strcmp(word, "atan") == 0)
     {
         value = 1;
     }
-    if(strcmp(word, "ceil") == 0)
+    if (strcmp(word, "ceil") == 0)
     {
         value = 1;
     }
-    if(strcmp(word, "cos") == 0)
+    if (strcmp(word, "cos") == 0)
     {
         value = 1;
     }
-    if(strcmp(word, "cosh") == 0)
+    if (strcmp(word, "cosh") == 0)
     {
         value = 1;
     }
-    if(strcmp(word, "exp") == 0)
+    if (strcmp(word, "exp") == 0)
     {
         value = 1;
     }
-    if(strcmp(word, "fabs") == 0)
+    if (strcmp(word, "fabs") == 0)
     {
         value = 1;
     }
-    if(strcmp(word, "floor") == 0)
+    if (strcmp(word, "floor") == 0)
     {
         value = 1;
     }
-    if(strcmp(word, "imedian") == 0)
+    if (strcmp(word, "imedian") == 0)
     {
         value = 1;
     }
-    if(strcmp(word, "itot") == 0)
+    if (strcmp(word, "itot") == 0)
     {
         value = 1;
     }
-    if(strcmp(word, "imean") == 0)
+    if (strcmp(word, "imean") == 0)
     {
         value = 1;
     }
-    if(strcmp(word, "imin") == 0)
+    if (strcmp(word, "imin") == 0)
     {
         value = 1;
     }
-    if(strcmp(word, "imax") == 0)
+    if (strcmp(word, "imax") == 0)
     {
         value = 1;
     }
-    if(strcmp(word, "ln") == 0)
+    if (strcmp(word, "ln") == 0)
     {
         value = 1;
     }
-    if(strcmp(word, "log") == 0)
+    if (strcmp(word, "log") == 0)
     {
         value = 1;
     }
-    if(strcmp(word, "sqrt") == 0)
+    if (strcmp(word, "sqrt") == 0)
     {
         value = 1;
     }
-    if(strcmp(word, "sin") == 0)
+    if (strcmp(word, "sin") == 0)
     {
         value = 1;
     }
-    if(strcmp(word, "sinh") == 0)
+    if (strcmp(word, "sinh") == 0)
     {
         value = 1;
     }
-    if(strcmp(word, "tan") == 0)
+    if (strcmp(word, "tan") == 0)
     {
         value = 1;
     }
-    if(strcmp(word, "tanh") == 0)
+    if (strcmp(word, "tanh") == 0)
     {
         value = 1;
     }
-    if(strcmp(word, "posi") == 0)
+    if (strcmp(word, "posi") == 0)
     {
         value = 1;
     }
-    if(strcmp(word, "imdx") == 0)
+    if (strcmp(word, "imdx") == 0)
     {
         value = 1;
     }
-    if(strcmp(word, "imdy") == 0)
+    if (strcmp(word, "imdy") == 0)
     {
         value = 1;
     }
 
-
     /*  if (!strcmp(word,"pow"))
         value = 1;
       if (!strcmp(word,"max"))
@@ -181,49 +175,45 @@ int isfunction(const char *word)
       if (!strcmp(word,"median"))
         value = 1;
     */
-    return(value);
+    return (value);
 }
 
-
-
 int isfunction_sev_var(const char *word)
 {
     int value = 0; /* number of input variables */
 
-    if(strcmp(word, "fmod") == 0)
+    if (strcmp(word, "fmod") == 0)
     {
         value = 2;
     }
-    if(strcmp(word, "trunc") == 0)
+    if (strcmp(word, "trunc") == 0)
     {
         value = 3;
     }
-    if(strcmp(word, "perc") == 0)
+    if (strcmp(word, "perc") == 0)
     {
         value = 2;
     }
-    if(strcmp(word, "min") == 0)
+    if (strcmp(word, "min") == 0)
     {
         value = 2;
     }
-    if(strcmp(word, "max") == 0)
+    if (strcmp(word, "max") == 0)
     {
         value = 2;
     }
-    if(strcmp(word, "testlt") == 0)
+    if (strcmp(word, "testlt") == 0)
     {
         value = 2;
     }
-    if(strcmp(word, "testmt") == 0)
+    if (strcmp(word, "testmt") == 0)
     {
         value = 2;
     }
 
-
-    return(value);
+    return (value);
 }
 
-
 int isanumber(const char *word)
 {
     DEBUG_TRACE_FSTART();
@@ -233,7 +223,7 @@ int isanumber(const char *word)
     __attribute__((unused)) double v1;
 
     v1 = strtod(word, &endptr);
-    if((long)(endptr - word) == (long) strlen(word))
+    if ((long)(endptr - word) == (long)strlen(word))
     {
         value = 1;
     }
@@ -243,19 +233,10 @@ int isanumber(const char *word)
     }
 
     DEBUG_TRACE_FEXIT();
-    return(value);
+    return (value);
 }
 
-
-
-
-imageID arith_make_slopexy(
-    const char *ID_name,
-    long l1,
-    long l2,
-    double sx,
-    double sy
-)
+imageID arith_make_slopexy(const char *ID_name, long l1, long l2, double sx, double sy)
 {
     DEBUG_TRACE_FSTART();
 
@@ -263,15 +244,14 @@ imageID arith_make_slopexy(
     uint32_t naxes[2];
     double coeff;
 
-
     create_2Dimage_ID(ID_name, l1, l2, &ID);
     naxes[0] = data.image[ID].md[0].size[0];
     naxes[1] = data.image[ID].md[0].size[1];
 
     coeff = sx * (naxes[0] / 2) + sy * (naxes[1] / 2);
 
-    for(uint32_t jj = 0; jj < naxes[1]; jj++)
-        for(uint32_t ii = 0; ii < naxes[0]; ii++)
+    for (uint32_t jj = 0; jj < naxes[1]; jj++)
+        for (uint32_t ii = 0; ii < naxes[0]; ii++)
         {
             data.image[ID].array.F[jj * naxes[0] + ii] = sx * ii + sy * jj - coeff;
         }
@@ -280,12 +260,6 @@ imageID arith_make_slopexy(
     return ID;
 }
 
-
-
-
-
-
-
 /*^-----------------------------------------------------------------------------
 | int
 | execute_arith :
@@ -317,7 +291,6 @@ int execute_arith(const char *cmd1)
     int parlevel;
     int intr_priority[100]; /* 0 (+,-)  1 (*,/)  2 (functions) */
 
-
     int found_word_type;
     int highest_parlevel;
     int highest_intr_priority;
@@ -339,16 +312,13 @@ int execute_arith(const char *cmd1)
     //  if( Debug > 0 )   fprintf(stdout, "[execute_arith]\n");
     //  if( Debug > 0 )   fprintf(stdout, "[execute_arith] str: [%s]\n", cmd1);
 
-    for(int i = 0; i < 100; i++)
+    for (int i = 0; i < 100; i++)
     {
         word_type[i] = 0;
         par_level[i] = 0;
         intr_priority[i] = 0;
     }
 
-
-
-
     /*
        Pre-process string:
        - remove any spaces in cmd1
@@ -356,22 +326,22 @@ int execute_arith(const char *cmd1)
        copy result into cmd */
     j = 0;
 
-    for(int i = 0; i < (int)(strlen(cmd1)); i++)
+    for (int i = 0; i < (int)(strlen(cmd1)); i++)
     {
-        if((cmd1[i] == '=') && (cmd1[i + 1] == '-'))
+        if ((cmd1[i] == '=') && (cmd1[i + 1] == '-'))
         {
             cmd[j] = '=';
             j++;
             cmd[j] = '0';
             j++;
         }
-        else if((cmd1[i] == '=') && (cmd1[i + 1] == '+'))
+        else if ((cmd1[i] == '=') && (cmd1[i + 1] == '+'))
         {
             cmd[j] = '=';
             j++;
             i++;
         }
-        else if(cmd1[i] != ' ')
+        else if (cmd1[i] != ' ')
         {
             cmd[j] = cmd1[i];
             j++;
@@ -380,8 +350,6 @@ int execute_arith(const char *cmd1)
     cmd[j] = '\0';
     //  if( Debug > 0 )   fprintf(stdout, "[execute_arith] preprocessed str %s -> %s\n", cmd1, cmd);
 
-
-
     /*
     * cmd is first broken into words.
     * The spacing between words is operands (+,-,/,*), equal (=),
@@ -389,15 +357,14 @@ int execute_arith(const char *cmd1)
     */
     w = 0;
     l = 0;
-    for(int i = 0; i < (signed) strlen(cmd); i++)
+    for (int i = 0; i < (signed)strlen(cmd); i++)
     {
-        switch(cmd[i])
+        switch (cmd[i])
         {
 
         case '+':
         case '-':
-            if(((cmd[i - 1] == 'e') || (cmd[i - 1] == 'E')) && (isdigit(cmd[i - 2]))
-                    && (isdigit(cmd[i + 1])))
+            if (((cmd[i - 1] == 'e') || (cmd[i - 1] == 'E')) && (isdigit(cmd[i - 2])) && (isdigit(cmd[i + 1])))
             {
                 // + or - is part of exponent
                 word[w][l] = cmd[i];
@@ -405,7 +372,7 @@ int execute_arith(const char *cmd1)
             }
             else
             {
-                if(l > 0)
+                if (l > 0)
                 {
                     word[w][l] = '\0';
                     w++;
@@ -413,7 +380,7 @@ int execute_arith(const char *cmd1)
                 l = 0;
                 word[w][l] = cmd[i];
                 word[w][1] = '\0';
-                if(i < (signed)(strlen(cmd) - 1))
+                if (i < (signed)(strlen(cmd) - 1))
                 {
                     w++;
                 }
@@ -428,7 +395,7 @@ int execute_arith(const char *cmd1)
         case ')':
         case '=':
         case ',':
-            if(l > 0)
+            if (l > 0)
             {
                 word[w][l] = '\0';
                 w++;
@@ -436,7 +403,7 @@ int execute_arith(const char *cmd1)
             l = 0;
             word[w][l] = cmd[i];
             word[w][1] = '\0';
-            if(i < (signed)(strlen(cmd) - 1))
+            if (i < (signed)(strlen(cmd) - 1))
             {
                 w++;
             }
@@ -460,155 +427,140 @@ int execute_arith(const char *cmd1)
         }
     }
 
-
-    if(l > 0)
+    if (l > 0)
     {
         word[w][l] = '\0';
     }
     nbword = w + 1;
 
-
     //  printf("number of words is %d\n",nbword);
 
-    for(int i = 0; i < nbword; i++)
+    for (int i = 0; i < nbword; i++)
     {
-        if(Debug > 0)
+        if (Debug > 0)
         {
             printf("TESTING WORD %d = %s\n", i, word[i]);
         }
         word_type[i] = ARITHTOKENTYPE_UNKNOWN;
         found_word_type = 0;
-        if((isanumber(word[i]) == 1) && (found_word_type == 0))
+        if ((isanumber(word[i]) == 1) && (found_word_type == 0))
         {
             word_type[i] = ARITHTOKENTYPE_NUMBER;
             found_word_type = 1;
         }
-        if((isfunction(word[i]) == 1) && (found_word_type == 0))
+        if ((isfunction(word[i]) == 1) && (found_word_type == 0))
         {
             word_type[i] = ARITHTOKENTYPE_FUNCTION;
             found_word_type = 1;
         }
-        if((isfunction_sev_var(word[i]) != 0) && (found_word_type == 0))
+        if ((isfunction_sev_var(word[i]) != 0) && (found_word_type == 0))
         {
             word_type[i] = ARITHTOKENTYPE_MULTFUNC;
             found_word_type = 1;
         }
-        if((isoperand(word[i]) == 1) && (found_word_type == 0))
+        if ((isoperand(word[i]) == 1) && (found_word_type == 0))
         {
             word_type[i] = ARITHTOKENTYPE_OPERAND;
             found_word_type = 1;
         }
-        if((strcmp(word[i], "=") == 0) && (found_word_type == 0))
+        if ((strcmp(word[i], "=") == 0) && (found_word_type == 0))
         {
             word_type[i] = ARITHTOKENTYPE_EQUAL;
             found_word_type = 1;
         }
-        if((strcmp(word[i], ",") == 0) && (found_word_type == 0))
+        if ((strcmp(word[i], ",") == 0) && (found_word_type == 0))
         {
             word_type[i] = ARITHTOKENTYPE_COMA;
             found_word_type = 1;
         }
-        if((i < nbword - 1) && (found_word_type == 0))
+        if ((i < nbword - 1) && (found_word_type == 0))
         {
-            if((strcmp(word[i + 1], "(") == 0) && (isfunction(word[i]) == 1))
+            if ((strcmp(word[i + 1], "(") == 0) && (isfunction(word[i]) == 1))
             {
                 word_type[i] = ARITHTOKENTYPE_FUNCTION;
                 found_word_type = 1;
             }
         }
-        if((strcmp(word[i], "(") == 0) && (found_word_type == 0))
+        if ((strcmp(word[i], "(") == 0) && (found_word_type == 0))
         {
             word_type[i] = ARITHTOKENTYPE_OPENPAR;
             found_word_type = 1;
         }
-        if((strcmp(word[i], ")") == 0) && (found_word_type == 0))
+        if ((strcmp(word[i], ")") == 0) && (found_word_type == 0))
         {
             word_type[i] = ARITHTOKENTYPE_CLOSEPAR;
             found_word_type = 1;
         }
-        if((variable_ID(word[i]) != -1) && (found_word_type == 0))
+        if ((variable_ID(word[i]) != -1) && (found_word_type == 0))
         {
             word_type[i] = ARITHTOKENTYPE_VARIABLE;
             found_word_type = 1;
         }
-        if((image_ID(word[i]) != -1) && (found_word_type == 0))
+        if ((image_ID(word[i]) != -1) && (found_word_type == 0))
         {
             word_type[i] = ARITHTOKENTYPE_IMAGE;
             found_word_type = 1;
         }
-        if(found_word_type == 0)
+        if (found_word_type == 0)
         {
             word_type[i] = ARITHTOKENTYPE_NOTEXIST;
         }
-        if(Debug > 0)
+        if (Debug > 0)
         {
             printf("word %d is  \"%s\" word type is %d\n", i, word[i], word_type[i]);
         }
     }
 
-
-
-
-
-
-
-
-
     /* checks for obvious errors */
 
     passedequ = 0;
-    for(int i = (nbword - 1); i > -1; i--)
+    for (int i = (nbword - 1); i > -1; i--)
     {
-        if(passedequ == 1)
+        if (passedequ == 1)
         {
-            if(word_type[i] == ARITHTOKENTYPE_EQUAL)
+            if (word_type[i] == ARITHTOKENTYPE_EQUAL)
             {
                 PRINT_WARNING("line has multiple \"=\"");
                 OKea = 0;
             }
-            if(word_type[i] == ARITHTOKENTYPE_OPERAND)
+            if (word_type[i] == ARITHTOKENTYPE_OPERAND)
             {
                 PRINT_WARNING("operand on left side of \"=\"");
                 OKea = 0;
             }
-            if(word_type[i] == ARITHTOKENTYPE_OPENPAR)
+            if (word_type[i] == ARITHTOKENTYPE_OPENPAR)
             {
                 PRINT_WARNING("\"(\" on left side of \"=\"");
                 OKea = 0;
             }
-            if(word_type[i] == ARITHTOKENTYPE_CLOSEPAR)
+            if (word_type[i] == ARITHTOKENTYPE_CLOSEPAR)
             {
                 PRINT_WARNING("\")\" on left side of \"=\"");
                 OKea = 0;
             }
         }
-        if(word_type[i] == ARITHTOKENTYPE_EQUAL)
+        if (word_type[i] == ARITHTOKENTYPE_EQUAL)
         {
             passedequ = 1;
         }
-        if((passedequ == 0)
-                && (word_type[i] ==
-                    ARITHTOKENTYPE_NOTEXIST)) /* non-existing variable or image as input */
+        if ((passedequ == 0) && (word_type[i] == ARITHTOKENTYPE_NOTEXIST)) /* non-existing variable or image as input */
         {
             PRINT_WARNING("%s is a non-existing variable or image", word[i]);
             OKea = 0;
         }
     }
 
-    for(int i = 0; i < nbword - 1; i++)
+    for (int i = 0; i < nbword - 1; i++)
     {
-        if((word_type[i] == ARITHTOKENTYPE_OPERAND)
-                && (word_type[i + 1] == ARITHTOKENTYPE_OPERAND))
+        if ((word_type[i] == ARITHTOKENTYPE_OPERAND) && (word_type[i + 1] == ARITHTOKENTYPE_OPERAND))
         {
             PRINT_WARNING("consecutive operands");
             OKea = 0;
         }
-        if((word_type[i + 1] == ARITHTOKENTYPE_OPENPAR)
-                && (!((word_type[i] == ARITHTOKENTYPE_OPENPAR)
-                      || (word_type[i] == ARITHTOKENTYPE_FUNCTION)
-                      || (word_type[i] == ARITHTOKENTYPE_MULTFUNC)
-                      || (word_type[i] == ARITHTOKENTYPE_EQUAL)
-                      || (word_type[i] == ARITHTOKENTYPE_OPERAND))))
+        if ((word_type[i + 1] == ARITHTOKENTYPE_OPENPAR) &&
+            (!((word_type[i] == ARITHTOKENTYPE_OPENPAR) || (word_type[i] == ARITHTOKENTYPE_FUNCTION) ||
+               (word_type[i] == ARITHTOKENTYPE_MULTFUNC) || (word_type[i] == ARITHTOKENTYPE_EQUAL) ||
+               (word_type[i] == ARITHTOKENTYPE_OPERAND))))
         {
             PRINT_WARNING("\"(\" should be preceeded by \"=\", \"(\", operand or function");
             OKea = 0;
@@ -616,39 +568,37 @@ int execute_arith(const char *cmd1)
     }
 
     cntP = 0;
-    for(int i = 0; i < nbword; i++)
+    for (int i = 0; i < nbword; i++)
     {
-        if(word_type[i] == ARITHTOKENTYPE_OPENPAR)
+        if (word_type[i] == ARITHTOKENTYPE_OPENPAR)
         {
-            cntP ++;
+            cntP++;
         }
-        if(word_type[i] == ARITHTOKENTYPE_CLOSEPAR)
+        if (word_type[i] == ARITHTOKENTYPE_CLOSEPAR)
         {
-            cntP --;
+            cntP--;
         }
-        if(cntP < 0)
+        if (cntP < 0)
         {
             PRINT_WARNING("parentheses error");
             OKea = 0;
         }
     }
-    if(cntP != 0)
+    if (cntP != 0)
     {
         PRINT_WARNING("parentheses error");
         OKea = 0;
     }
 
-
-
-    if(OKea == 1)
+    if (OKea == 1)
     {
         /* numbers are saved into variables */
         tmp_name_index = 0;
-        for(int i = 0; i < nbword; i++)
+        for (int i = 0; i < nbword; i++)
         {
-            if(word_type[i] == ARITHTOKENTYPE_NUMBER)
+            if (word_type[i] == ARITHTOKENTYPE_NUMBER)
             {
-                CREATE_IMAGENAME(name, "_tmp%d_%d", tmp_name_index, (int) getpid());
+                CREATE_IMAGENAME(name, "_tmp%d_%d", tmp_name_index, (int)getpid());
 
                 create_variable_ID(name, 1.0 * strtod(word[i], NULL));
                 strcpy(word[i], name);
@@ -660,30 +610,29 @@ int execute_arith(const char *cmd1)
         /* computing the number of to-be-processed words */
         passedequ = 0;
         nb_tbp_word = 0;
-        for(int i = (nbword - 1); i > -1; i--)
+        for (int i = (nbword - 1); i > -1; i--)
         {
-            if(word_type[i] == ARITHTOKENTYPE_EQUAL)
+            if (word_type[i] == ARITHTOKENTYPE_EQUAL)
             {
                 passedequ = 1;
             }
-            if(passedequ == 0)
+            if (passedequ == 0)
             {
                 nb_tbp_word++;
             }
         }
 
         /* main loop starts here */
-        while(nb_tbp_word > 1)
+        while (nb_tbp_word > 1)
         {
             /* non necessary braces are removed
              */
-            for(int i = 0; i < nbword - 2; i++)
-                if((word_type[i] == ARITHTOKENTYPE_OPENPAR)
-                        && (word_type[i + 2] == ARITHTOKENTYPE_CLOSEPAR))
+            for (int i = 0; i < nbword - 2; i++)
+                if ((word_type[i] == ARITHTOKENTYPE_OPENPAR) && (word_type[i + 2] == ARITHTOKENTYPE_CLOSEPAR))
                 {
                     strcpy(word[i], word[i + 1]);
                     word_type[i] = word_type[i + 1];
-                    for(j = i + 1; j < nbword - 2; j++)
+                    for (j = i + 1; j < nbword - 2; j++)
                     {
                         strcpy(word[j], word[j + 2]);
                         word_type[j] = word_type[j + 2];
@@ -691,16 +640,14 @@ int execute_arith(const char *cmd1)
                     nbword = nbword - 2;
                 }
 
-            for(int i = 0; i < nbword - 3; i++)
-                if((word_type[i] == ARITHTOKENTYPE_OPENPAR)
-                        && (word_type[i + 3] == ARITHTOKENTYPE_CLOSEPAR)
-                        && (strcmp(word[i + 1], "-") == 0))
+            for (int i = 0; i < nbword - 3; i++)
+                if ((word_type[i] == ARITHTOKENTYPE_OPENPAR) && (word_type[i + 3] == ARITHTOKENTYPE_CLOSEPAR) &&
+                    (strcmp(word[i + 1], "-") == 0))
                 {
-                    data.variable[variable_ID(word[i + 2])].value.f = -data.variable[variable_ID(
-                                word[i + 2])].value.f;
+                    data.variable[variable_ID(word[i + 2])].value.f = -data.variable[variable_ID(word[i + 2])].value.f;
                     strcpy(word[i], word[i + 2]);
                     word_type[i] = word_type[i + 2];
-                    for(j = i + 2; j < nbword - 3; j++)
+                    for (j = i + 2; j < nbword - 3; j++)
                     {
                         strcpy(word[j], word[j + 3]);
                         word_type[j] = word_type[j + 3];
@@ -711,34 +658,34 @@ int execute_arith(const char *cmd1)
             /* now the priorities are given */
 
             parlevel = 0;
-            for(int i = 0; i < nbword; i++)
+            for (int i = 0; i < nbword; i++)
             {
-                if(word_type[i] == ARITHTOKENTYPE_OPENPAR)
+                if (word_type[i] == ARITHTOKENTYPE_OPENPAR)
                 {
                     parlevel++;
                 }
-                if(word_type[i] == ARITHTOKENTYPE_CLOSEPAR)
+                if (word_type[i] == ARITHTOKENTYPE_CLOSEPAR)
                 {
                     parlevel--;
                 }
-                if((word_type[i] == 4) || (word_type[i] == 8) || (word_type[i] == 11))
+                if ((word_type[i] == 4) || (word_type[i] == 8) || (word_type[i] == 11))
                 {
                     par_level[i] = parlevel;
-                    if(word_type[i] == ARITHTOKENTYPE_FUNCTION)
+                    if (word_type[i] == ARITHTOKENTYPE_FUNCTION)
                     {
                         intr_priority[i] = 2;
                     }
-                    if(word_type[i] == ARITHTOKENTYPE_MULTFUNC)
+                    if (word_type[i] == ARITHTOKENTYPE_MULTFUNC)
                     {
                         intr_priority[i] = 2;
                     }
-                    if(word_type[i] == ARITHTOKENTYPE_OPERAND)
+                    if (word_type[i] == ARITHTOKENTYPE_OPERAND)
                     {
-                        if((strcmp(word[i], "+") == 0) || (strcmp(word[i], "-") == 0))
+                        if ((strcmp(word[i], "+") == 0) || (strcmp(word[i], "-") == 0))
                         {
                             intr_priority[i] = 0;
                         }
-                        if((strcmp(word[i], "*") == 0) || (strcmp(word[i], "/") == 0))
+                        if ((strcmp(word[i], "*") == 0) || (strcmp(word[i], "/") == 0))
                         {
                             intr_priority[i] = 1;
                         }
@@ -751,14 +698,13 @@ int execute_arith(const char *cmd1)
             highest_intr_priority = -1;
             highest_priority_index = -1;
 
-            for(int i = 0; i < nbword; i++)
+            for (int i = 0; i < nbword; i++)
             {
-                if((word_type[i] == ARITHTOKENTYPE_OPERAND)
-                        || (word_type[i] == ARITHTOKENTYPE_FUNCTION)
-                        || (word_type[i] == ARITHTOKENTYPE_MULTFUNC))
+                if ((word_type[i] == ARITHTOKENTYPE_OPERAND) || (word_type[i] == ARITHTOKENTYPE_FUNCTION) ||
+                    (word_type[i] == ARITHTOKENTYPE_MULTFUNC))
                 {
                     /*printf("operation \"%s\" (%d,%d)\n",word[i],par_level[i],intr_priority[i]);*/
-                    if(par_level[i] > highest_parlevel)
+                    if (par_level[i] > highest_parlevel)
                     {
                         highest_priority_index = i;
                         highest_parlevel = par_level[i];
@@ -766,8 +712,7 @@ int execute_arith(const char *cmd1)
                     }
                     else
                     {
-                        if((par_level[i] == highest_parlevel)
-                                && (intr_priority[i] > highest_intr_priority))
+                        if ((par_level[i] == highest_parlevel) && (intr_priority[i] > highest_intr_priority))
                         {
                             highest_priority_index = i;
                             highest_intr_priority = intr_priority[i];
@@ -778,8 +723,6 @@ int execute_arith(const char *cmd1)
 
             /*      printf("executing operation  %s\n",word[highest_priority_index]);*/
 
-
-
             /*      printf("before : ");
               for (j=0;j<nbword;j++)
               {
@@ -792,223 +735,209 @@ int execute_arith(const char *cmd1)
               }
               printf("\n");
             */
-            if(word_type[highest_priority_index] == ARITHTOKENTYPE_OPERAND)
+            if (word_type[highest_priority_index] == ARITHTOKENTYPE_OPERAND)
             {
                 // name of image/variable where output is written
-                CREATE_IMAGENAME(name, "_tmp%d_%d", tmp_name_index, (int) getpid());
+                CREATE_IMAGENAME(name, "_tmp%d_%d", tmp_name_index, (int)getpid());
 
-                if(strcmp(word[highest_priority_index], "+") == 0)
+                if (strcmp(word[highest_priority_index], "+") == 0)
                 {
-                    if((word_type[highest_priority_index - 1] == ARITHTOKENTYPE_VARIABLE)
-                            && (word_type[highest_priority_index + 1] == ARITHTOKENTYPE_VARIABLE))
+                    if ((word_type[highest_priority_index - 1] == ARITHTOKENTYPE_VARIABLE) &&
+                        (word_type[highest_priority_index + 1] == ARITHTOKENTYPE_VARIABLE))
                     {
-                        tmp_prec = data.variable[variable_ID(word[highest_priority_index - 1])].value.f
-                                   +
+                        tmp_prec = data.variable[variable_ID(word[highest_priority_index - 1])].value.f +
                                    data.variable[variable_ID(word[highest_priority_index + 1])].value.f;
                         create_variable_ID(name, tmp_prec);
                         tmp_name_index++;
                         type = 2;
                     }
-                    if((word_type[highest_priority_index - 1] == ARITHTOKENTYPE_VARIABLE)
-                            && (word_type[highest_priority_index + 1] == ARITHTOKENTYPE_IMAGE))
+                    if ((word_type[highest_priority_index - 1] == ARITHTOKENTYPE_VARIABLE) &&
+                        (word_type[highest_priority_index + 1] == ARITHTOKENTYPE_IMAGE))
                     {
                         arith_image_cstadd(word[highest_priority_index + 1],
-                                           (double) data.variable[variable_ID(word[highest_priority_index - 1])].value.f,
+                                           (double)data.variable[variable_ID(word[highest_priority_index - 1])].value.f,
                                            name);
                         tmp_name_index++;
                         type = ARITHTOKENTYPE_IMAGE;
                     }
-                    if((word_type[highest_priority_index - 1] == ARITHTOKENTYPE_IMAGE)
-                            && (word_type[highest_priority_index + 1] == ARITHTOKENTYPE_VARIABLE))
+                    if ((word_type[highest_priority_index - 1] == ARITHTOKENTYPE_IMAGE) &&
+                        (word_type[highest_priority_index + 1] == ARITHTOKENTYPE_VARIABLE))
                     {
                         arith_image_cstadd(word[highest_priority_index - 1],
-                                           (double) data.variable[variable_ID(word[highest_priority_index + 1])].value.f,
+                                           (double)data.variable[variable_ID(word[highest_priority_index + 1])].value.f,
                                            name);
                         tmp_name_index++;
                         type = ARITHTOKENTYPE_IMAGE;
                     }
-                    if((word_type[highest_priority_index - 1] == ARITHTOKENTYPE_IMAGE)
-                            && (word_type[highest_priority_index + 1] == ARITHTOKENTYPE_IMAGE))
+                    if ((word_type[highest_priority_index - 1] == ARITHTOKENTYPE_IMAGE) &&
+                        (word_type[highest_priority_index + 1] == ARITHTOKENTYPE_IMAGE))
                     {
-                        arith_image_add(word[highest_priority_index - 1],
-                                        word[highest_priority_index + 1], name);
+                        arith_image_add(word[highest_priority_index - 1], word[highest_priority_index + 1], name);
                         tmp_name_index++;
                         type = ARITHTOKENTYPE_IMAGE;
                     }
                 }
 
-                if(strcmp(word[highest_priority_index], "-") == 0)
+                if (strcmp(word[highest_priority_index], "-") == 0)
                 {
-                    if((word_type[highest_priority_index - 1] == ARITHTOKENTYPE_VARIABLE)
-                            && (word_type[highest_priority_index + 1] == ARITHTOKENTYPE_VARIABLE))
+                    if ((word_type[highest_priority_index - 1] == ARITHTOKENTYPE_VARIABLE) &&
+                        (word_type[highest_priority_index + 1] == ARITHTOKENTYPE_VARIABLE))
                     {
-                        tmp_prec = data.variable[variable_ID(word[highest_priority_index - 1])].value.f
-                                   -
+                        tmp_prec = data.variable[variable_ID(word[highest_priority_index - 1])].value.f -
                                    data.variable[variable_ID(word[highest_priority_index + 1])].value.f;
                         create_variable_ID(name, tmp_prec);
                         tmp_name_index++;
                         type = ARITHTOKENTYPE_VARIABLE;
                     }
-                    if((word_type[highest_priority_index - 1] == ARITHTOKENTYPE_VARIABLE)
-                            && (word_type[highest_priority_index + 1] == ARITHTOKENTYPE_IMAGE))
+                    if ((word_type[highest_priority_index - 1] == ARITHTOKENTYPE_VARIABLE) &&
+                        (word_type[highest_priority_index + 1] == ARITHTOKENTYPE_IMAGE))
                     {
-                        CREATE_IMAGENAME(name1, "_tmp1%d_%d", tmp_name_index, (int) getpid());
+                        CREATE_IMAGENAME(name1, "_tmp1%d_%d", tmp_name_index, (int)getpid());
                         arith_image_cstsub(word[highest_priority_index + 1],
-                                           (double) data.variable[variable_ID(word[highest_priority_index - 1])].value.f,
+                                           (double)data.variable[variable_ID(word[highest_priority_index - 1])].value.f,
                                            name1);
-                        arith_image_cstmult(name1, (double) -1.0, name);
+                        arith_image_cstmult(name1, (double)-1.0, name);
                         delete_image_ID(name1, DELETE_IMAGE_ERRMODE_WARNING);
                         tmp_name_index++;
                         type = ARITHTOKENTYPE_IMAGE;
                     }
-                    if((word_type[highest_priority_index - 1] == ARITHTOKENTYPE_IMAGE)
-                            && (word_type[highest_priority_index + 1] == 2))
+                    if ((word_type[highest_priority_index - 1] == ARITHTOKENTYPE_IMAGE) &&
+                        (word_type[highest_priority_index + 1] == 2))
                     {
                         arith_image_cstsub(word[highest_priority_index - 1],
-                                           (double) data.variable[variable_ID(word[highest_priority_index + 1])].value.f,
+                                           (double)data.variable[variable_ID(word[highest_priority_index + 1])].value.f,
                                            name);
                         tmp_name_index++;
                         type = ARITHTOKENTYPE_IMAGE;
                     }
-                    if((word_type[highest_priority_index - 1] == ARITHTOKENTYPE_IMAGE)
-                            && (word_type[highest_priority_index + 1] == ARITHTOKENTYPE_IMAGE))
+                    if ((word_type[highest_priority_index - 1] == ARITHTOKENTYPE_IMAGE) &&
+                        (word_type[highest_priority_index + 1] == ARITHTOKENTYPE_IMAGE))
                     {
-                        arith_image_sub(word[highest_priority_index - 1],
-                                        word[highest_priority_index + 1], name);
+                        arith_image_sub(word[highest_priority_index - 1], word[highest_priority_index + 1], name);
                         tmp_name_index++;
                         type = ARITHTOKENTYPE_IMAGE;
                     }
                 }
 
-                if(strcmp(word[highest_priority_index], "*") == 0)
+                if (strcmp(word[highest_priority_index], "*") == 0)
                 {
-                    if((word_type[highest_priority_index - 1] == ARITHTOKENTYPE_VARIABLE)
-                            && (word_type[highest_priority_index + 1] == ARITHTOKENTYPE_VARIABLE))
+                    if ((word_type[highest_priority_index - 1] == ARITHTOKENTYPE_VARIABLE) &&
+                        (word_type[highest_priority_index + 1] == ARITHTOKENTYPE_VARIABLE))
                     {
-                        tmp_prec = data.variable[variable_ID(word[highest_priority_index - 1])].value.f
-                                   *
+                        tmp_prec = data.variable[variable_ID(word[highest_priority_index - 1])].value.f *
                                    data.variable[variable_ID(word[highest_priority_index + 1])].value.f;
                         create_variable_ID(name, tmp_prec);
                         tmp_name_index++;
                         type = ARITHTOKENTYPE_VARIABLE;
                     }
-                    if((word_type[highest_priority_index - 1] == ARITHTOKENTYPE_VARIABLE)
-                            && (word_type[highest_priority_index + 1] == ARITHTOKENTYPE_IMAGE))
+                    if ((word_type[highest_priority_index - 1] == ARITHTOKENTYPE_VARIABLE) &&
+                        (word_type[highest_priority_index + 1] == ARITHTOKENTYPE_IMAGE))
                     {
-                        arith_image_cstmult(word[highest_priority_index + 1],
-                                            (double) data.variable[variable_ID(word[highest_priority_index - 1])].value.f,
-                                            name);
+                        arith_image_cstmult(
+                            word[highest_priority_index + 1],
+                            (double)data.variable[variable_ID(word[highest_priority_index - 1])].value.f, name);
                         tmp_name_index++;
                         type = ARITHTOKENTYPE_IMAGE;
                     }
-                    if((word_type[highest_priority_index - 1] == 10)
-                            && (word_type[highest_priority_index + 1] == 2))
+                    if ((word_type[highest_priority_index - 1] == 10) && (word_type[highest_priority_index + 1] == 2))
                     {
-                        arith_image_cstmult(word[highest_priority_index - 1],
-                                            (double) data.variable[variable_ID(word[highest_priority_index + 1])].value.f,
-                                            name);
+                        arith_image_cstmult(
+                            word[highest_priority_index - 1],
+                            (double)data.variable[variable_ID(word[highest_priority_index + 1])].value.f, name);
                         tmp_name_index++;
                         type = ARITHTOKENTYPE_IMAGE;
                     }
-                    if((word_type[highest_priority_index - 1] == 10)
-                            && (word_type[highest_priority_index + 1] == ARITHTOKENTYPE_IMAGE))
+                    if ((word_type[highest_priority_index - 1] == 10) &&
+                        (word_type[highest_priority_index + 1] == ARITHTOKENTYPE_IMAGE))
                     {
-                        arith_image_mult(word[highest_priority_index - 1],
-                                         word[highest_priority_index + 1], name);
+                        arith_image_mult(word[highest_priority_index - 1], word[highest_priority_index + 1], name);
                         tmp_name_index++;
                         type = ARITHTOKENTYPE_IMAGE;
                     }
                 }
 
-                if(strcmp(word[highest_priority_index], "/") == 0)
+                if (strcmp(word[highest_priority_index], "/") == 0)
                 {
-                    if((word_type[highest_priority_index - 1] == ARITHTOKENTYPE_VARIABLE)
-                            && (word_type[highest_priority_index + 1] == ARITHTOKENTYPE_VARIABLE))
+                    if ((word_type[highest_priority_index - 1] == ARITHTOKENTYPE_VARIABLE) &&
+                        (word_type[highest_priority_index + 1] == ARITHTOKENTYPE_VARIABLE))
                     {
-                        tmp_prec = data.variable[variable_ID(word[highest_priority_index -
-                                                                                                     1])].value.f /
+                        tmp_prec = data.variable[variable_ID(word[highest_priority_index - 1])].value.f /
                                    data.variable[variable_ID(word[highest_priority_index + 1])].value.f;
                         create_variable_ID(name, tmp_prec);
                         tmp_name_index++;
                         type = ARITHTOKENTYPE_VARIABLE;
                     }
-                    if((word_type[highest_priority_index - 1] == ARITHTOKENTYPE_VARIABLE)
-                            && (word_type[highest_priority_index + 1] == ARITHTOKENTYPE_IMAGE))
+                    if ((word_type[highest_priority_index - 1] == ARITHTOKENTYPE_VARIABLE) &&
+                        (word_type[highest_priority_index + 1] == ARITHTOKENTYPE_IMAGE))
                     {
                         //    printf("CASE 1\n");
-                        arith_image_cstdiv1(word[highest_priority_index + 1],
-                                            (double) data.variable[variable_ID(word[highest_priority_index - 1])].value.f,
-                                            name);
+                        arith_image_cstdiv1(
+                            word[highest_priority_index + 1],
+                            (double)data.variable[variable_ID(word[highest_priority_index - 1])].value.f, name);
                         tmp_name_index++;
                         type = ARITHTOKENTYPE_IMAGE;
                     }
-                    if((word_type[highest_priority_index - 1] == 10)
-                            && (word_type[highest_priority_index + 1] == 2))
+                    if ((word_type[highest_priority_index - 1] == 10) && (word_type[highest_priority_index + 1] == 2))
                     {
                         arith_image_cstdiv(word[highest_priority_index - 1],
-                                           (double) data.variable[variable_ID(word[highest_priority_index + 1])].value.f,
+                                           (double)data.variable[variable_ID(word[highest_priority_index + 1])].value.f,
                                            name);
                         tmp_name_index++;
                         type = ARITHTOKENTYPE_IMAGE;
                     }
-                    if((word_type[highest_priority_index - 1] == 10)
-                            && (word_type[highest_priority_index + 1] == ARITHTOKENTYPE_IMAGE))
+                    if ((word_type[highest_priority_index - 1] == 10) &&
+                        (word_type[highest_priority_index + 1] == ARITHTOKENTYPE_IMAGE))
                     {
-                        arith_image_div(word[highest_priority_index - 1],
-                                        word[highest_priority_index + 1], name);
+                        arith_image_div(word[highest_priority_index - 1], word[highest_priority_index + 1], name);
                         tmp_name_index++;
                         type = ARITHTOKENTYPE_IMAGE;
                     }
                 }
 
-                if(strcmp(word[highest_priority_index], "^") == 0)
+                if (strcmp(word[highest_priority_index], "^") == 0)
                 {
-                    if((word_type[highest_priority_index - 1] == 2)
-                            && (word_type[highest_priority_index + 1] == 2))
+                    if ((word_type[highest_priority_index - 1] == 2) && (word_type[highest_priority_index + 1] == 2))
                     {
-                        if(data.variable[variable_ID(word[highest_priority_index + 1])].value.f < 0)
+                        if (data.variable[variable_ID(word[highest_priority_index + 1])].value.f < 0)
                         {
-                            tmp_prec = pow(data.variable[variable_ID(word[highest_priority_index -
-                                                                                                 1])].value.f,
+                            tmp_prec = pow(data.variable[variable_ID(word[highest_priority_index - 1])].value.f,
                                            -data.variable[variable_ID(word[highest_priority_index + 1])].value.f);
                             tmp_prec = 1.0 / tmp_prec;
                         }
                         else
                         {
-                            tmp_prec = pow(data.variable[variable_ID(word[highest_priority_index -
-                                                                                                 1])].value.f,
+                            tmp_prec = pow(data.variable[variable_ID(word[highest_priority_index - 1])].value.f,
                                            data.variable[variable_ID(word[highest_priority_index + 1])].value.f);
                         }
                         create_variable_ID(name, tmp_prec);
                         tmp_name_index++;
                         type = ARITHTOKENTYPE_VARIABLE;
                     }
-                    if((word_type[highest_priority_index - 1] == 2)
-                            && (word_type[highest_priority_index + 1] == ARITHTOKENTYPE_IMAGE))
+                    if ((word_type[highest_priority_index - 1] == 2) &&
+                        (word_type[highest_priority_index + 1] == ARITHTOKENTYPE_IMAGE))
                     {
-                        CREATE_IMAGENAME(name1, "_tmp1%d_%d", tmp_name_index, (int) getpid());
+                        CREATE_IMAGENAME(name1, "_tmp1%d_%d", tmp_name_index, (int)getpid());
                         arith_image_cstadd(word[highest_priority_index + 1],
-                                           (double) data.variable[variable_ID(word[highest_priority_index - 1])].value.f,
+                                           (double)data.variable[variable_ID(word[highest_priority_index - 1])].value.f,
                                            name1);
                         arith_image_pow(name1, word[highest_priority_index + 1], name);
                         delete_image_ID(name1, DELETE_IMAGE_ERRMODE_WARNING);
                         tmp_name_index++;
                         type = ARITHTOKENTYPE_IMAGE;
                     }
-                    if((word_type[highest_priority_index - 1] == ARITHTOKENTYPE_IMAGE)
-                            && (word_type[highest_priority_index + 1] == ARITHTOKENTYPE_VARIABLE))
+                    if ((word_type[highest_priority_index - 1] == ARITHTOKENTYPE_IMAGE) &&
+                        (word_type[highest_priority_index + 1] == ARITHTOKENTYPE_VARIABLE))
                     {
                         arith_image_cstpow(word[highest_priority_index - 1],
-                                           (double) data.variable[variable_ID(word[highest_priority_index + 1])].value.f,
+                                           (double)data.variable[variable_ID(word[highest_priority_index + 1])].value.f,
                                            name);
                         tmp_name_index++;
                         type = ARITHTOKENTYPE_IMAGE;
                     }
-                    if((word_type[highest_priority_index - 1] == ARITHTOKENTYPE_IMAGE)
-                            && (word_type[highest_priority_index + 1] == ARITHTOKENTYPE_IMAGE))
+                    if ((word_type[highest_priority_index - 1] == ARITHTOKENTYPE_IMAGE) &&
+                        (word_type[highest_priority_index + 1] == ARITHTOKENTYPE_IMAGE))
                     {
-                        arith_image_pow(word[highest_priority_index - 1],
-                                        word[highest_priority_index + 1], name);
+                        arith_image_pow(word[highest_priority_index - 1], word[highest_priority_index + 1], name);
                         tmp_name_index++;
                         type = ARITHTOKENTYPE_IMAGE;
                     }
@@ -1016,7 +945,7 @@ int execute_arith(const char *cmd1)
 
                 strcpy(word[highest_priority_index - 1], name);
                 word_type[highest_priority_index - 1] = type;
-                for(j = highest_priority_index; j < nbword - 2; j++)
+                for (j = highest_priority_index; j < nbword - 2; j++)
                 {
                     strcpy(word[j], word[j + 2]);
                     word_type[j] = word_type[j + 2];
@@ -1024,23 +953,20 @@ int execute_arith(const char *cmd1)
                 nbword = nbword - 2;
             }
 
-
-
-            if(word_type[highest_priority_index] == 8)
+            if (word_type[highest_priority_index] == 8)
             {
-                CREATE_IMAGENAME(name, "_tmp%d_%d", tmp_name_index, (int) getpid());
+                CREATE_IMAGENAME(name, "_tmp%d_%d", tmp_name_index, (int)getpid());
 
-                if(strcmp(word[highest_priority_index], "acos") == 0)
+                if (strcmp(word[highest_priority_index], "acos") == 0)
                 {
-                    if(word_type[highest_priority_index + 1] == 2)
+                    if (word_type[highest_priority_index + 1] == 2)
                     {
-                        tmp_prec = acos(data.variable[variable_ID(word[highest_priority_index +
-                                                                                              1])].value.f);
+                        tmp_prec = acos(data.variable[variable_ID(word[highest_priority_index + 1])].value.f);
                         create_variable_ID(name, tmp_prec);
                         tmp_name_index++;
                         type = 2;
                     }
-                    if(word_type[highest_priority_index + 1] == ARITHTOKENTYPE_IMAGE)
+                    if (word_type[highest_priority_index + 1] == ARITHTOKENTYPE_IMAGE)
                     {
                         arith_image_acos(word[highest_priority_index + 1], name);
                         tmp_name_index++;
@@ -1048,17 +974,16 @@ int execute_arith(const char *cmd1)
                     }
                 }
 
-                if(strcmp(word[highest_priority_index], "asin") == 0)
+                if (strcmp(word[highest_priority_index], "asin") == 0)
                 {
-                    if(word_type[highest_priority_index + 1] == 2)
+                    if (word_type[highest_priority_index + 1] == 2)
                     {
-                        tmp_prec = asin(data.variable[variable_ID(word[highest_priority_index +
-                                                                                              1])].value.f);
+                        tmp_prec = asin(data.variable[variable_ID(word[highest_priority_index + 1])].value.f);
                         create_variable_ID(name, tmp_prec);
                         tmp_name_index++;
                         type = 2;
                     }
-                    if(word_type[highest_priority_index + 1] == ARITHTOKENTYPE_IMAGE)
+                    if (word_type[highest_priority_index + 1] == ARITHTOKENTYPE_IMAGE)
                     {
                         arith_image_asin(word[highest_priority_index + 1], name);
                         tmp_name_index++;
@@ -1066,17 +991,16 @@ int execute_arith(const char *cmd1)
                     }
                 }
 
-                if(strcmp(word[highest_priority_index], "atan") == 0)
+                if (strcmp(word[highest_priority_index], "atan") == 0)
                 {
-                    if(word_type[highest_priority_index + 1] == 2)
+                    if (word_type[highest_priority_index + 1] == 2)
                     {
-                        tmp_prec = atan(data.variable[variable_ID(word[highest_priority_index +
-                                                                                              1])].value.f);
+                        tmp_prec = atan(data.variable[variable_ID(word[highest_priority_index + 1])].value.f);
                         create_variable_ID(name, tmp_prec);
                         tmp_name_index++;
                         type = 2;
                     }
-                    if(word_type[highest_priority_index + 1] == ARITHTOKENTYPE_IMAGE)
+                    if (word_type[highest_priority_index + 1] == ARITHTOKENTYPE_IMAGE)
                     {
                         arith_image_atan(word[highest_priority_index + 1], name);
                         tmp_name_index++;
@@ -1084,17 +1008,16 @@ int execute_arith(const char *cmd1)
                     }
                 }
 
-                if(strcmp(word[highest_priority_index], "ceil") == 0)
+                if (strcmp(word[highest_priority_index], "ceil") == 0)
                 {
-                    if(word_type[highest_priority_index + 1] == 2)
+                    if (word_type[highest_priority_index + 1] == 2)
                     {
-                        tmp_prec = (double) ceil(data.variable[variable_ID(word[highest_priority_index +
-                                                                                                       1])].value.f);
+                        tmp_prec = (double)ceil(data.variable[variable_ID(word[highest_priority_index + 1])].value.f);
                         create_variable_ID(name, tmp_prec);
                         tmp_name_index++;
                         type = 2;
                     }
-                    if(word_type[highest_priority_index + 1] == ARITHTOKENTYPE_IMAGE)
+                    if (word_type[highest_priority_index + 1] == ARITHTOKENTYPE_IMAGE)
                     {
                         arith_image_ceil(word[highest_priority_index + 1], name);
                         tmp_name_index++;
@@ -1102,17 +1025,16 @@ int execute_arith(const char *cmd1)
                     }
                 }
 
-                if(strcmp(word[highest_priority_index], "cos") == 0)
+                if (strcmp(word[highest_priority_index], "cos") == 0)
                 {
-                    if(word_type[highest_priority_index + 1] == 2)
+                    if (word_type[highest_priority_index + 1] == 2)
                     {
-                        tmp_prec = cos(data.variable[variable_ID(word[highest_priority_index +
-                                                                                             1])].value.f);
+                        tmp_prec = cos(data.variable[variable_ID(word[highest_priority_index + 1])].value.f);
                         create_variable_ID(name, tmp_prec);
                         tmp_name_index++;
                         type = 2;
                     }
-                    if(word_type[highest_priority_index + 1] == ARITHTOKENTYPE_IMAGE)
+                    if (word_type[highest_priority_index + 1] == ARITHTOKENTYPE_IMAGE)
                     {
                         arith_image_cos(word[highest_priority_index + 1], name);
                         tmp_name_index++;
@@ -1120,17 +1042,16 @@ int execute_arith(const char *cmd1)
                     }
                 }
 
-                if(strcmp(word[highest_priority_index], "cosh") == 0)
+                if (strcmp(word[highest_priority_index], "cosh") == 0)
                 {
-                    if(word_type[highest_priority_index + 1] == 2)
+                    if (word_type[highest_priority_index + 1] == 2)
                     {
-                        tmp_prec = cosh(data.variable[variable_ID(word[highest_priority_index +
-                                                                                              1])].value.f);
+                        tmp_prec = cosh(data.variable[variable_ID(word[highest_priority_index + 1])].value.f);
                         create_variable_ID(name, tmp_prec);
                         tmp_name_index++;
                         type = 2;
                     }
-                    if(word_type[highest_priority_index + 1] == ARITHTOKENTYPE_IMAGE)
+                    if (word_type[highest_priority_index + 1] == ARITHTOKENTYPE_IMAGE)
                     {
                         arith_image_cosh(word[highest_priority_index + 1], name);
                         tmp_name_index++;
@@ -1138,17 +1059,16 @@ int execute_arith(const char *cmd1)
                     }
                 }
 
-                if(strcmp(word[highest_priority_index], "exp") == 0)
+                if (strcmp(word[highest_priority_index], "exp") == 0)
                 {
-                    if(word_type[highest_priority_index + 1] == 2)
+                    if (word_type[highest_priority_index + 1] == 2)
                     {
-                        tmp_prec = exp(data.variable[variable_ID(word[highest_priority_index +
-                                                                                             1])].value.f);
+                        tmp_prec = exp(data.variable[variable_ID(word[highest_priority_index + 1])].value.f);
                         create_variable_ID(name, tmp_prec);
                         tmp_name_index++;
                         type = 2;
                     }
-                    if(word_type[highest_priority_index + 1] == ARITHTOKENTYPE_IMAGE)
+                    if (word_type[highest_priority_index + 1] == ARITHTOKENTYPE_IMAGE)
                     {
                         arith_image_exp(word[highest_priority_index + 1], name);
                         tmp_name_index++;
@@ -1156,17 +1076,16 @@ int execute_arith(const char *cmd1)
                     }
                 }
 
-                if(strcmp(word[highest_priority_index], "fabs") == 0)
+                if (strcmp(word[highest_priority_index], "fabs") == 0)
                 {
-                    if(word_type[highest_priority_index + 1] == 2)
+                    if (word_type[highest_priority_index + 1] == 2)
                     {
-                        tmp_prec = fabs(data.variable[variable_ID(word[highest_priority_index +
-                                                                                              1])].value.f);
+                        tmp_prec = fabs(data.variable[variable_ID(word[highest_priority_index + 1])].value.f);
                         create_variable_ID(name, tmp_prec);
                         tmp_name_index++;
                         type = 2;
                     }
-                    if(word_type[highest_priority_index + 1] == ARITHTOKENTYPE_IMAGE)
+                    if (word_type[highest_priority_index + 1] == ARITHTOKENTYPE_IMAGE)
                     {
                         arith_image_fabs(word[highest_priority_index + 1], name);
                         tmp_name_index++;
@@ -1174,17 +1093,16 @@ int execute_arith(const char *cmd1)
                     }
                 }
 
-                if(strcmp(word[highest_priority_index], "floor") == 0)
+                if (strcmp(word[highest_priority_index], "floor") == 0)
                 {
-                    if(word_type[highest_priority_index + 1] == 2)
+                    if (word_type[highest_priority_index + 1] == 2)
                     {
-                        tmp_prec = floor(data.variable[variable_ID(word[highest_priority_index +
-                                                                                               1])].value.f);
+                        tmp_prec = floor(data.variable[variable_ID(word[highest_priority_index + 1])].value.f);
                         create_variable_ID(name, tmp_prec);
                         tmp_name_index++;
                         type = 2;
                     }
-                    if(word_type[highest_priority_index + 1] == ARITHTOKENTYPE_IMAGE)
+                    if (word_type[highest_priority_index + 1] == ARITHTOKENTYPE_IMAGE)
                     {
                         arith_image_floor(word[highest_priority_index + 1], name);
                         tmp_name_index++;
@@ -1192,9 +1110,9 @@ int execute_arith(const char *cmd1)
                     }
                 }
 
-                if(strcmp(word[highest_priority_index], "imedian") == 0)
+                if (strcmp(word[highest_priority_index], "imedian") == 0)
                 {
-                    if(word_type[highest_priority_index + 1] == ARITHTOKENTYPE_IMAGE)
+                    if (word_type[highest_priority_index + 1] == ARITHTOKENTYPE_IMAGE)
                     {
                         tmp_prec = arith_image_median(word[highest_priority_index + 1]);
                         create_variable_ID(name, tmp_prec);
@@ -1203,9 +1121,9 @@ int execute_arith(const char *cmd1)
                     }
                 }
 
-                if(strcmp(word[highest_priority_index], "itot") == 0)
+                if (strcmp(word[highest_priority_index], "itot") == 0)
                 {
-                    if(word_type[highest_priority_index + 1] == ARITHTOKENTYPE_IMAGE)
+                    if (word_type[highest_priority_index + 1] == ARITHTOKENTYPE_IMAGE)
                     {
                         tmp_prec = arith_image_total(word[highest_priority_index + 1]);
                         create_variable_ID(name, tmp_prec);
@@ -1214,9 +1132,9 @@ int execute_arith(const char *cmd1)
                     }
                 }
 
-                if(strcmp(word[highest_priority_index], "imean") == 0)
+                if (strcmp(word[highest_priority_index], "imean") == 0)
                 {
-                    if(word_type[highest_priority_index + 1] == ARITHTOKENTYPE_IMAGE)
+                    if (word_type[highest_priority_index + 1] == ARITHTOKENTYPE_IMAGE)
                     {
                         tmp_prec = arith_image_mean(word[highest_priority_index + 1]);
                         create_variable_ID(name, tmp_prec);
@@ -1225,9 +1143,9 @@ int execute_arith(const char *cmd1)
                     }
                 }
 
-                if(strcmp(word[highest_priority_index], "imin") == 0)
+                if (strcmp(word[highest_priority_index], "imin") == 0)
                 {
-                    if(word_type[highest_priority_index + 1] == ARITHTOKENTYPE_IMAGE)
+                    if (word_type[highest_priority_index + 1] == ARITHTOKENTYPE_IMAGE)
                     {
                         tmp_prec = arith_image_min(word[highest_priority_index + 1]);
                         create_variable_ID(name, tmp_prec);
@@ -1236,9 +1154,9 @@ int execute_arith(const char *cmd1)
                     }
                 }
 
-                if(strcmp(word[highest_priority_index], "imax") == 0)
+                if (strcmp(word[highest_priority_index], "imax") == 0)
                 {
-                    if(word_type[highest_priority_index + 1] == ARITHTOKENTYPE_IMAGE)
+                    if (word_type[highest_priority_index + 1] == ARITHTOKENTYPE_IMAGE)
                     {
                         tmp_prec = arith_image_max(word[highest_priority_index + 1]);
                         create_variable_ID(name, tmp_prec);
@@ -1247,17 +1165,16 @@ int execute_arith(const char *cmd1)
                     }
                 }
 
-                if(strcmp(word[highest_priority_index], "ln") == 0)
+                if (strcmp(word[highest_priority_index], "ln") == 0)
                 {
-                    if(word_type[highest_priority_index + 1] == 2)
+                    if (word_type[highest_priority_index + 1] == 2)
                     {
-                        tmp_prec = log(data.variable[variable_ID(word[highest_priority_index +
-                                                                                             1])].value.f);
+                        tmp_prec = log(data.variable[variable_ID(word[highest_priority_index + 1])].value.f);
                         create_variable_ID(name, tmp_prec);
                         tmp_name_index++;
                         type = 2;
                     }
-                    if(word_type[highest_priority_index + 1] == ARITHTOKENTYPE_IMAGE)
+                    if (word_type[highest_priority_index + 1] == ARITHTOKENTYPE_IMAGE)
                     {
                         arith_image_ln(word[highest_priority_index + 1], name);
                         tmp_name_index++;
@@ -1265,17 +1182,16 @@ int execute_arith(const char *cmd1)
                     }
                 }
 
-                if(strcmp(word[highest_priority_index], "log") == 0)
+                if (strcmp(word[highest_priority_index], "log") == 0)
                 {
-                    if(word_type[highest_priority_index + 1] == 2)
+                    if (word_type[highest_priority_index + 1] == 2)
                     {
-                        tmp_prec = log10(data.variable[variable_ID(word[highest_priority_index +
-                                                                                               1])].value.f);
+                        tmp_prec = log10(data.variable[variable_ID(word[highest_priority_index + 1])].value.f);
                         create_variable_ID(name, tmp_prec);
                         tmp_name_index++;
                         type = 2;
                     }
-                    if(word_type[highest_priority_index + 1] == ARITHTOKENTYPE_IMAGE)
+                    if (word_type[highest_priority_index + 1] == ARITHTOKENTYPE_IMAGE)
                     {
                         arith_image_log(word[highest_priority_index + 1], name);
                         tmp_name_index++;
@@ -1283,17 +1199,16 @@ int execute_arith(const char *cmd1)
                     }
                 }
 
-                if(strcmp(word[highest_priority_index], "sqrt") == 0)
+                if (strcmp(word[highest_priority_index], "sqrt") == 0)
                 {
-                    if(word_type[highest_priority_index + 1] == 2)
+                    if (word_type[highest_priority_index + 1] == 2)
                     {
-                        tmp_prec = sqrt(data.variable[variable_ID(word[highest_priority_index +
-                                                                                              1])].value.f);
+                        tmp_prec = sqrt(data.variable[variable_ID(word[highest_priority_index + 1])].value.f);
                         create_variable_ID(name, tmp_prec);
                         tmp_name_index++;
                         type = 2;
                     }
-                    if(word_type[highest_priority_index + 1] == ARITHTOKENTYPE_IMAGE)
+                    if (word_type[highest_priority_index + 1] == ARITHTOKENTYPE_IMAGE)
                     {
                         arith_image_sqrt(word[highest_priority_index + 1], name);
                         tmp_name_index++;
@@ -1301,17 +1216,16 @@ int execute_arith(const char *cmd1)
                     }
                 }
 
-                if(strcmp(word[highest_priority_index], "sin") == 0)
+                if (strcmp(word[highest_priority_index], "sin") == 0)
                 {
-                    if(word_type[highest_priority_index + 1] == 2)
+                    if (word_type[highest_priority_index + 1] == 2)
                     {
-                        tmp_prec = sin(data.variable[variable_ID(word[highest_priority_index +
-                                                                                             1])].value.f);
+                        tmp_prec = sin(data.variable[variable_ID(word[highest_priority_index + 1])].value.f);
                         create_variable_ID(name, tmp_prec);
                         tmp_name_index++;
                         type = 2;
                     }
-                    if(word_type[highest_priority_index + 1] == ARITHTOKENTYPE_IMAGE)
+                    if (word_type[highest_priority_index + 1] == ARITHTOKENTYPE_IMAGE)
                     {
                         arith_image_sin(word[highest_priority_index + 1], name);
                         tmp_name_index++;
@@ -1319,17 +1233,16 @@ int execute_arith(const char *cmd1)
                     }
                 }
 
-                if(strcmp(word[highest_priority_index], "sinh") == 0)
+                if (strcmp(word[highest_priority_index], "sinh") == 0)
                 {
-                    if(word_type[highest_priority_index + 1] == 2)
+                    if (word_type[highest_priority_index + 1] == 2)
                     {
-                        tmp_prec = sinh(data.variable[variable_ID(word[highest_priority_index +
-                                                                                              1])].value.f);
+                        tmp_prec = sinh(data.variable[variable_ID(word[highest_priority_index + 1])].value.f);
                         create_variable_ID(name, tmp_prec);
                         tmp_name_index++;
                         type = 2;
                     }
-                    if(word_type[highest_priority_index + 1] == ARITHTOKENTYPE_IMAGE)
+                    if (word_type[highest_priority_index + 1] == ARITHTOKENTYPE_IMAGE)
                     {
                         arith_image_sinh(word[highest_priority_index + 1], name);
                         tmp_name_index++;
@@ -1337,17 +1250,16 @@ int execute_arith(const char *cmd1)
                     }
                 }
 
-                if(strcmp(word[highest_priority_index], "tan") == 0)
+                if (strcmp(word[highest_priority_index], "tan") == 0)
                 {
-                    if(word_type[highest_priority_index + 1] == 2)
+                    if (word_type[highest_priority_index + 1] == 2)
                     {
-                        tmp_prec = tan(data.variable[variable_ID(word[highest_priority_index +
-                                                                                             1])].value.f);
+                        tmp_prec = tan(data.variable[variable_ID(word[highest_priority_index + 1])].value.f);
                         create_variable_ID(name, tmp_prec);
                         tmp_name_index++;
                         type = 2;
                     }
-                    if(word_type[highest_priority_index + 1] == ARITHTOKENTYPE_IMAGE)
+                    if (word_type[highest_priority_index + 1] == ARITHTOKENTYPE_IMAGE)
                     {
                         arith_image_tan(word[highest_priority_index + 1], name);
                         tmp_name_index++;
@@ -1355,17 +1267,16 @@ int execute_arith(const char *cmd1)
                     }
                 }
 
-                if(strcmp(word[highest_priority_index], "tanh") == 0)
+                if (strcmp(word[highest_priority_index], "tanh") == 0)
                 {
-                    if(word_type[highest_priority_index + 1] == 2)
+                    if (word_type[highest_priority_index + 1] == 2)
                     {
-                        tmp_prec = tanh(data.variable[variable_ID(word[highest_priority_index +
-                                                                                              1])].value.f);
+                        tmp_prec = tanh(data.variable[variable_ID(word[highest_priority_index + 1])].value.f);
                         create_variable_ID(name, tmp_prec);
                         tmp_name_index++;
                         type = 2;
                     }
-                    if(word_type[highest_priority_index + 1] == ARITHTOKENTYPE_IMAGE)
+                    if (word_type[highest_priority_index + 1] == ARITHTOKENTYPE_IMAGE)
                     {
                         arith_image_tanh(word[highest_priority_index + 1], name);
                         tmp_name_index++;
@@ -1373,17 +1284,17 @@ int execute_arith(const char *cmd1)
                     }
                 }
 
-                if(strcmp(word[highest_priority_index], "posi") == 0)
+                if (strcmp(word[highest_priority_index], "posi") == 0)
                 {
-                    if(word_type[highest_priority_index + 1] == 2)
+                    if (word_type[highest_priority_index + 1] == 2)
                     {
-                        tmp_prec = Ppositive((double) data.variable[variable_ID(
-                                                 word[highest_priority_index + 1])].value.f);
+                        tmp_prec =
+                            Ppositive((double)data.variable[variable_ID(word[highest_priority_index + 1])].value.f);
                         create_variable_ID(name, tmp_prec);
                         tmp_name_index++;
                         type = 2;
                     }
-                    if(word_type[highest_priority_index + 1] == ARITHTOKENTYPE_IMAGE)
+                    if (word_type[highest_priority_index + 1] == ARITHTOKENTYPE_IMAGE)
                     {
                         arith_image_positive(word[highest_priority_index + 1], name);
                         tmp_name_index++;
@@ -1391,14 +1302,14 @@ int execute_arith(const char *cmd1)
                     }
                 }
 
-                if(strcmp(word[highest_priority_index], "imdx") == 0)
+                if (strcmp(word[highest_priority_index], "imdx") == 0)
                 {
-                    if(word_type[highest_priority_index + 1] == 2)
+                    if (word_type[highest_priority_index + 1] == 2)
                     {
                         PRINT_ERROR("Function imdx only applicable on images");
                         exit(0);
                     }
-                    if(word_type[highest_priority_index + 1] == 10)
+                    if (word_type[highest_priority_index + 1] == 10)
                     {
                         arith_image_dx(word[highest_priority_index + 1], name);
                         tmp_name_index++;
@@ -1406,14 +1317,14 @@ int execute_arith(const char *cmd1)
                     }
                 }
 
-                if(strcmp(word[highest_priority_index], "imdy") == 0)
+                if (strcmp(word[highest_priority_index], "imdy") == 0)
                 {
-                    if(word_type[highest_priority_index + 1] == 2)
+                    if (word_type[highest_priority_index + 1] == 2)
                     {
                         PRINT_ERROR("Function imdy only applicable on images");
                         exit(0);
                     }
-                    if(word_type[highest_priority_index + 1] == 10)
+                    if (word_type[highest_priority_index + 1] == 10)
                     {
                         arith_image_dy(word[highest_priority_index + 1], name);
                         tmp_name_index++;
@@ -1421,10 +1332,9 @@ int execute_arith(const char *cmd1)
                     }
                 }
 
-
                 strcpy(word[highest_priority_index], name);
                 word_type[highest_priority_index] = type;
-                for(j = highest_priority_index + 1; j < nbword - 1; j++)
+                for (j = highest_priority_index + 1; j < nbword - 1; j++)
                 {
                     strcpy(word[j], word[j + 1]);
                     word_type[j] = word_type[j + 1];
@@ -1432,59 +1342,50 @@ int execute_arith(const char *cmd1)
                 nbword = nbword - 1;
             }
 
-
-
-
-            if(word_type[highest_priority_index] == 11)
+            if (word_type[highest_priority_index] == 11)
             {
                 nbvarinput = isfunction_sev_var(word[highest_priority_index]);
-                CREATE_IMAGENAME(name, "_tmp%d_%d", tmp_name_index, (int) getpid());
+                CREATE_IMAGENAME(name, "_tmp%d_%d", tmp_name_index, (int)getpid());
 
-                if(strcmp(word[highest_priority_index], "fmod") == 0)
+                if (strcmp(word[highest_priority_index], "fmod") == 0)
                 {
-                    if((word_type[highest_priority_index + 2] == 2)
-                            && (word_type[highest_priority_index + 4] == 2))
+                    if ((word_type[highest_priority_index + 2] == 2) && (word_type[highest_priority_index + 4] == 2))
                     {
-                        tmp_prec = fmod(data.variable[variable_ID(word[highest_priority_index +
-                                                                                              2])].value.f,
+                        tmp_prec = fmod(data.variable[variable_ID(word[highest_priority_index + 2])].value.f,
                                         data.variable[variable_ID(word[highest_priority_index + 4])].value.f);
                         create_variable_ID(name, tmp_prec);
                         tmp_name_index++;
                         type = 2;
                     }
-                    if((word_type[highest_priority_index + 2] == 2)
-                            && (word_type[highest_priority_index + 4] == ARITHTOKENTYPE_IMAGE))
+                    if ((word_type[highest_priority_index + 2] == 2) &&
+                        (word_type[highest_priority_index + 4] == ARITHTOKENTYPE_IMAGE))
                     {
                         printf("function not available\n");
                     }
-                    if((word_type[highest_priority_index + 2] == ARITHTOKENTYPE_IMAGE)
-                            && (word_type[highest_priority_index + 4] == 2))
+                    if ((word_type[highest_priority_index + 2] == ARITHTOKENTYPE_IMAGE) &&
+                        (word_type[highest_priority_index + 4] == 2))
                     {
-                        arith_image_cstfmod(word[highest_priority_index + 2],
-                                            (double) data.variable[variable_ID(word[highest_priority_index + 4])].value.f,
-                                            name);
+                        arith_image_cstfmod(
+                            word[highest_priority_index + 2],
+                            (double)data.variable[variable_ID(word[highest_priority_index + 4])].value.f, name);
                         tmp_name_index++;
                         type = ARITHTOKENTYPE_IMAGE;
                     }
-                    if((word_type[highest_priority_index + 2] == 10)
-                            && (word_type[highest_priority_index + 4] == ARITHTOKENTYPE_IMAGE))
+                    if ((word_type[highest_priority_index + 2] == 10) &&
+                        (word_type[highest_priority_index + 4] == ARITHTOKENTYPE_IMAGE))
                     {
-                        arith_image_fmod(word[highest_priority_index + 2],
-                                         word[highest_priority_index + 4], name);
+                        arith_image_fmod(word[highest_priority_index + 2], word[highest_priority_index + 4], name);
                         tmp_name_index++;
                         type = ARITHTOKENTYPE_IMAGE;
                     }
                 }
 
-
-                if(strcmp(word[highest_priority_index], "min") == 0)
+                if (strcmp(word[highest_priority_index], "min") == 0)
                 {
-                    if((word_type[highest_priority_index + 2] == 2)
-                            && (word_type[highest_priority_index + 4] == 2))
+                    if ((word_type[highest_priority_index + 2] == 2) && (word_type[highest_priority_index + 4] == 2))
                     {
-                        if(data.variable[variable_ID(word[highest_priority_index + 2])].value.f <
-                                data.variable[variable_ID(
-                                                  word[highest_priority_index + 4])].value.f)
+                        if (data.variable[variable_ID(word[highest_priority_index + 2])].value.f <
+                            data.variable[variable_ID(word[highest_priority_index + 4])].value.f)
                         {
                             tmp_prec = data.variable[variable_ID(word[highest_priority_index + 2])].value.f;
                         }
@@ -1496,43 +1397,40 @@ int execute_arith(const char *cmd1)
                         tmp_name_index++;
                         type = 2;
                     }
-                    if((word_type[highest_priority_index + 2] == 2)
-                            && (word_type[highest_priority_index + 4] == ARITHTOKENTYPE_IMAGE))
+                    if ((word_type[highest_priority_index + 2] == 2) &&
+                        (word_type[highest_priority_index + 4] == ARITHTOKENTYPE_IMAGE))
                     {
-                        arith_image_cstminv(word[highest_priority_index + 4],
-                                            (double) data.variable[variable_ID(word[highest_priority_index + 2])].value.f,
-                                            name);
+                        arith_image_cstminv(
+                            word[highest_priority_index + 4],
+                            (double)data.variable[variable_ID(word[highest_priority_index + 2])].value.f, name);
                         tmp_name_index++;
                         type = ARITHTOKENTYPE_IMAGE;
                     }
-                    if((word_type[highest_priority_index + 2] == ARITHTOKENTYPE_IMAGE)
-                            && (word_type[highest_priority_index + 4] == 2))
+                    if ((word_type[highest_priority_index + 2] == ARITHTOKENTYPE_IMAGE) &&
+                        (word_type[highest_priority_index + 4] == 2))
                     {
-                        arith_image_cstminv(word[highest_priority_index + 2],
-                                            (double) data.variable[variable_ID(word[highest_priority_index + 4])].value.f,
-                                            name);
+                        arith_image_cstminv(
+                            word[highest_priority_index + 2],
+                            (double)data.variable[variable_ID(word[highest_priority_index + 4])].value.f, name);
                         tmp_name_index++;
                         type = ARITHTOKENTYPE_IMAGE;
                     }
-                    if((word_type[highest_priority_index + 2] == ARITHTOKENTYPE_IMAGE)
-                            && (word_type[highest_priority_index + 4] == ARITHTOKENTYPE_IMAGE))
+                    if ((word_type[highest_priority_index + 2] == ARITHTOKENTYPE_IMAGE) &&
+                        (word_type[highest_priority_index + 4] == ARITHTOKENTYPE_IMAGE))
                     {
-                        arith_image_minv(word[highest_priority_index + 2],
-                                         word[highest_priority_index + 4], name);
+                        arith_image_minv(word[highest_priority_index + 2], word[highest_priority_index + 4], name);
                         tmp_name_index++;
                         type = ARITHTOKENTYPE_IMAGE;
                     }
                 }
 
-
-                if(strcmp(word[highest_priority_index], "max") == 0)
+                if (strcmp(word[highest_priority_index], "max") == 0)
                 {
-                    if((word_type[highest_priority_index + 2] == ARITHTOKENTYPE_IMAGE)
-                            && (word_type[highest_priority_index + 4] == ARITHTOKENTYPE_IMAGE))
+                    if ((word_type[highest_priority_index + 2] == ARITHTOKENTYPE_IMAGE) &&
+                        (word_type[highest_priority_index + 4] == ARITHTOKENTYPE_IMAGE))
                     {
-                        if(data.variable[variable_ID(word[highest_priority_index + 2])].value.f >
-                                data.variable[variable_ID(
-                                                  word[highest_priority_index + 4])].value.f)
+                        if (data.variable[variable_ID(word[highest_priority_index + 2])].value.f >
+                            data.variable[variable_ID(word[highest_priority_index + 4])].value.f)
                         {
                             tmp_prec = data.variable[variable_ID(word[highest_priority_index + 2])].value.f;
                         }
@@ -1544,42 +1442,40 @@ int execute_arith(const char *cmd1)
                         tmp_name_index++;
                         type = ARITHTOKENTYPE_IMAGE;
                     }
-                    else if((word_type[highest_priority_index + 2] == ARITHTOKENTYPE_IMAGE)
-                            && (word_type[highest_priority_index + 4] == ARITHTOKENTYPE_IMAGE))
+                    else if ((word_type[highest_priority_index + 2] == ARITHTOKENTYPE_IMAGE) &&
+                             (word_type[highest_priority_index + 4] == ARITHTOKENTYPE_IMAGE))
                     {
-                        arith_image_cstmaxv(word[highest_priority_index + 4],
-                                            (double) data.variable[variable_ID(word[highest_priority_index + 2])].value.f,
-                                            name);
+                        arith_image_cstmaxv(
+                            word[highest_priority_index + 4],
+                            (double)data.variable[variable_ID(word[highest_priority_index + 2])].value.f, name);
                         tmp_name_index++;
                         type = ARITHTOKENTYPE_IMAGE;
                     }
-                    else if((word_type[highest_priority_index + 2] == ARITHTOKENTYPE_IMAGE)
-                            && (word_type[highest_priority_index + 4] == 2))
+                    else if ((word_type[highest_priority_index + 2] == ARITHTOKENTYPE_IMAGE) &&
+                             (word_type[highest_priority_index + 4] == 2))
                     {
-                        arith_image_cstmaxv(word[highest_priority_index + 2],
-                                            (double) data.variable[variable_ID(word[highest_priority_index + 4])].value.f,
-                                            name);
+                        arith_image_cstmaxv(
+                            word[highest_priority_index + 2],
+                            (double)data.variable[variable_ID(word[highest_priority_index + 4])].value.f, name);
                         tmp_name_index++;
                         type = ARITHTOKENTYPE_IMAGE;
                     }
-                    else if((word_type[highest_priority_index + 2] == ARITHTOKENTYPE_IMAGE)
-                            && (word_type[highest_priority_index + 4] == ARITHTOKENTYPE_IMAGE))
+                    else if ((word_type[highest_priority_index + 2] == ARITHTOKENTYPE_IMAGE) &&
+                             (word_type[highest_priority_index + 4] == ARITHTOKENTYPE_IMAGE))
                     {
-                        arith_image_maxv(word[highest_priority_index + 2],
-                                         word[highest_priority_index + 4], name);
+                        arith_image_maxv(word[highest_priority_index + 2], word[highest_priority_index + 4], name);
                         tmp_name_index++;
                         type = ARITHTOKENTYPE_IMAGE;
                     }
                 }
 
-                if(strcmp(word[highest_priority_index], "testlt") == 0)
+                if (strcmp(word[highest_priority_index], "testlt") == 0)
                 {
-                    if((word_type[highest_priority_index + 2] == ARITHTOKENTYPE_IMAGE)
-                            && (word_type[highest_priority_index + 4] == ARITHTOKENTYPE_IMAGE))
+                    if ((word_type[highest_priority_index + 2] == ARITHTOKENTYPE_IMAGE) &&
+                        (word_type[highest_priority_index + 4] == ARITHTOKENTYPE_IMAGE))
                     {
-                        if(data.variable[variable_ID(word[highest_priority_index + 2])].value.f >
-                                data.variable[variable_ID(
-                                                  word[highest_priority_index + 4])].value.f)
+                        if (data.variable[variable_ID(word[highest_priority_index + 2])].value.f >
+                            data.variable[variable_ID(word[highest_priority_index + 4])].value.f)
                         {
                             tmp_prec = 0.0;
                         }
@@ -1591,29 +1487,28 @@ int execute_arith(const char *cmd1)
                         tmp_name_index++;
                         type = ARITHTOKENTYPE_IMAGE;
                     }
-                    else if((word_type[highest_priority_index + 2] == ARITHTOKENTYPE_IMAGE)
-                            && (word_type[highest_priority_index + 4] == ARITHTOKENTYPE_IMAGE))
+                    else if ((word_type[highest_priority_index + 2] == ARITHTOKENTYPE_IMAGE) &&
+                             (word_type[highest_priority_index + 4] == ARITHTOKENTYPE_IMAGE))
                     {
-                        arith_image_csttestmt(word[highest_priority_index + 4],
-                                              (double) data.variable[variable_ID(word[highest_priority_index + 2])].value.f,
-                                              name);
+                        arith_image_csttestmt(
+                            word[highest_priority_index + 4],
+                            (double)data.variable[variable_ID(word[highest_priority_index + 2])].value.f, name);
                         tmp_name_index++;
                         type = ARITHTOKENTYPE_IMAGE;
                     }
-                    else if((word_type[highest_priority_index + 2] == ARITHTOKENTYPE_IMAGE)
-                            && (word_type[highest_priority_index + 4] == ARITHTOKENTYPE_IMAGE))
+                    else if ((word_type[highest_priority_index + 2] == ARITHTOKENTYPE_IMAGE) &&
+                             (word_type[highest_priority_index + 4] == ARITHTOKENTYPE_IMAGE))
                     {
-                        arith_image_csttestlt(word[highest_priority_index + 2],
-                                              (double) data.variable[variable_ID(word[highest_priority_index + 4])].value.f,
-                                              name);
+                        arith_image_csttestlt(
+                            word[highest_priority_index + 2],
+                            (double)data.variable[variable_ID(word[highest_priority_index + 4])].value.f, name);
                         tmp_name_index++;
                         type = ARITHTOKENTYPE_IMAGE;
                     }
-                    else if((word_type[highest_priority_index + 2] == ARITHTOKENTYPE_IMAGE)
-                            && (word_type[highest_priority_index + 4] == ARITHTOKENTYPE_IMAGE))
+                    else if ((word_type[highest_priority_index + 2] == ARITHTOKENTYPE_IMAGE) &&
+                             (word_type[highest_priority_index + 4] == ARITHTOKENTYPE_IMAGE))
                     {
-                        arith_image_testlt(word[highest_priority_index + 2],
-                                           word[highest_priority_index + 4], name);
+                        arith_image_testlt(word[highest_priority_index + 2], word[highest_priority_index + 4], name);
                         tmp_name_index++;
                         type = ARITHTOKENTYPE_IMAGE;
                     }
@@ -1623,14 +1518,13 @@ int execute_arith(const char *cmd1)
                     }
                 }
 
-                if(strcmp(word[highest_priority_index], "testmt") == 0)
+                if (strcmp(word[highest_priority_index], "testmt") == 0)
                 {
-                    if((word_type[highest_priority_index + 2] == ARITHTOKENTYPE_IMAGE)
-                            && (word_type[highest_priority_index + 4] == ARITHTOKENTYPE_IMAGE))
+                    if ((word_type[highest_priority_index + 2] == ARITHTOKENTYPE_IMAGE) &&
+                        (word_type[highest_priority_index + 4] == ARITHTOKENTYPE_IMAGE))
                     {
-                        if(data.variable[variable_ID(word[highest_priority_index + 2])].value.f >
-                                data.variable[variable_ID(
-                                                  word[highest_priority_index + 4])].value.f)
+                        if (data.variable[variable_ID(word[highest_priority_index + 2])].value.f >
+                            data.variable[variable_ID(word[highest_priority_index + 4])].value.f)
                         {
                             tmp_prec = 1.0;
                         }
@@ -1642,29 +1536,28 @@ int execute_arith(const char *cmd1)
                         tmp_name_index++;
                         type = ARITHTOKENTYPE_IMAGE;
                     }
-                    else if((word_type[highest_priority_index + 2] == ARITHTOKENTYPE_IMAGE)
-                            && (word_type[highest_priority_index + 4] == ARITHTOKENTYPE_IMAGE))
+                    else if ((word_type[highest_priority_index + 2] == ARITHTOKENTYPE_IMAGE) &&
+                             (word_type[highest_priority_index + 4] == ARITHTOKENTYPE_IMAGE))
                     {
-                        arith_image_csttestlt(word[highest_priority_index + 4],
-                                              (double) data.variable[variable_ID(word[highest_priority_index + 2])].value.f,
-                                              name);
+                        arith_image_csttestlt(
+                            word[highest_priority_index + 4],
+                            (double)data.variable[variable_ID(word[highest_priority_index + 2])].value.f, name);
                         tmp_name_index++;
                         type = ARITHTOKENTYPE_IMAGE;
                     }
-                    else if((word_type[highest_priority_index + 2] == ARITHTOKENTYPE_IMAGE)
-                            && (word_type[highest_priority_index + 4] == ARITHTOKENTYPE_IMAGE))
+                    else if ((word_type[highest_priority_index + 2] == ARITHTOKENTYPE_IMAGE) &&
+                             (word_type[highest_priority_index + 4] == ARITHTOKENTYPE_IMAGE))
                     {
-                        arith_image_csttestmt(word[highest_priority_index + 2],
-                                              (double) data.variable[variable_ID(word[highest_priority_index + 4])].value.f,
-                                              name);
+                        arith_image_csttestmt(
+                            word[highest_priority_index + 2],
+                            (double)data.variable[variable_ID(word[highest_priority_index + 4])].value.f, name);
                         tmp_name_index++;
                         type = ARITHTOKENTYPE_IMAGE;
                     }
-                    else if((word_type[highest_priority_index + 2] == ARITHTOKENTYPE_IMAGE)
-                            && (word_type[highest_priority_index + 4] == ARITHTOKENTYPE_IMAGE))
+                    else if ((word_type[highest_priority_index + 2] == ARITHTOKENTYPE_IMAGE) &&
+                             (word_type[highest_priority_index + 4] == ARITHTOKENTYPE_IMAGE))
                     {
-                        arith_image_testmt(word[highest_priority_index + 2],
-                                           word[highest_priority_index + 4], name);
+                        arith_image_testmt(word[highest_priority_index + 2], word[highest_priority_index + 4], name);
                         tmp_name_index++;
                         type = ARITHTOKENTYPE_IMAGE;
                     }
@@ -1674,36 +1567,35 @@ int execute_arith(const char *cmd1)
                     }
                 }
 
-
-                if(strcmp(word[highest_priority_index], "perc") == 0)
+                if (strcmp(word[highest_priority_index], "perc") == 0)
                 {
                     //	      printf("%d %d\n",word_type[i+2],word_type[i+4]);
-                    if((word_type[highest_priority_index + 2] != ARITHTOKENTYPE_IMAGE)
-                            || (word_type[highest_priority_index + 4] != 2))
+                    if ((word_type[highest_priority_index + 2] != ARITHTOKENTYPE_IMAGE) ||
+                        (word_type[highest_priority_index + 4] != 2))
                     {
                         PRINT_ERROR("Wrong input to function perc\n");
                     }
                     else
                     {
                         //		  printf("Running percentile args = %s %f\n",word[i+2],data.variable[variable_ID(word[i+4])].value.f);
-                        tmp_prec = arith_image_percentile(word[highest_priority_index + 2],
-                                                          (double) data.variable[variable_ID(word[highest_priority_index + 4])].value.f);
+                        tmp_prec = arith_image_percentile(
+                            word[highest_priority_index + 2],
+                            (double)data.variable[variable_ID(word[highest_priority_index + 4])].value.f);
                         create_variable_ID(name, tmp_prec);
                         tmp_name_index++;
                         type = 2;
                     }
                 }
 
-                if(strcmp(word[highest_priority_index], "trunc") == 0)
+                if (strcmp(word[highest_priority_index], "trunc") == 0)
                 {
-                    if((word_type[highest_priority_index + 2] == ARITHTOKENTYPE_IMAGE)
-                            && (word_type[highest_priority_index + 4] == 2)
-                            && (word_type[highest_priority_index + 6] == 2))
+                    if ((word_type[highest_priority_index + 2] == ARITHTOKENTYPE_IMAGE) &&
+                        (word_type[highest_priority_index + 4] == 2) && (word_type[highest_priority_index + 6] == 2))
                     {
                         tmp_name_index++;
                         arith_image_trunc(word[highest_priority_index + 2],
-                                          (double) data.variable[variable_ID(word[highest_priority_index + 4])].value.f,
-                                          (double) data.variable[variable_ID(word[highest_priority_index + 6])].value.f,
+                                          (double)data.variable[variable_ID(word[highest_priority_index + 4])].value.f,
+                                          (double)data.variable[variable_ID(word[highest_priority_index + 6])].value.f,
                                           name);
                         type = ARITHTOKENTYPE_IMAGE;
                     }
@@ -1715,7 +1607,7 @@ int execute_arith(const char *cmd1)
 
                 strcpy(word[highest_priority_index], name);
                 word_type[highest_priority_index] = type;
-                for(j = highest_priority_index + 1; j < nbword - (nbvarinput * 2 + 1); j++)
+                for (j = highest_priority_index + 1; j < nbword - (nbvarinput * 2 + 1); j++)
                 {
                     strcpy(word[j], word[j + (nbvarinput * 2 + 1)]);
                     word_type[j] = word_type[j + (nbvarinput * 2 + 1)];
@@ -1723,9 +1615,6 @@ int execute_arith(const char *cmd1)
                 nbword = nbword - nbvarinput * 2 - 1;
             }
 
-
-
-
             /*      printf("after : ");
               for (i=0;i<nbword;i++)
               {
@@ -1739,39 +1628,38 @@ int execute_arith(const char *cmd1)
             /* computing the number of to-be-processed words */
             passedequ = 0;
             nb_tbp_word = 0;
-            for(int i = (nbword - 1); i > -1; i--)
+            for (int i = (nbword - 1); i > -1; i--)
             {
-                if(word_type[i] == ARITHTOKENTYPE_EQUAL)
+                if (word_type[i] == ARITHTOKENTYPE_EQUAL)
                 {
                     passedequ = 1;
                 }
-                if(passedequ == 0)
+                if (passedequ == 0)
                 {
                     nb_tbp_word++;
                 }
             }
-
         }
 
-        if(nbword > 2)
+        if (nbword > 2)
         {
-            if(word_type[1] == ARITHTOKENTYPE_EQUAL)
+            if (word_type[1] == ARITHTOKENTYPE_EQUAL)
             {
-                if(variable_ID(word[0]) != -1)
+                if (variable_ID(word[0]) != -1)
                 {
                     delete_variable_ID(word[0]);
                 }
-                if(image_ID(word[0]) != -1)
+                if (image_ID(word[0]) != -1)
                 {
                     delete_image_ID(word[0], DELETE_IMAGE_ERRMODE_WARNING);
                 }
 
-                if(word_type[2] == 2)
+                if (word_type[2] == 2)
                 {
                     create_variable_ID(word[0], data.variable[variable_ID(word[2])].value.f);
                     printf("%.20g\n", data.variable[variable_ID(word[2])].value.f);
                 }
-                if(word_type[2] == 10)
+                if (word_type[2] == 10)
                 {
                     chname_image_ID(word[2], word[0]);
                 }
@@ -1782,19 +1670,19 @@ int execute_arith(const char *cmd1)
             printf("%.20g\n", data.variable[variable_ID(word[0])].value.f);
         }
 
-        for(int i = 0; i < tmp_name_index; i++)
+        for (int i = 0; i < tmp_name_index; i++)
         {
-            CREATE_IMAGENAME(name, "_tmp%d_%d", i, (int) getpid());
-            if(variable_ID(name) != -1)
+            CREATE_IMAGENAME(name, "_tmp%d_%d", i, (int)getpid());
+            if (variable_ID(name) != -1)
             {
                 delete_variable_ID(name);
             }
-            if(image_ID(name) != -1)
+            if (image_ID(name) != -1)
             {
                 delete_image_ID(name, DELETE_IMAGE_ERRMODE_WARNING);
             }
         }
     }
 
-    return(0);
+    return (0);
 }
diff --git a/src/COREMOD_arith/execute_arith.h b/src/COREMOD_arith/execute_arith.h
index 5adcadb1..307c209d 100644
--- a/src/COREMOD_arith/execute_arith.h
+++ b/src/COREMOD_arith/execute_arith.h
@@ -3,14 +3,6 @@
  *
  */
 
-
-imageID arith_make_slopexy(
-    const char *ID_name,
-    long l1,
-    long l2,
-    double sx,
-    double sy
-);
-
+imageID arith_make_slopexy(const char *ID_name, long l1, long l2, double sx, double sy);
 
 int execute_arith(const char *cmd1);
diff --git a/src/COREMOD_arith/image_arith__Cim_Cim__Cim.c b/src/COREMOD_arith/image_arith__Cim_Cim__Cim.c
index fefe8771..56df5f69 100644
--- a/src/COREMOD_arith/image_arith__Cim_Cim__Cim.c
+++ b/src/COREMOD_arith/image_arith__Cim_Cim__Cim.c
@@ -1,30 +1,21 @@
 /**
  * @file    image_arith__Cim_Cim__Cim.c
  * @brief   arith functions
- * 
+ *
  * input : complex image, complex image
  * output: complex image
  *
  */
 
-
 #include <math.h>
 
-
-#include "CommandLineInterface/CLIcore.h"
 #include "COREMOD_memory/COREMOD_memory.h"
+#include "CommandLineInterface/CLIcore.h"
 
 #include "imfunctions.h"
 #include "mathfuncs.h"
 
-
-
-
-errno_t arith_image_Cadd(
-    const char *ID1_name,
-    const char *ID2_name,
-    const char *ID_out
-)
+errno_t arith_image_Cadd(const char *ID1_name, const char *ID2_name, const char *ID_out)
 {
     uint8_t atype1, atype2;
     imageID ID1;
@@ -35,30 +26,23 @@ errno_t arith_image_Cadd(
     atype1 = data.image[ID1].md[0].datatype;
     atype2 = data.image[ID2].md[0].datatype;
 
-    if((atype1 == _DATATYPE_COMPLEX_FLOAT) && (atype2 ==  _DATATYPE_COMPLEX_FLOAT))
+    if ((atype1 == _DATATYPE_COMPLEX_FLOAT) && (atype2 == _DATATYPE_COMPLEX_FLOAT))
     {
         arith_image_function_CF_CF__CF(ID1_name, ID2_name, ID_out, &CPadd_CF_CF);
         return RETURN_SUCCESS;
     }
 
-    if((atype1 == _DATATYPE_COMPLEX_DOUBLE)
-            && (atype2 ==  _DATATYPE_COMPLEX_DOUBLE))
+    if ((atype1 == _DATATYPE_COMPLEX_DOUBLE) && (atype2 == _DATATYPE_COMPLEX_DOUBLE))
     {
         arith_image_function_CD_CD__CD(ID1_name, ID2_name, ID_out, &CPadd_CD_CD);
         return RETURN_SUCCESS;
     }
-    PRINT_ERROR( "data types do not match");
+    PRINT_ERROR("data types do not match");
 
     return RETURN_FAILURE;
 }
 
-
-
-errno_t arith_image_Csub(
-    const char *ID1_name,
-    const char *ID2_name,
-    const char *ID_out
-)
+errno_t arith_image_Csub(const char *ID1_name, const char *ID2_name, const char *ID_out)
 {
     uint8_t datatype1, datatype2;
     imageID ID1;
@@ -69,15 +53,13 @@ errno_t arith_image_Csub(
     datatype1 = data.image[ID1].md[0].datatype;
     datatype2 = data.image[ID2].md[0].datatype;
 
-    if((datatype1 == _DATATYPE_COMPLEX_FLOAT)
-            && (datatype2 ==  _DATATYPE_COMPLEX_FLOAT))
+    if ((datatype1 == _DATATYPE_COMPLEX_FLOAT) && (datatype2 == _DATATYPE_COMPLEX_FLOAT))
     {
         arith_image_function_CF_CF__CF(ID1_name, ID2_name, ID_out, &CPsub_CF_CF);
         return RETURN_SUCCESS;
     }
 
-    if((datatype1 == _DATATYPE_COMPLEX_DOUBLE)
-            && (datatype2 ==  _DATATYPE_COMPLEX_DOUBLE))
+    if ((datatype1 == _DATATYPE_COMPLEX_DOUBLE) && (datatype2 == _DATATYPE_COMPLEX_DOUBLE))
     {
         arith_image_function_CD_CD__CD(ID1_name, ID2_name, ID_out, &CPsub_CD_CD);
         return RETURN_SUCCESS;
@@ -87,13 +69,7 @@ errno_t arith_image_Csub(
     return RETURN_FAILURE;
 }
 
-
-
-errno_t arith_image_Cmult(
-    const char *ID1_name,
-    const char *ID2_name,
-    const char *ID_out
-)
+errno_t arith_image_Cmult(const char *ID1_name, const char *ID2_name, const char *ID_out)
 {
     uint8_t datatype1, datatype2;
     imageID ID1;
@@ -104,15 +80,13 @@ errno_t arith_image_Cmult(
     datatype1 = data.image[ID1].md[0].datatype;
     datatype2 = data.image[ID2].md[0].datatype;
 
-    if((datatype1 == _DATATYPE_COMPLEX_FLOAT)
-            && (datatype2 ==  _DATATYPE_COMPLEX_FLOAT))
+    if ((datatype1 == _DATATYPE_COMPLEX_FLOAT) && (datatype2 == _DATATYPE_COMPLEX_FLOAT))
     {
         arith_image_function_CF_CF__CF(ID1_name, ID2_name, ID_out, &CPmult_CF_CF);
         return RETURN_SUCCESS;
     }
 
-    if((datatype1 == _DATATYPE_COMPLEX_DOUBLE)
-            && (datatype2 ==  _DATATYPE_COMPLEX_DOUBLE))
+    if ((datatype1 == _DATATYPE_COMPLEX_DOUBLE) && (datatype2 == _DATATYPE_COMPLEX_DOUBLE))
     {
         arith_image_function_CD_CD__CD(ID1_name, ID2_name, ID_out, &CPmult_CD_CD);
         return RETURN_SUCCESS;
@@ -122,13 +96,7 @@ errno_t arith_image_Cmult(
     return RETURN_FAILURE;
 }
 
-
-
-int arith_image_Cdiv(
-    const char *ID1_name,
-    const char *ID2_name,
-    const char *ID_out
-)
+int arith_image_Cdiv(const char *ID1_name, const char *ID2_name, const char *ID_out)
 {
     uint8_t datatype1, datatype2;
     imageID ID1;
@@ -139,15 +107,13 @@ int arith_image_Cdiv(
     datatype1 = data.image[ID1].md[0].datatype;
     datatype2 = data.image[ID2].md[0].datatype;
 
-    if((datatype1 == _DATATYPE_COMPLEX_FLOAT)
-            && (datatype2 ==  _DATATYPE_COMPLEX_FLOAT))
+    if ((datatype1 == _DATATYPE_COMPLEX_FLOAT) && (datatype2 == _DATATYPE_COMPLEX_FLOAT))
     {
         arith_image_function_CF_CF__CF(ID1_name, ID2_name, ID_out, &CPdiv_CF_CF);
         return RETURN_SUCCESS;
     }
 
-    if((datatype1 == _DATATYPE_COMPLEX_DOUBLE)
-            && (datatype2 ==  _DATATYPE_COMPLEX_DOUBLE))
+    if ((datatype1 == _DATATYPE_COMPLEX_DOUBLE) && (datatype2 == _DATATYPE_COMPLEX_DOUBLE))
     {
         arith_image_function_CD_CD__CD(ID1_name, ID2_name, ID_out, &CPdiv_CD_CD);
         return RETURN_SUCCESS;
@@ -156,4 +122,3 @@ int arith_image_Cdiv(
 
     return RETURN_FAILURE;
 }
-
diff --git a/src/COREMOD_arith/image_arith__im__im.c b/src/COREMOD_arith/image_arith__im__im.c
index e21589ae..43db4a5f 100644
--- a/src/COREMOD_arith/image_arith__im__im.c
+++ b/src/COREMOD_arith/image_arith__im__im.c
@@ -1,428 +1,392 @@
 /**
  * @file    image_arith__im__im.c
  * @brief   arith functions
- * 
+ *
  * input : image
  * output: image
  *
  */
 
-
 #include <math.h>
 
-
-#include "CommandLineInterface/CLIcore.h"
 #include "COREMOD_memory/COREMOD_memory.h"
+#include "CommandLineInterface/CLIcore.h"
 
 #include "imfunctions.h"
 #include "mathfuncs.h"
 
-
-
-
-
-
 int arith_image_acos_byID(long ID, long IDout)
 {
     arith_image_function_1_1_byID(ID, IDout, &Pacos);
-    return(0);
+    return (0);
 }
 
-
 int arith_image_asin_byID(long ID, long IDout)
 {
     arith_image_function_1_1_byID(ID, IDout, &Pasin);
-    return(0);
+    return (0);
 }
 
-
 int arith_image_atan_byID(long ID, long IDout)
 {
     arith_image_function_1_1_byID(ID, IDout, &Patan);
-    return(0);
+    return (0);
 }
 
-
 int arith_image_ceil_byID(long ID, long IDout)
 {
     arith_image_function_1_1_byID(ID, IDout, &Pceil);
-    return(0);
+    return (0);
 }
 
-
 int arith_image_cos_byID(long ID, long IDout)
 {
     arith_image_function_1_1_byID(ID, IDout, &Pcos);
-    return(0);
+    return (0);
 }
 
-
 int arith_image_cosh_byID(long ID, long IDout)
 {
     arith_image_function_1_1_byID(ID, IDout, &Pcosh);
-    return(0);
+    return (0);
 }
 
-
 int arith_image_exp_byID(long ID, long IDout)
 {
     arith_image_function_1_1_byID(ID, IDout, &Pexp);
-    return(0);
+    return (0);
 }
 
-
 int arith_image_fabs_byID(long ID, long IDout)
 {
     arith_image_function_1_1_byID(ID, IDout, &Pfabs);
-    return(0);
+    return (0);
 }
 
-
 int arith_image_floor_byID(long ID, long IDout)
 {
     arith_image_function_1_1_byID(ID, IDout, &Pfloor);
-    return(0);
+    return (0);
 }
 
-
 int arith_image_ln_byID(long ID, long IDout)
 {
     arith_image_function_1_1_byID(ID, IDout, &Pln);
-    return(0);
+    return (0);
 }
 
-
 int arith_image_log_byID(long ID, long IDout)
 {
     arith_image_function_1_1_byID(ID, IDout, &Plog);
-    return(0);
+    return (0);
 }
 
-
 int arith_image_sqrt_byID(long ID, long IDout)
 {
     arith_image_function_1_1_byID(ID, IDout, &Psqrt);
-    return(0);
+    return (0);
 }
 
-
 int arith_image_sin_byID(long ID, long IDout)
 {
     arith_image_function_1_1_byID(ID, IDout, &Psin);
-    return(0);
+    return (0);
 }
 
-
 int arith_image_sinh_byID(long ID, long IDout)
 {
     arith_image_function_1_1_byID(ID, IDout, &Psinh);
-    return(0);
+    return (0);
 }
 
 int arith_image_tan_byID(long ID, long IDout)
 {
     arith_image_function_1_1_byID(ID, IDout, &Ptan);
-    return(0);
+    return (0);
 }
 
 int arith_image_tanh_byID(long ID, long IDout)
 {
     arith_image_function_1_1_byID(ID, IDout, &Ptanh);
-    return(0);
+    return (0);
 }
 
 int arith_image_positive_byID(long ID, long IDout)
 {
     arith_image_function_1_1_byID(ID, IDout, &Ppositive);
-    return(0);
+    return (0);
 }
 
-
-
-
 int arith_image_acos(const char *ID_name, const char *ID_out)
 {
     arith_image_function_1_1(ID_name, ID_out, &Pacos);
-    return(0);
+    return (0);
 }
 
 int arith_image_asin(const char *ID_name, const char *ID_out)
 {
     arith_image_function_1_1(ID_name, ID_out, &Pasin);
-    return(0);
+    return (0);
 }
 
 int arith_image_atan(const char *ID_name, const char *ID_out)
 {
     arith_image_function_1_1(ID_name, ID_out, &Patan);
-    return(0);
+    return (0);
 }
 
 int arith_image_ceil(const char *ID_name, const char *ID_out)
 {
     arith_image_function_1_1(ID_name, ID_out, &Pceil);
-    return(0);
+    return (0);
 }
 
 int arith_image_cos(const char *ID_name, const char *ID_out)
 {
     arith_image_function_1_1(ID_name, ID_out, &Pcos);
-    return(0);
+    return (0);
 }
 
 int arith_image_cosh(const char *ID_name, const char *ID_out)
 {
     arith_image_function_1_1(ID_name, ID_out, &Pcosh);
-    return(0);
+    return (0);
 }
 
 int arith_image_exp(const char *ID_name, const char *ID_out)
 {
     arith_image_function_1_1(ID_name, ID_out, &Pexp);
-    return(0);
+    return (0);
 }
 
 int arith_image_fabs(const char *ID_name, const char *ID_out)
 {
     arith_image_function_1_1(ID_name, ID_out, &Pfabs);
-    return(0);
+    return (0);
 }
 
 int arith_image_floor(const char *ID_name, const char *ID_out)
 {
     arith_image_function_1_1(ID_name, ID_out, &Pfloor);
-    return(0);
+    return (0);
 }
 
 int arith_image_ln(const char *ID_name, const char *ID_out)
 {
     arith_image_function_1_1(ID_name, ID_out, &Pln);
-    return(0);
+    return (0);
 }
 
 int arith_image_log(const char *ID_name, const char *ID_out)
 {
     arith_image_function_1_1(ID_name, ID_out, &Plog);
-    return(0);
+    return (0);
 }
 
 int arith_image_sqrt(const char *ID_name, const char *ID_out)
 {
     arith_image_function_1_1(ID_name, ID_out, &Psqrt);
-    return(0);
+    return (0);
 }
 
 int arith_image_sin(const char *ID_name, const char *ID_out)
 {
     arith_image_function_1_1(ID_name, ID_out, &Psin);
-    return(0);
+    return (0);
 }
 
 int arith_image_sinh(const char *ID_name, const char *ID_out)
 {
     arith_image_function_1_1(ID_name, ID_out, &Psinh);
-    return(0);
+    return (0);
 }
 
 int arith_image_tan(const char *ID_name, const char *ID_out)
 {
     arith_image_function_1_1(ID_name, ID_out, &Ptan);
-    return(0);
+    return (0);
 }
 
 int arith_image_tanh(const char *ID_name, const char *ID_out)
 {
     arith_image_function_1_1(ID_name, ID_out, &Ptanh);
-    return(0);
+    return (0);
 }
 
 int arith_image_positive(const char *ID_name, const char *ID_out)
 {
     arith_image_function_1_1(ID_name, ID_out, &Ppositive);
-    return(0);
+    return (0);
 }
 
-
-
-
-
-
-
-
 int arith_image_acos_inplace_byID(long ID)
 {
     arith_image_function_1_1_inplace_byID(ID, &Pacos);
-    return(0);
+    return (0);
 }
 int arith_image_asin_inplace_byID(long ID)
 {
     arith_image_function_1_1_inplace_byID(ID, &Pasin);
-    return(0);
+    return (0);
 }
 int arith_image_atan_inplace_byID(long ID)
 {
     arith_image_function_1_1_inplace_byID(ID, &Patan);
-    return(0);
+    return (0);
 }
 int arith_image_ceil_inplace_byID(long ID)
 {
     arith_image_function_1_1_inplace_byID(ID, &Pceil);
-    return(0);
+    return (0);
 }
 int arith_image_cos_inplace_byID(long ID)
 {
     arith_image_function_1_1_inplace_byID(ID, &Pcos);
-    return(0);
+    return (0);
 }
 int arith_image_cosh_inplace_byID(long ID)
 {
     arith_image_function_1_1_inplace_byID(ID, &Pcosh);
-    return(0);
+    return (0);
 }
 int arith_image_exp_inplace_byID(long ID)
 {
     arith_image_function_1_1_inplace_byID(ID, &Pexp);
-    return(0);
+    return (0);
 }
 int arith_image_fabs_inplace_byID(long ID)
 {
     arith_image_function_1_1_inplace_byID(ID, &Pfabs);
-    return(0);
+    return (0);
 }
 int arith_image_floor_inplace_byID(long ID)
 {
     arith_image_function_1_1_inplace_byID(ID, &Pfloor);
-    return(0);
+    return (0);
 }
 int arith_image_ln_inplace_byID(long ID)
 {
     arith_image_function_1_1_inplace_byID(ID, &Pln);
-    return(0);
+    return (0);
 }
 int arith_image_log_inplace_byID(long ID)
 {
     arith_image_function_1_1_inplace_byID(ID, &Plog);
-    return(0);
+    return (0);
 }
 int arith_image_sqrt_inplace_byID(long ID)
 {
     arith_image_function_1_1_inplace_byID(ID, &Psqrt);
-    return(0);
+    return (0);
 }
 int arith_image_sin_inplace_byID(long ID)
 {
     arith_image_function_1_1_inplace_byID(ID, &Psin);
-    return(0);
+    return (0);
 }
 int arith_image_sinh_inplace_byID(long ID)
 {
     arith_image_function_1_1_inplace_byID(ID, &Psinh);
-    return(0);
+    return (0);
 }
 int arith_image_tan_inplace_byID(long ID)
 {
     arith_image_function_1_1_inplace_byID(ID, &Ptan);
-    return(0);
+    return (0);
 }
 int arith_image_tanh_inplace_byID(long ID)
 {
     arith_image_function_1_1_inplace_byID(ID, &Ptanh);
-    return(0);
+    return (0);
 }
 int arith_image_positive_inplace_byID(long ID)
 {
     arith_image_function_1_1_inplace_byID(ID, &Ppositive);
-    return(0);
+    return (0);
 }
 
-
-
 int arith_image_acos_inplace(const char *ID_name)
 {
     arith_image_function_1_1_inplace(ID_name, &Pacos);
-    return(0);
+    return (0);
 }
 int arith_image_asin_inplace(const char *ID_name)
 {
     arith_image_function_1_1_inplace(ID_name, &Pasin);
-    return(0);
+    return (0);
 }
 int arith_image_atan_inplace(const char *ID_name)
 {
     arith_image_function_1_1_inplace(ID_name, &Patan);
-    return(0);
+    return (0);
 }
 int arith_image_ceil_inplace(const char *ID_name)
 {
     arith_image_function_1_1_inplace(ID_name, &Pceil);
-    return(0);
+    return (0);
 }
 int arith_image_cos_inplace(const char *ID_name)
 {
     arith_image_function_1_1_inplace(ID_name, &Pcos);
-    return(0);
+    return (0);
 }
 int arith_image_cosh_inplace(const char *ID_name)
 {
     arith_image_function_1_1_inplace(ID_name, &Pcosh);
-    return(0);
+    return (0);
 }
 int arith_image_exp_inplace(const char *ID_name)
 {
     arith_image_function_1_1_inplace(ID_name, &Pexp);
-    return(0);
+    return (0);
 }
 int arith_image_fabs_inplace(const char *ID_name)
 {
     arith_image_function_1_1_inplace(ID_name, &Pfabs);
-    return(0);
+    return (0);
 }
 int arith_image_floor_inplace(const char *ID_name)
 {
     arith_image_function_1_1_inplace(ID_name, &Pfloor);
-    return(0);
+    return (0);
 }
 int arith_image_ln_inplace(const char *ID_name)
 {
     arith_image_function_1_1_inplace(ID_name, &Pln);
-    return(0);
+    return (0);
 }
 int arith_image_log_inplace(const char *ID_name)
 {
     arith_image_function_1_1_inplace(ID_name, &Plog);
-    return(0);
+    return (0);
 }
 int arith_image_sqrt_inplace(const char *ID_name)
 {
     arith_image_function_1_1_inplace(ID_name, &Psqrt);
-    return(0);
+    return (0);
 }
 int arith_image_sin_inplace(const char *ID_name)
 {
     arith_image_function_1_1_inplace(ID_name, &Psin);
-    return(0);
+    return (0);
 }
 int arith_image_sinh_inplace(const char *ID_name)
 {
     arith_image_function_1_1_inplace(ID_name, &Psinh);
-    return(0);
+    return (0);
 }
 int arith_image_tan_inplace(const char *ID_name)
 {
     arith_image_function_1_1_inplace(ID_name, &Ptan);
-    return(0);
+    return (0);
 }
 int arith_image_tanh_inplace(const char *ID_name)
 {
     arith_image_function_1_1_inplace(ID_name, &Ptanh);
-    return(0);
+    return (0);
 }
 int arith_image_positive_inplace(const char *ID_name)
 {
     arith_image_function_1_1_inplace(ID_name, &Ppositive);
-    return(0);
+    return (0);
 }
-
-
-
-
diff --git a/src/COREMOD_arith/image_arith__im__im.h b/src/COREMOD_arith/image_arith__im__im.h
index 8ef396cb..d78d5952 100644
--- a/src/COREMOD_arith/image_arith__im__im.h
+++ b/src/COREMOD_arith/image_arith__im__im.h
@@ -3,18 +3,12 @@
  *
  */
 
-
-
 double Ppositive(double a);
 
-
-
 /* ------------------------------------------------------------------------- */
 /* image  -> image                                                           */
 /* ------------------------------------------------------------------------- */
 
-
-
 int arith_image_acos_byID(long ID, long IDout);
 int arith_image_asin_byID(long ID, long IDout);
 int arith_image_atan_byID(long ID, long IDout);
@@ -50,10 +44,6 @@ int arith_image_tan(const char *ID_name, const char *ID_out);
 int arith_image_tanh(const char *ID_name, const char *ID_out);
 int arith_image_positive(const char *ID_name, const char *ID_out);
 
-
-
-
-
 int arith_image_acos_inplace_byID(long ID);
 int arith_image_asin_inplace_byID(long ID);
 int arith_image_atan_inplace_byID(long ID);
@@ -87,4 +77,3 @@ int arith_image_sin_inplace(const char *ID_name);
 int arith_image_sinh_inplace(const char *ID_name);
 int arith_image_tan_inplace(const char *ID_name);
 int arith_image_tanh_inplace(const char *ID_name);
-
diff --git a/src/COREMOD_arith/image_arith__im_f__im.c b/src/COREMOD_arith/image_arith__im_f__im.c
index 6c9741be..e7ec206d 100644
--- a/src/COREMOD_arith/image_arith__im_f__im.c
+++ b/src/COREMOD_arith/image_arith__im_f__im.c
@@ -1,266 +1,220 @@
 /**
  * @file    image_arith__im_f__im.c
  * @brief   arith functions
- * 
+ *
  * input : image, float
  * output: image
  *
  */
 
-
 #include <math.h>
 
-
-#include "CommandLineInterface/CLIcore.h"
 #include "COREMOD_memory/COREMOD_memory.h"
+#include "CommandLineInterface/CLIcore.h"
 
 #include "imfunctions.h"
 #include "mathfuncs.h"
 
-
-
-
-
-
 int arith_image_cstfmod(const char *ID_name, double f1, const char *ID_out)
 {
     arith_image_function_1f_1(ID_name, f1, ID_out, &Pfmod);
-    return(0);
+    return (0);
 }
 
-
 int arith_image_cstadd(const char *ID_name, double f1, const char *ID_out)
 {
     arith_image_function_1f_1(ID_name, f1, ID_out, &Padd);
-    return(0);
+    return (0);
 }
 
-
 int arith_image_cstsub(const char *ID_name, double f1, const char *ID_out)
 {
     arith_image_function_1f_1(ID_name, f1, ID_out, &Psub);
-    return(0);
+    return (0);
 }
 
-
 int arith_image_cstsubm(const char *ID_name, double f1, const char *ID_out)
 {
     arith_image_function_1f_1(ID_name, f1, ID_out, &Psubm);
-    return(0);
+    return (0);
 }
 
-
 int arith_image_cstmult(const char *ID_name, double f1, const char *ID_out)
 {
     arith_image_function_1f_1(ID_name, f1, ID_out, &Pmult);
-    return(0);
+    return (0);
 }
 
-
 int arith_image_cstdiv(const char *ID_name, double f1, const char *ID_out)
 {
     arith_image_function_1f_1(ID_name, f1, ID_out, &Pdiv);
-    return(0);
+    return (0);
 }
 
-
 int arith_image_cstdiv1(const char *ID_name, double f1, const char *ID_out)
 {
     arith_image_function_1f_1(ID_name, f1, ID_out, &Pdiv1);
-    return(0);
+    return (0);
 }
 
-
 int arith_image_cstpow(const char *ID_name, double f1, const char *ID_out)
 {
     arith_image_function_1f_1(ID_name, f1, ID_out, &Ppow);
-    return(0);
+    return (0);
 }
 
-
 int arith_image_cstmaxv(const char *ID_name, double f1, const char *ID_out)
 {
     arith_image_function_1f_1(ID_name, f1, ID_out, &Pmaxv);
-    return(0);
+    return (0);
 }
 
-
 int arith_image_cstminv(const char *ID_name, double f1, const char *ID_out)
 {
     arith_image_function_1f_1(ID_name, f1, ID_out, &Pminv);
-    return(0);
+    return (0);
 }
 
-
 int arith_image_csttestlt(const char *ID_name, double f1, const char *ID_out)
 {
     arith_image_function_1f_1(ID_name, f1, ID_out, &Ptestlt);
-    return(0);
+    return (0);
 }
 
-
 int arith_image_csttestmt(const char *ID_name, double f1, const char *ID_out)
 {
     arith_image_function_1f_1(ID_name, f1, ID_out, &Ptestmt);
-    return(0);
+    return (0);
 }
 
-
-
-
 int arith_image_cstfmod_inplace(const char *ID_name, double f1)
 {
     arith_image_function_1f_1_inplace(ID_name, f1, &Pfmod);
-    return(0);
+    return (0);
 }
 
-
 int arith_image_cstadd_inplace(const char *ID_name, double f1)
 {
     arith_image_function_1f_1_inplace(ID_name, f1, &Padd);
-    return(0);
+    return (0);
 }
 
-
 int arith_image_cstsub_inplace(const char *ID_name, double f1)
 {
     arith_image_function_1f_1_inplace(ID_name, f1, &Psub);
-    return(0);
+    return (0);
 }
 
-
 int arith_image_cstmult_inplace(const char *ID_name, double f1)
 {
     arith_image_function_1f_1_inplace(ID_name, f1, &Pmult);
-    return(0);
+    return (0);
 }
 
-
 int arith_image_cstdiv_inplace(const char *ID_name, double f1)
 {
     arith_image_function_1f_1_inplace(ID_name, f1, &Pdiv);
-    return(0);
+    return (0);
 }
 
-
 int arith_image_cstdiv1_inplace(const char *ID_name, double f1)
 {
     arith_image_function_1f_1_inplace(ID_name, f1, &Pdiv1);
-    return(0);
+    return (0);
 }
 
-
 int arith_image_cstpow_inplace(const char *ID_name, double f1)
 {
     arith_image_function_1f_1_inplace(ID_name, f1, &Ppow);
-    return(0);
+    return (0);
 }
 
-
 int arith_image_cstmaxv_inplace(const char *ID_name, double f1)
 {
     arith_image_function_1f_1_inplace(ID_name, f1, &Pmaxv);
-    return(0);
+    return (0);
 }
 
-
 int arith_image_cstminv_inplace(const char *ID_name, double f1)
 {
     arith_image_function_1f_1_inplace(ID_name, f1, &Pminv);
-    return(0);
+    return (0);
 }
 
-
 int arith_image_csttestlt_inplace(const char *ID_name, double f1)
 {
     arith_image_function_1f_1_inplace(ID_name, f1, &Ptestlt);
-    return(0);
+    return (0);
 }
 
-
 int arith_image_csttestmt_inplace(const char *ID_name, double f1)
 {
     arith_image_function_1f_1_inplace(ID_name, f1, &Ptestmt);
-    return(0);
+    return (0);
 }
 
-
-
-
 int arith_image_cstfmod_inplace_byID(long ID, double f1)
 {
     arith_image_function_1f_1_inplace_byID(ID, f1, &Pfmod);
-    return(0);
+    return (0);
 }
 
-
 int arith_image_cstadd_inplace_byID(long ID, double f1)
 {
     arith_image_function_1f_1_inplace_byID(ID, f1, &Padd);
-    return(0);
+    return (0);
 }
 
-
 int arith_image_cstsub_inplace_byID(long ID, double f1)
 {
     arith_image_function_1f_1_inplace_byID(ID, f1, &Psub);
-    return(0);
+    return (0);
 }
 
-
 int arith_image_cstmult_inplace_byID(long ID, double f1)
 {
     arith_image_function_1f_1_inplace_byID(ID, f1, &Pmult);
-    return(0);
+    return (0);
 }
 
-
 int arith_image_cstdiv_inplace_byID(long ID, double f1)
 {
     arith_image_function_1f_1_inplace_byID(ID, f1, &Pdiv);
-    return(0);
+    return (0);
 }
 
-
 int arith_image_cstdiv1_inplace_byID(long ID, double f1)
 {
     arith_image_function_1f_1_inplace_byID(ID, f1, &Pdiv1);
-    return(0);
+    return (0);
 }
 
-
 int arith_image_cstpow_inplace_byID(long ID, double f1)
 {
     arith_image_function_1f_1_inplace_byID(ID, f1, &Ppow);
-    return(0);
+    return (0);
 }
 
-
 int arith_image_cstmaxv_inplace_byID(long ID, double f1)
 {
     arith_image_function_1f_1_inplace_byID(ID, f1, &Pmaxv);
-    return(0);
+    return (0);
 }
 
-
 int arith_image_cstminv_inplace_byID(long ID, double f1)
 {
     arith_image_function_1f_1_inplace_byID(ID, f1, &Pminv);
-    return(0);
+    return (0);
 }
 
-
 int arith_image_csttestlt_inplace_byID(long ID, double f1)
 {
     arith_image_function_1f_1_inplace_byID(ID, f1, &Ptestlt);
-    return(0);
+    return (0);
 }
 
-
 int arith_image_csttestmt_inplace_byID(long ID, double f1)
 {
     arith_image_function_1f_1_inplace_byID(ID, f1, &Ptestmt);
-    return(0);
+    return (0);
 }
-
-
diff --git a/src/COREMOD_arith/image_arith__im_f__im.h b/src/COREMOD_arith/image_arith__im_f__im.h
index e439ecd5..95cb82c7 100644
--- a/src/COREMOD_arith/image_arith__im_f__im.h
+++ b/src/COREMOD_arith/image_arith__im_f__im.h
@@ -3,7 +3,6 @@
  *
  */
 
-
 int arith_image_cstfmod(const char *ID_name, double f1, const char *ID_out);
 
 int arith_image_cstadd(const char *ID_name, double f1, const char *ID_out);
@@ -71,4 +70,3 @@ int arith_image_cstminv_inplace_byID(long ID, double f1);
 int arith_image_csttestlt_inplace_byID(long ID, double f1);
 
 int arith_image_csttestmt_inplace_byID(long ID, double f1);
-
diff --git a/src/COREMOD_arith/image_arith__im_f_f__im.c b/src/COREMOD_arith/image_arith__im_f_f__im.c
index e96daa68..81f32008 100644
--- a/src/COREMOD_arith/image_arith__im_f_f__im.c
+++ b/src/COREMOD_arith/image_arith__im_f_f__im.c
@@ -1,56 +1,38 @@
 /**
  * @file    image_arith__im_f_f__im.c
  * @brief   arith functions
- * 
+ *
  * input : image, float, float
  * output: image
  *
  */
 
-
 #include <math.h>
 
-
-#include "CommandLineInterface/CLIcore.h"
 #include "COREMOD_memory/COREMOD_memory.h"
+#include "CommandLineInterface/CLIcore.h"
 
 #include "imfunctions.h"
 #include "mathfuncs.h"
 
-
-
-
-
-
 // ==========================================
 // Forward declaration(s)
 // ==========================================
 
-int arith_image_trunc(const char *ID_name, double f1, double f2,
-                      const char *ID_out);
-
-
+int arith_image_trunc(const char *ID_name, double f1, double f2, const char *ID_out);
 
 // ==========================================
 // Command line interface wrapper function(s)
 // ==========================================
 
-
-
 static errno_t arith_image_trunc_cli()
 {
-    if(0
-            + CLI_checkarg(1, CLIARG_IMG)
-            + CLI_checkarg(2, CLIARG_FLOAT)
-            + CLI_checkarg(3, CLIARG_FLOAT)
-            + CLI_checkarg(4, CLIARG_STR_NOT_IMG)
-            == 0)
+    if (0 + CLI_checkarg(1, CLIARG_IMG) + CLI_checkarg(2, CLIARG_FLOAT) + CLI_checkarg(3, CLIARG_FLOAT) +
+            CLI_checkarg(4, CLIARG_STR_NOT_IMG) ==
+        0)
     {
-        arith_image_trunc(
-            data.cmdargtoken[1].val.string,
-            data.cmdargtoken[2].val.numf,
-            data.cmdargtoken[3].val.numf,
-            data.cmdargtoken[4].val.string);
+        arith_image_trunc(data.cmdargtoken[1].val.string, data.cmdargtoken[2].val.numf, data.cmdargtoken[3].val.numf,
+                          data.cmdargtoken[4].val.string);
 
         return CLICMD_SUCCESS;
     }
@@ -60,12 +42,6 @@ static errno_t arith_image_trunc_cli()
     }
 }
 
-
-
-
-
-
-
 // ==========================================
 // Register CLI command(s)
 // ==========================================
@@ -73,46 +49,26 @@ static errno_t arith_image_trunc_cli()
 errno_t image_arith__im_f_f__im_addCLIcmd()
 {
 
-    RegisterCLIcommand(
-        "imtrunc",
-        __FILE__,
-        arith_image_trunc_cli,
-        "trucate pixel values",
-        "<input image> <min> <max> <output image>",
-        "imtrunc im 0.0 1.0 out",
-        "arith_image_trunc(const char *ID_name, double f1, double f2, const char *ID_out)");
-
+    RegisterCLIcommand("imtrunc", __FILE__, arith_image_trunc_cli, "trucate pixel values",
+                       "<input image> <min> <max> <output image>", "imtrunc im 0.0 1.0 out",
+                       "arith_image_trunc(const char *ID_name, double f1, double f2, const char *ID_out)");
 
     return RETURN_SUCCESS;
 }
 
-
-
-
-
-
-
-
-
-
-
-int arith_image_trunc(const char *ID_name, double f1, double f2,
-                      const char *ID_out)
+int arith_image_trunc(const char *ID_name, double f1, double f2, const char *ID_out)
 {
     arith_image_function_1ff_1(ID_name, f1, f2, ID_out, &Ptrunc);
-    return(0);
+    return (0);
 }
 
 int arith_image_trunc_inplace(const char *ID_name, double f1, double f2)
 {
     arith_image_function_1ff_1_inplace(ID_name, f1, f2, &Ptrunc);
-    return(0);
+    return (0);
 }
 int arith_image_trunc_inplace_byID(long ID, double f1, double f2)
 {
     arith_image_function_1ff_1_inplace_byID(ID, f1, f2, &Ptrunc);
-    return(0);
+    return (0);
 }
-
-
-
diff --git a/src/COREMOD_arith/image_arith__im_f_f__im.h b/src/COREMOD_arith/image_arith__im_f_f__im.h
index b78403e8..fe9c5603 100644
--- a/src/COREMOD_arith/image_arith__im_f_f__im.h
+++ b/src/COREMOD_arith/image_arith__im_f_f__im.h
@@ -2,15 +2,12 @@
  * @file    image_arith__im_f_f__im.h
  */
 
-
 errno_t image_arith__im_f_f__im_addCLIcmd();
 
-
 int arith_image_trunc_byID(long ID, double f1, double f2, long IDout);
 
 int arith_image_trunc_inplace_byID(long IDname, double f1, double f2);
 
-
 int arith_image_trunc(const char *ID_name, double f1, double f2, const char *ID_out);
 
 int arith_image_trunc_inplace(const char *ID_name, double f1, double f2);
diff --git a/src/COREMOD_arith/image_arith__im_im__im.c b/src/COREMOD_arith/image_arith__im_im__im.c
index 373dc1c1..533f9331 100644
--- a/src/COREMOD_arith/image_arith__im_im__im.c
+++ b/src/COREMOD_arith/image_arith__im_im__im.c
@@ -1,243 +1,195 @@
 /**
  * @file    image_arith__im_im__im.c
  * @brief   arith functions
- * 
+ *
  * input : image, image
  * output: image
  *
  */
 
-
 #include <math.h>
 
-
-#include "CommandLineInterface/CLIcore.h"
 #include "COREMOD_memory/COREMOD_memory.h"
+#include "CommandLineInterface/CLIcore.h"
 
 #include "imfunctions.h"
 #include "mathfuncs.h"
 
-
-
-
-int arith_image_fmod(const char *ID1_name, const char *ID2_name,
-                     const char *ID_out)
+int arith_image_fmod(const char *ID1_name, const char *ID2_name, const char *ID_out)
 {
     arith_image_function_2_1(ID1_name, ID2_name, ID_out, &Pfmod);
-    return(0);
+    return (0);
 }
 
-
-int arith_image_pow(const char *ID1_name, const char *ID2_name,
-                    const char *ID_out)
+int arith_image_pow(const char *ID1_name, const char *ID2_name, const char *ID_out)
 {
     arith_image_function_2_1(ID1_name, ID2_name, ID_out, &Ppow);
-    return(0);
+    return (0);
 }
 
-
-int arith_image_add(const char *ID1_name, const char *ID2_name,
-                    const char *ID_out)
+int arith_image_add(const char *ID1_name, const char *ID2_name, const char *ID_out)
 {
     arith_image_function_2_1(ID1_name, ID2_name, ID_out, &Padd);
-    return(0);
+    return (0);
 }
 
-
-int arith_image_sub(const char *ID1_name, const char *ID2_name,
-                    const char *ID_out)
+int arith_image_sub(const char *ID1_name, const char *ID2_name, const char *ID_out)
 {
     arith_image_function_2_1(ID1_name, ID2_name, ID_out, &Psub);
-    return(0);
+    return (0);
 }
 
-
-int arith_image_mult(const char *ID1_name, const char *ID2_name,
-                     const char *ID_out)
+int arith_image_mult(const char *ID1_name, const char *ID2_name, const char *ID_out)
 {
     arith_image_function_2_1(ID1_name, ID2_name, ID_out, &Pmult);
-    return(0);
+    return (0);
 }
 
-
-int arith_image_div(const char *ID1_name, const char *ID2_name,
-                    const char *ID_out)
+int arith_image_div(const char *ID1_name, const char *ID2_name, const char *ID_out)
 {
     arith_image_function_2_1(ID1_name, ID2_name, ID_out, &Pdiv);
-    return(0);
+    return (0);
 }
 
-
-int arith_image_minv(const char *ID1_name, const char *ID2_name,
-                     const char *ID_out)
+int arith_image_minv(const char *ID1_name, const char *ID2_name, const char *ID_out)
 {
     arith_image_function_2_1(ID1_name, ID2_name, ID_out, &Pminv);
-    return(0);
+    return (0);
 }
 
-
-int arith_image_maxv(const char *ID1_name, const char *ID2_name,
-                     const char *ID_out)
+int arith_image_maxv(const char *ID1_name, const char *ID2_name, const char *ID_out)
 {
     arith_image_function_2_1(ID1_name, ID2_name, ID_out, &Pmaxv);
-    return(0);
+    return (0);
 }
 
-
-int arith_image_testlt(const char *ID1_name, const char *ID2_name,
-                       const char *ID_out)
+int arith_image_testlt(const char *ID1_name, const char *ID2_name, const char *ID_out)
 {
     arith_image_function_2_1(ID1_name, ID2_name, ID_out, &Ptestlt);
-    return(0);
+    return (0);
 }
 
-
-int arith_image_testmt(const char *ID1_name, const char *ID2_name,
-                       const char *ID_out)
+int arith_image_testmt(const char *ID1_name, const char *ID2_name, const char *ID_out)
 {
     arith_image_function_2_1(ID1_name, ID2_name, ID_out, &Ptestmt);
-    return(0);
+    return (0);
 }
 
-
 int arith_image_fmod_inplace(const char *ID1_name, const char *ID2_name)
 {
     arith_image_function_2_1_inplace(ID1_name, ID2_name, &Pfmod);
-    return(0);
+    return (0);
 }
 
-
 int arith_image_pow_inplace(const char *ID1_name, const char *ID2_name)
 {
     arith_image_function_2_1_inplace(ID1_name, ID2_name, &Ppow);
-    return(0);
+    return (0);
 }
 
-
 int arith_image_add_inplace(const char *ID1_name, const char *ID2_name)
 {
     arith_image_function_2_1_inplace(ID1_name, ID2_name, &Padd);
-    return(0);
+    return (0);
 }
 
-
 int arith_image_sub_inplace(const char *ID1_name, const char *ID2_name)
 {
     arith_image_function_2_1_inplace(ID1_name, ID2_name, &Psub);
-    return(0);
+    return (0);
 }
 
-
 int arith_image_mult_inplace(const char *ID1_name, const char *ID2_name)
 {
     arith_image_function_2_1_inplace(ID1_name, ID2_name, &Pmult);
-    return(0);
+    return (0);
 }
 
-
 int arith_image_div_inplace(const char *ID1_name, const char *ID2_name)
 {
     arith_image_function_2_1_inplace(ID1_name, ID2_name, &Pdiv);
-    return(0);
+    return (0);
 }
 
-
 int arith_image_minv_inplace(const char *ID1_name, const char *ID2_name)
 {
     arith_image_function_2_1_inplace(ID1_name, ID2_name, &Pminv);
-    return(0);
+    return (0);
 }
 
-
 int arith_image_maxv_inplace(const char *ID1_name, const char *ID2_name)
 {
     arith_image_function_2_1_inplace(ID1_name, ID2_name, &Pmaxv);
-    return(0);
+    return (0);
 }
 
-
 int arith_image_testlt_inplace(const char *ID1_name, const char *ID2_name)
 {
     arith_image_function_2_1_inplace(ID1_name, ID2_name, &Ptestlt);
-    return(0);
+    return (0);
 }
 
-
 int arith_image_testmt_inplace(const char *ID1_name, const char *ID2_name)
 {
     arith_image_function_2_1_inplace(ID1_name, ID2_name, &Ptestmt);
-    return(0);
+    return (0);
 }
 
-
 int arith_image_fmod_inplace_byID(long ID1, long ID2)
 {
     arith_image_function_2_1_inplace_byID(ID1, ID2, &Pfmod);
-    return(0);
+    return (0);
 }
 
-
 int arith_image_pow_inplace_byID(long ID1, long ID2)
 {
     arith_image_function_2_1_inplace_byID(ID1, ID2, &Ppow);
-    return(0);
+    return (0);
 }
 
-
 int arith_image_add_inplace_byID(long ID1, long ID2)
 {
     arith_image_function_2_1_inplace_byID(ID1, ID2, &Padd);
-    return(0);
+    return (0);
 }
 
-
 int arith_image_sub_inplace_byID(long ID1, long ID2)
 {
     arith_image_function_2_1_inplace_byID(ID1, ID2, &Psub);
-    return(0);
+    return (0);
 }
 
-
 int arith_image_mult_inplace_byID(long ID1, long ID2)
 {
     arith_image_function_2_1_inplace_byID(ID1, ID2, &Pmult);
-    return(0);
+    return (0);
 }
 int arith_image_div_inplace_byID(long ID1, long ID2)
 {
     arith_image_function_2_1_inplace_byID(ID1, ID2, &Pdiv);
-    return(0);
+    return (0);
 }
 
-
 int arith_image_minv_inplace_byID(long ID1, long ID2)
 {
     arith_image_function_2_1_inplace_byID(ID1, ID2, &Pminv);
-    return(0);
+    return (0);
 }
 
-
 int arith_image_maxv_inplace_byID(long ID1, long ID2)
 {
     arith_image_function_2_1_inplace_byID(ID1, ID2, &Pmaxv);
-    return(0);
+    return (0);
 }
 
-
 int arith_image_testlt_inplace_byID(long ID1, long ID2)
 {
     arith_image_function_2_1_inplace_byID(ID1, ID2, &Ptestlt);
-    return(0);
+    return (0);
 }
 
-
 int arith_image_testmt_inplace_byID(long ID1, long ID2)
 {
     arith_image_function_2_1_inplace_byID(ID1, ID2, &Ptestmt);
-    return(0);
+    return (0);
 }
-
-
-
-
-
diff --git a/src/COREMOD_arith/image_arith__im_im__im.h b/src/COREMOD_arith/image_arith__im_im__im.h
index ad1b23e6..70da1493 100644
--- a/src/COREMOD_arith/image_arith__im_im__im.h
+++ b/src/COREMOD_arith/image_arith__im_im__im.h
@@ -3,16 +3,12 @@
  *
  */
 
-
 double Ptrunc(double a, double b, double c);
 
-
-
 /* ------------------------------------------------------------------------- */
 /* predefined functions    image, image  -> image                                                    */
 /* ------------------------------------------------------------------------- */
 
-
 int arith_image_fmod_byID(long ID1, long ID2, long IDout);
 int arith_image_pow_byID(long ID1, long ID2, const char *IDout);
 int arith_image_add_byID(long ID1, long ID2, long IDout);
@@ -30,24 +26,19 @@ int arith_image_mult(const char *ID1_name, const char *ID2_name, const char *ID_
 int arith_image_div(const char *ID1_name, const char *ID2_name, const char *ID_out);
 int arith_image_minv(const char *ID1_name, const char *ID2_name, const char *ID_out);
 int arith_image_maxv(const char *ID1_name, const char *ID2_name, const char *ID_out);
-int arith_image_testlt(const char *ID1_name, const char *ID2_name,
-                       const char *ID_out);
-int arith_image_testmt(const char *ID1_name, const char *ID2_name,
-                       const char *ID_out);                       
-
-
-
+int arith_image_testlt(const char *ID1_name, const char *ID2_name, const char *ID_out);
+int arith_image_testmt(const char *ID1_name, const char *ID2_name, const char *ID_out);
 
 int arith_image_fmod_inplace_byID(long ID1, long ID2);
 int arith_image_pow_inplace_byID(long ID1, long ID2);
 int arith_image_add_inplace_byID(long ID1, long ID2);
 int arith_image_sub_inplace_byID(long ID1, long ID2);
 int arith_image_mult_inplace_byID(long ID1, long ID2);
-int arith_image_div_inplace_byID(long ID1,  long ID2);
+int arith_image_div_inplace_byID(long ID1, long ID2);
 int arith_image_minv_inplace_byID(long ID1, long ID2);
 int arith_image_maxv_inplace_byID(long ID1, long ID2);
 
-int arith_image_fmod_inplace(const char *ID1_name, const char *ID2_name);  // ID1 is output
+int arith_image_fmod_inplace(const char *ID1_name, const char *ID2_name); // ID1 is output
 int arith_image_pow_inplace(const char *ID1_name, const char *ID2_name);
 int arith_image_add_inplace(const char *ID1_name, const char *ID2_name);
 int arith_image_sub_inplace(const char *ID1_name, const char *ID2_name);
diff --git a/src/COREMOD_arith/image_crop.c b/src/COREMOD_arith/image_crop.c
index 7d5f20b5..97f57182 100644
--- a/src/COREMOD_arith/image_crop.c
+++ b/src/COREMOD_arith/image_crop.c
@@ -5,51 +5,20 @@
  *
  */
 
-
-#include "CommandLineInterface/CLIcore.h"
 #include "COREMOD_memory/COREMOD_memory.h"
-
-
-
-
+#include "CommandLineInterface/CLIcore.h"
 
 // ==========================================
 // Forward declaration(s)
 // ==========================================
 
-imageID arith_image_crop(
-    const char *ID_name,
-    const char *ID_out,
-    long       *start,
-    long       *end,
-    long        cropdim
-);
-
-
-imageID arith_image_extract2D(
-    const char *in_name,
-    const char *out_name,
-    long        size_x,
-    long        size_y,
-    long        xstart,
-    long        ystart
-);
-
-
-
-imageID arith_image_extract3D(
-    const char *in_name,
-    const char *out_name,
-    long        size_x,
-    long        size_y,
-    long        size_z,
-    long        xstart,
-    long        ystart,
-    long        zstart
-);
-
+imageID arith_image_crop(const char *ID_name, const char *ID_out, long *start, long *end, long cropdim);
 
+imageID arith_image_extract2D(const char *in_name, const char *out_name, long size_x, long size_y, long xstart,
+                              long ystart);
 
+imageID arith_image_extract3D(const char *in_name, const char *out_name, long size_x, long size_y, long size_z,
+                              long xstart, long ystart, long zstart);
 
 // ==========================================
 // Command line interface wrapper function(s)
@@ -57,22 +26,13 @@ imageID arith_image_extract3D(
 
 static errno_t arith_image_extract2D__cli()
 {
-    if(0
-            + CLI_checkarg(1, CLIARG_IMG)
-            + CLI_checkarg(2, CLIARG_STR_NOT_IMG)
-            + CLI_checkarg(3, CLIARG_LONG)
-            + CLI_checkarg(4, CLIARG_LONG)
-            + CLI_checkarg(5, CLIARG_LONG)
-            + CLI_checkarg(6, CLIARG_LONG)
-            == 0)
+    if (0 + CLI_checkarg(1, CLIARG_IMG) + CLI_checkarg(2, CLIARG_STR_NOT_IMG) + CLI_checkarg(3, CLIARG_LONG) +
+            CLI_checkarg(4, CLIARG_LONG) + CLI_checkarg(5, CLIARG_LONG) + CLI_checkarg(6, CLIARG_LONG) ==
+        0)
     {
-        arith_image_extract2D(
-            data.cmdargtoken[1].val.string,
-            data.cmdargtoken[2].val.string,
-            data.cmdargtoken[3].val.numl,
-            data.cmdargtoken[4].val.numl,
-            data.cmdargtoken[5].val.numl,
-            data.cmdargtoken[6].val.numl);
+        arith_image_extract2D(data.cmdargtoken[1].val.string, data.cmdargtoken[2].val.string,
+                              data.cmdargtoken[3].val.numl, data.cmdargtoken[4].val.numl, data.cmdargtoken[5].val.numl,
+                              data.cmdargtoken[6].val.numl);
 
         return CLICMD_SUCCESS;
     }
@@ -82,29 +42,16 @@ static errno_t arith_image_extract2D__cli()
     }
 }
 
-
 static errno_t arith_image_extract3D__cli()
 {
-    if(0
-            + CLI_checkarg(1, CLIARG_IMG)
-            + CLI_checkarg(2, CLIARG_STR_NOT_IMG)
-            + CLI_checkarg(3, CLIARG_LONG)
-            + CLI_checkarg(4, CLIARG_LONG)
-            + CLI_checkarg(5, CLIARG_LONG)
-            + CLI_checkarg(6, CLIARG_LONG)
-            + CLI_checkarg(7, CLIARG_LONG)
-            + CLI_checkarg(8, CLIARG_LONG)
-            == 0)
+    if (0 + CLI_checkarg(1, CLIARG_IMG) + CLI_checkarg(2, CLIARG_STR_NOT_IMG) + CLI_checkarg(3, CLIARG_LONG) +
+            CLI_checkarg(4, CLIARG_LONG) + CLI_checkarg(5, CLIARG_LONG) + CLI_checkarg(6, CLIARG_LONG) +
+            CLI_checkarg(7, CLIARG_LONG) + CLI_checkarg(8, CLIARG_LONG) ==
+        0)
     {
-        arith_image_extract3D(
-            data.cmdargtoken[1].val.string,
-            data.cmdargtoken[2].val.string,
-            data.cmdargtoken[3].val.numl,
-            data.cmdargtoken[4].val.numl,
-            data.cmdargtoken[5].val.numl,
-            data.cmdargtoken[6].val.numl,
-            data.cmdargtoken[7].val.numl,
-            data.cmdargtoken[8].val.numl);
+        arith_image_extract3D(data.cmdargtoken[1].val.string, data.cmdargtoken[2].val.string,
+                              data.cmdargtoken[3].val.numl, data.cmdargtoken[4].val.numl, data.cmdargtoken[5].val.numl,
+                              data.cmdargtoken[6].val.numl, data.cmdargtoken[7].val.numl, data.cmdargtoken[8].val.numl);
 
         return CLICMD_SUCCESS;
     }
@@ -114,9 +61,6 @@ static errno_t arith_image_extract3D__cli()
     }
 }
 
-
-
-
 // ==========================================
 // Register CLI command(s)
 // ==========================================
@@ -124,49 +68,22 @@ static errno_t arith_image_extract3D__cli()
 errno_t image_crop_addCLIcmd()
 {
 
-    RegisterCLIcommand(
-        "extractim",
-        __FILE__,
-        arith_image_extract2D__cli,
-        "crop 2D image",
-        "<input image> <output image> <sizex> <sizey> <xstart> <ystart>",
-        "extractim im ime 256 256 100 100",
-        "int arith_image_extract2D(const char *in_name, const char *out_name, long size_x, long size_y, long xstart, long ystart)");
-
-
-
-    RegisterCLIcommand(
-        "extract3Dim",
-        __FILE__,
-        arith_image_extract3D__cli,
-        "crop 3D image",
-        "<input image> <output image> <sizex> <sizey> <sizez> <xstart> <ystart> <zstart>",
-        "extractim im ime 256 256 5 100 100 0",
-        "int arith_image_extract3D(const char *in_name, const char *out_name, long size_x, long size_y, long size_z, long xstart, long ystart, long zstart)");
+    RegisterCLIcommand("extractim", __FILE__, arith_image_extract2D__cli, "crop 2D image",
+                       "<input image> <output image> <sizex> <sizey> <xstart> <ystart>",
+                       "extractim im ime 256 256 100 100",
+                       "int arith_image_extract2D(const char *in_name, const char *out_name, long size_x, long size_y, "
+                       "long xstart, long ystart)");
 
+    RegisterCLIcommand("extract3Dim", __FILE__, arith_image_extract3D__cli, "crop 3D image",
+                       "<input image> <output image> <sizex> <sizey> <sizez> <xstart> <ystart> <zstart>",
+                       "extractim im ime 256 256 5 100 100 0",
+                       "int arith_image_extract3D(const char *in_name, const char *out_name, long size_x, long size_y, "
+                       "long size_z, long xstart, long ystart, long zstart)");
 
     return RETURN_SUCCESS;
 }
 
-
-
-
-
-
-
-
-
-
-
-
-
-imageID arith_image_crop(
-    const char *ID_name,
-    const char *ID_out,
-    long       *start,
-    long       *end,
-    long        cropdim
-)
+imageID arith_image_crop(const char *ID_name, const char *ID_out, long *start, long *end, long cropdim)
 {
     long naxis;
     imageID IDin;
@@ -179,14 +96,14 @@ imageID arith_image_crop(
     long start_c[3];
     long end_c[3];
 
-    for(i = 0; i < 3; i++)
+    for (i = 0; i < 3; i++)
     {
         start_c[i] = 0;
         end_c[i] = 0;
     }
 
     IDin = image_ID(ID_name);
-    if(IDin == -1)
+    if (IDin == -1)
     {
         PRINT_ERROR("Missing input image = %s", ID_name);
         list_image_ID();
@@ -194,20 +111,20 @@ imageID arith_image_crop(
     }
 
     naxis = data.image[IDin].md[0].naxis;
-    if(naxis < 1)
+    if (naxis < 1)
     {
         PRINT_ERROR("naxis < 1");
         exit(0);
     }
-    naxes = (uint32_t *) malloc(sizeof(uint32_t) * naxis);
-    if(naxes == NULL)
+    naxes = (uint32_t *)malloc(sizeof(uint32_t) * naxis);
+    if (naxes == NULL)
     {
         PRINT_ERROR("malloc() error, naxis = %ld", naxis);
         exit(0);
     }
 
-    naxesout  = (uint32_t *) malloc(sizeof(uint32_t) * naxis);
-    if(naxesout == NULL)
+    naxesout = (uint32_t *)malloc(sizeof(uint32_t) * naxis);
+    if (naxesout == NULL)
     {
         PRINT_ERROR("malloc() error");
         exit(0);
@@ -217,150 +134,145 @@ imageID arith_image_crop(
 
     naxes[0] = 0;
     naxesout[0] = 0;
-    for(i = 0; i < naxis; i++)
+    for (i = 0; i < naxis; i++)
     {
         naxes[i] = data.image[IDin].md[0].size[i];
         naxesout[i] = end[i] - start[i];
     }
-     create_image_ID(ID_out, naxis, naxesout, datatype, data.SHARED_DFT,
-                            data.NBKEYWORD_DFT, 0, &IDout);
+    create_image_ID(ID_out, naxis, naxesout, datatype, data.SHARED_DFT, data.NBKEYWORD_DFT, 0, &IDout);
 
     start_c[0] = start[0];
-    if(start_c[0] < 0)
+    if (start_c[0] < 0)
     {
         start_c[0] = 0;
     }
     end_c[0] = end[0];
-    if(end_c[0] > naxes[0])
+    if (end_c[0] > naxes[0])
     {
         end_c[0] = naxes[0];
     }
-    if(naxis > 1)
+    if (naxis > 1)
     {
         start_c[1] = start[1];
-        if(start_c[1] < 0)
+        if (start_c[1] < 0)
         {
             start_c[1] = 0;
         }
         end_c[1] = end[1];
-        if(end_c[1] > naxes[1])
+        if (end_c[1] > naxes[1])
         {
             end_c[1] = naxes[1];
         }
     }
-    if(naxis > 2)
+    if (naxis > 2)
     {
         start_c[2] = start[2];
-        if(start_c[2] < 0)
+        if (start_c[2] < 0)
         {
             start_c[2] = 0;
         }
         end_c[2] = end[2];
-        if(end_c[2] > naxes[2])
+        if (end_c[2] > naxes[2])
         {
             end_c[2] = naxes[2];
         }
     }
 
-
     printf("CROP: \n");
-    for(i = 0; i < 3; i++)
+    for (i = 0; i < 3; i++)
     {
         printf("axis %ld: %ld -> %ld\n", i, start_c[i], end_c[i]);
     }
 
-
-    if(cropdim != naxis)
+    if (cropdim != naxis)
     {
-        printf("Error (arith_image_crop): cropdim [%ld] and naxis [%ld] are different\n",
-               cropdim, naxis);
+        printf("Error (arith_image_crop): cropdim [%ld] and naxis [%ld] are different\n", cropdim, naxis);
     }
 
-
-    if(naxis == 1)
+    if (naxis == 1)
     {
-        if(datatype == _DATATYPE_FLOAT)
+        if (datatype == _DATATYPE_FLOAT)
         {
-            for(uint32_t ii = start_c[0]; ii < end_c[0]; ii++)
+            for (uint32_t ii = start_c[0]; ii < end_c[0]; ii++)
             {
                 data.image[IDout].array.F[ii - start[0]] = data.image[IDin].array.F[ii];
             }
         }
-        else if(datatype == _DATATYPE_DOUBLE)
+        else if (datatype == _DATATYPE_DOUBLE)
         {
-            for(uint32_t ii = start_c[0]; ii < end_c[0]; ii++)
+            for (uint32_t ii = start_c[0]; ii < end_c[0]; ii++)
             {
                 data.image[IDout].array.D[ii - start[0]] = data.image[IDin].array.D[ii];
             }
         }
-        else if(datatype == _DATATYPE_COMPLEX_FLOAT)
+        else if (datatype == _DATATYPE_COMPLEX_FLOAT)
         {
-            for(uint32_t ii = start_c[0]; ii < end_c[0]; ii++)
+            for (uint32_t ii = start_c[0]; ii < end_c[0]; ii++)
             {
                 data.image[IDout].array.CF[ii - start[0]].re = data.image[IDin].array.CF[ii].re;
                 data.image[IDout].array.CF[ii - start[0]].im = data.image[IDin].array.CF[ii].im;
             }
         }
-        else if(datatype == _DATATYPE_COMPLEX_DOUBLE)
+        else if (datatype == _DATATYPE_COMPLEX_DOUBLE)
         {
-            for(uint32_t ii = start_c[0]; ii < end_c[0]; ii++)
+            for (uint32_t ii = start_c[0]; ii < end_c[0]; ii++)
             {
                 data.image[IDout].array.CD[ii - start[0]].re = data.image[IDin].array.CD[ii].re;
                 data.image[IDout].array.CD[ii - start[0]].im = data.image[IDin].array.CD[ii].im;
             }
         }
-        else if(datatype == _DATATYPE_UINT8)
+        else if (datatype == _DATATYPE_UINT8)
         {
-            for(uint32_t ii = start_c[0]; ii < end_c[0]; ii++)
+            for (uint32_t ii = start_c[0]; ii < end_c[0]; ii++)
             {
                 data.image[IDout].array.UI8[ii - start[0]] = data.image[IDin].array.UI8[ii];
             }
         }
-        else if(datatype == _DATATYPE_UINT16)
+        else if (datatype == _DATATYPE_UINT16)
         {
-            for(uint32_t ii = start_c[0]; ii < end_c[0]; ii++)
+            for (uint32_t ii = start_c[0]; ii < end_c[0]; ii++)
             {
                 data.image[IDout].array.UI16[ii - start[0]] = data.image[IDin].array.UI16[ii];
             }
         }
-        else if(datatype == _DATATYPE_UINT32)
+        else if (datatype == _DATATYPE_UINT32)
         {
-            for(uint32_t ii = start_c[0]; ii < end_c[0]; ii++)
+            for (uint32_t ii = start_c[0]; ii < end_c[0]; ii++)
             {
                 data.image[IDout].array.UI32[ii - start[0]] = data.image[IDin].array.UI32[ii];
             }
         }
-        else if(datatype == _DATATYPE_UINT64)
+        else if (datatype == _DATATYPE_UINT64)
         {
-            for(uint32_t ii = start_c[0]; ii < end_c[0]; ii++)
+            for (uint32_t ii = start_c[0]; ii < end_c[0]; ii++)
             {
                 data.image[IDout].array.UI64[ii - start[0]] = data.image[IDin].array.UI64[ii];
             }
         }
-        else if(datatype == _DATATYPE_INT8)
+        else if (datatype == _DATATYPE_INT8)
         {
-            for(uint32_t ii = start_c[0]; ii < end_c[0]; ii++)
+            for (uint32_t ii = start_c[0]; ii < end_c[0]; ii++)
             {
                 data.image[IDout].array.SI8[ii - start[0]] = data.image[IDin].array.SI8[ii];
             }
         }
-        else if(datatype == _DATATYPE_INT16)
+        else if (datatype == _DATATYPE_INT16)
         {
-            for(uint32_t ii = start_c[0]; ii < end_c[0]; ii++)
+            for (uint32_t ii = start_c[0]; ii < end_c[0]; ii++)
             {
                 data.image[IDout].array.SI16[ii - start[0]] = data.image[IDin].array.SI16[ii];
             }
         }
-        else if(datatype == _DATATYPE_INT32)
+        else if (datatype == _DATATYPE_INT32)
         {
-            for(uint32_t ii = start_c[0]; ii < end_c[0]; ii++)
+            for (uint32_t ii = start_c[0]; ii < end_c[0]; ii++)
             {
                 data.image[IDout].array.SI32[ii - start[0]] = data.image[IDin].array.SI32[ii];
             }
         }
-        else if(datatype == _DATATYPE_INT64)
+        else if (datatype == _DATATYPE_INT64)
         {
-            for(uint32_t ii = start_c[0]; ii < end_c[0]; ii++)
+            for (uint32_t ii = start_c[0]; ii < end_c[0]; ii++)
             {
                 data.image[IDout].array.SI64[ii - start[0]] = data.image[IDin].array.SI64[ii];
             }
@@ -371,99 +283,99 @@ imageID arith_image_crop(
             exit(0);
         }
     }
-    if(naxis == 2)
+    if (naxis == 2)
     {
-        if(datatype == _DATATYPE_FLOAT)
+        if (datatype == _DATATYPE_FLOAT)
         {
-            for(uint32_t ii = start_c[0]; ii < end_c[0]; ii++)
-                for(uint32_t jj = start_c[1]; jj < end_c[1]; jj++)
-                    data.image[IDout].array.F[(jj - start[1])*naxesout[0] + (ii - start[0])]
-                        = data.image[IDin].array.F[jj * naxes[0] + ii];
+            for (uint32_t ii = start_c[0]; ii < end_c[0]; ii++)
+                for (uint32_t jj = start_c[1]; jj < end_c[1]; jj++)
+                    data.image[IDout].array.F[(jj - start[1]) * naxesout[0] + (ii - start[0])] =
+                        data.image[IDin].array.F[jj * naxes[0] + ii];
         }
-        else if(datatype == _DATATYPE_DOUBLE)
+        else if (datatype == _DATATYPE_DOUBLE)
         {
-            for(uint32_t ii = start_c[0]; ii < end_c[0]; ii++)
-                for(uint32_t jj = start_c[1]; jj < end_c[1]; jj++)
-                    data.image[IDout].array.D[(jj - start[1])*naxesout[0] + (ii - start[0])]
-                        = data.image[IDin].array.D[jj * naxes[0] + ii];
+            for (uint32_t ii = start_c[0]; ii < end_c[0]; ii++)
+                for (uint32_t jj = start_c[1]; jj < end_c[1]; jj++)
+                    data.image[IDout].array.D[(jj - start[1]) * naxesout[0] + (ii - start[0])] =
+                        data.image[IDin].array.D[jj * naxes[0] + ii];
         }
-        else if(datatype == _DATATYPE_COMPLEX_FLOAT)
+        else if (datatype == _DATATYPE_COMPLEX_FLOAT)
         {
-            for(uint32_t ii = start_c[0]; ii < end_c[0]; ii++)
-                for(uint32_t jj = start_c[1]; jj < end_c[1]; jj++)
+            for (uint32_t ii = start_c[0]; ii < end_c[0]; ii++)
+                for (uint32_t jj = start_c[1]; jj < end_c[1]; jj++)
                 {
-                    data.image[IDout].array.CF[(jj - start[1])*naxesout[0] + (ii - start[0])].re
-                        = data.image[IDin].array.CF[jj * naxes[0] + ii].re;
-                    data.image[IDout].array.CF[(jj - start[1])*naxesout[0] + (ii - start[0])].im
-                        = data.image[IDin].array.CF[jj * naxes[0] + ii].im;
+                    data.image[IDout].array.CF[(jj - start[1]) * naxesout[0] + (ii - start[0])].re =
+                        data.image[IDin].array.CF[jj * naxes[0] + ii].re;
+                    data.image[IDout].array.CF[(jj - start[1]) * naxesout[0] + (ii - start[0])].im =
+                        data.image[IDin].array.CF[jj * naxes[0] + ii].im;
                 }
         }
-        else if(datatype == _DATATYPE_COMPLEX_DOUBLE)
+        else if (datatype == _DATATYPE_COMPLEX_DOUBLE)
         {
-            for(uint32_t ii = start_c[0]; ii < end_c[0]; ii++)
-                for(uint32_t jj = start_c[1]; jj < end_c[1]; jj++)
+            for (uint32_t ii = start_c[0]; ii < end_c[0]; ii++)
+                for (uint32_t jj = start_c[1]; jj < end_c[1]; jj++)
                 {
-                    data.image[IDout].array.CD[(jj - start[1])*naxesout[0] + (ii - start[0])].re
-                        = data.image[IDin].array.CD[jj * naxes[0] + ii].re;
-                    data.image[IDout].array.CD[(jj - start[1])*naxesout[0] + (ii - start[0])].im
-                        = data.image[IDin].array.CD[jj * naxes[0] + ii].im;
+                    data.image[IDout].array.CD[(jj - start[1]) * naxesout[0] + (ii - start[0])].re =
+                        data.image[IDin].array.CD[jj * naxes[0] + ii].re;
+                    data.image[IDout].array.CD[(jj - start[1]) * naxesout[0] + (ii - start[0])].im =
+                        data.image[IDin].array.CD[jj * naxes[0] + ii].im;
                 }
         }
-        else if(datatype == _DATATYPE_UINT8)
+        else if (datatype == _DATATYPE_UINT8)
         {
-            for(uint32_t ii = start_c[0]; ii < end_c[0]; ii++)
-                for(uint32_t jj = start_c[1]; jj < end_c[1]; jj++)
-                    data.image[IDout].array.UI8[(jj - start[1])*naxesout[0] + (ii - start[0])]
-                        = data.image[IDin].array.UI8[jj * naxes[0] + ii];
+            for (uint32_t ii = start_c[0]; ii < end_c[0]; ii++)
+                for (uint32_t jj = start_c[1]; jj < end_c[1]; jj++)
+                    data.image[IDout].array.UI8[(jj - start[1]) * naxesout[0] + (ii - start[0])] =
+                        data.image[IDin].array.UI8[jj * naxes[0] + ii];
         }
-        else if(datatype == _DATATYPE_UINT16)
+        else if (datatype == _DATATYPE_UINT16)
         {
-            for(uint32_t ii = start_c[0]; ii < end_c[0]; ii++)
-                for(uint32_t jj = start_c[1]; jj < end_c[1]; jj++)
-                    data.image[IDout].array.UI16[(jj - start[1])*naxesout[0] + (ii - start[0])]
-                        = data.image[IDin].array.UI16[jj * naxes[0] + ii];
+            for (uint32_t ii = start_c[0]; ii < end_c[0]; ii++)
+                for (uint32_t jj = start_c[1]; jj < end_c[1]; jj++)
+                    data.image[IDout].array.UI16[(jj - start[1]) * naxesout[0] + (ii - start[0])] =
+                        data.image[IDin].array.UI16[jj * naxes[0] + ii];
         }
-        else if(datatype == _DATATYPE_UINT32)
+        else if (datatype == _DATATYPE_UINT32)
         {
-            for(uint32_t ii = start_c[0]; ii < end_c[0]; ii++)
-                for(uint32_t jj = start_c[1]; jj < end_c[1]; jj++)
-                    data.image[IDout].array.UI32[(jj - start[1])*naxesout[0] + (ii - start[0])]
-                        = data.image[IDin].array.UI32[jj * naxes[0] + ii];
+            for (uint32_t ii = start_c[0]; ii < end_c[0]; ii++)
+                for (uint32_t jj = start_c[1]; jj < end_c[1]; jj++)
+                    data.image[IDout].array.UI32[(jj - start[1]) * naxesout[0] + (ii - start[0])] =
+                        data.image[IDin].array.UI32[jj * naxes[0] + ii];
         }
-        else if(datatype == _DATATYPE_UINT64)
+        else if (datatype == _DATATYPE_UINT64)
         {
-            for(uint32_t ii = start_c[0]; ii < end_c[0]; ii++)
-                for(uint32_t jj = start_c[1]; jj < end_c[1]; jj++)
-                    data.image[IDout].array.UI64[(jj - start[1])*naxesout[0] + (ii - start[0])]
-                        = data.image[IDin].array.UI64[jj * naxes[0] + ii];
+            for (uint32_t ii = start_c[0]; ii < end_c[0]; ii++)
+                for (uint32_t jj = start_c[1]; jj < end_c[1]; jj++)
+                    data.image[IDout].array.UI64[(jj - start[1]) * naxesout[0] + (ii - start[0])] =
+                        data.image[IDin].array.UI64[jj * naxes[0] + ii];
         }
-        else if(datatype == _DATATYPE_INT8)
+        else if (datatype == _DATATYPE_INT8)
         {
-            for(uint32_t ii = start_c[0]; ii < end_c[0]; ii++)
-                for(uint32_t jj = start_c[1]; jj < end_c[1]; jj++)
-                    data.image[IDout].array.SI8[(jj - start[1])*naxesout[0] + (ii - start[0])]
-                        = data.image[IDin].array.SI8[jj * naxes[0] + ii];
+            for (uint32_t ii = start_c[0]; ii < end_c[0]; ii++)
+                for (uint32_t jj = start_c[1]; jj < end_c[1]; jj++)
+                    data.image[IDout].array.SI8[(jj - start[1]) * naxesout[0] + (ii - start[0])] =
+                        data.image[IDin].array.SI8[jj * naxes[0] + ii];
         }
-        else if(datatype == _DATATYPE_INT16)
+        else if (datatype == _DATATYPE_INT16)
         {
-            for(uint32_t ii = start_c[0]; ii < end_c[0]; ii++)
-                for(uint32_t jj = start_c[1]; jj < end_c[1]; jj++)
-                    data.image[IDout].array.SI16[(jj - start[1])*naxesout[0] + (ii - start[0])]
-                        = data.image[IDin].array.SI16[jj * naxes[0] + ii];
+            for (uint32_t ii = start_c[0]; ii < end_c[0]; ii++)
+                for (uint32_t jj = start_c[1]; jj < end_c[1]; jj++)
+                    data.image[IDout].array.SI16[(jj - start[1]) * naxesout[0] + (ii - start[0])] =
+                        data.image[IDin].array.SI16[jj * naxes[0] + ii];
         }
-        else if(datatype == _DATATYPE_INT32)
+        else if (datatype == _DATATYPE_INT32)
         {
-            for(uint32_t ii = start_c[0]; ii < end_c[0]; ii++)
-                for(uint32_t jj = start_c[1]; jj < end_c[1]; jj++)
-                    data.image[IDout].array.SI32[(jj - start[1])*naxesout[0] + (ii - start[0])]
-                        = data.image[IDin].array.SI32[jj * naxes[0] + ii];
+            for (uint32_t ii = start_c[0]; ii < end_c[0]; ii++)
+                for (uint32_t jj = start_c[1]; jj < end_c[1]; jj++)
+                    data.image[IDout].array.SI32[(jj - start[1]) * naxesout[0] + (ii - start[0])] =
+                        data.image[IDin].array.SI32[jj * naxes[0] + ii];
         }
-        else if(datatype == _DATATYPE_INT64)
+        else if (datatype == _DATATYPE_INT64)
         {
-            for(uint32_t ii = start_c[0]; ii < end_c[0]; ii++)
-                for(uint32_t jj = start_c[1]; jj < end_c[1]; jj++)
-                    data.image[IDout].array.SI64[(jj - start[1])*naxesout[0] + (ii - start[0])]
-                        = data.image[IDin].array.SI64[jj * naxes[0] + ii];
+            for (uint32_t ii = start_c[0]; ii < end_c[0]; ii++)
+                for (uint32_t jj = start_c[1]; jj < end_c[1]; jj++)
+                    data.image[IDout].array.SI64[(jj - start[1]) * naxesout[0] + (ii - start[0])] =
+                        data.image[IDin].array.SI64[jj * naxes[0] + ii];
         }
         else
         {
@@ -471,145 +383,153 @@ imageID arith_image_crop(
             exit(0);
         }
     }
-    if(naxis == 3)
+    if (naxis == 3)
     {
         //	printf("naxis = 3\n");
-        if(datatype == _DATATYPE_FLOAT)
+        if (datatype == _DATATYPE_FLOAT)
         {
-            for(uint32_t ii = start_c[0]; ii < end_c[0]; ii++)
-                for(uint32_t jj = start_c[1]; jj < end_c[1]; jj++)
-                    for(uint32_t kk = start_c[2]; kk < end_c[2]; kk++)
+            for (uint32_t ii = start_c[0]; ii < end_c[0]; ii++)
+                for (uint32_t jj = start_c[1]; jj < end_c[1]; jj++)
+                    for (uint32_t kk = start_c[2]; kk < end_c[2]; kk++)
                     {
-                        data.image[IDout].array.F[(kk - start[2])*naxesout[0]*naxesout[1] +
-                                                  (jj - start[1])*naxesout[0] + (ii - start[0])]
-                            = data.image[IDin].array.F[kk * naxes[0] * naxes[1] + jj * naxes[0] + ii];
+                        data.image[IDout].array.F[(kk - start[2]) * naxesout[0] * naxesout[1] +
+                                                  (jj - start[1]) * naxesout[0] + (ii - start[0])] =
+                            data.image[IDin].array.F[kk * naxes[0] * naxes[1] + jj * naxes[0] + ii];
                     }
         }
-        else if(datatype == _DATATYPE_DOUBLE)
+        else if (datatype == _DATATYPE_DOUBLE)
         {
-            for(uint32_t ii = start_c[0]; ii < end_c[0]; ii++)
-                for(uint32_t jj = start_c[1]; jj < end_c[1]; jj++)
-                    for(uint32_t kk = start_c[2]; kk < end_c[2]; kk++)
+            for (uint32_t ii = start_c[0]; ii < end_c[0]; ii++)
+                for (uint32_t jj = start_c[1]; jj < end_c[1]; jj++)
+                    for (uint32_t kk = start_c[2]; kk < end_c[2]; kk++)
                     {
-                        data.image[IDout].array.D[(kk - start[2])*naxesout[0]*naxesout[1] +
-                                                  (jj - start[1])*naxesout[0] + (ii - start[0])]
-                            = data.image[IDin].array.D[kk * naxes[0] * naxes[1] + jj * naxes[0] + ii];
+                        data.image[IDout].array.D[(kk - start[2]) * naxesout[0] * naxesout[1] +
+                                                  (jj - start[1]) * naxesout[0] + (ii - start[0])] =
+                            data.image[IDin].array.D[kk * naxes[0] * naxes[1] + jj * naxes[0] + ii];
                     }
         }
-        else if(datatype == _DATATYPE_COMPLEX_FLOAT)
+        else if (datatype == _DATATYPE_COMPLEX_FLOAT)
         {
-            for(uint32_t ii = start_c[0]; ii < end_c[0]; ii++)
-                for(uint32_t jj = start_c[1]; jj < end_c[1]; jj++)
-                    for(uint32_t kk = start_c[2]; kk < end_c[2]; kk++)
+            for (uint32_t ii = start_c[0]; ii < end_c[0]; ii++)
+                for (uint32_t jj = start_c[1]; jj < end_c[1]; jj++)
+                    for (uint32_t kk = start_c[2]; kk < end_c[2]; kk++)
                     {
-                        data.image[IDout].array.CF[(kk - start[2])*naxesout[0]*naxesout[1] +
-                                                   (jj - start[1])*naxesout[0] + (ii - start[0])].re
-                            = data.image[IDin].array.CF[kk * naxes[0] * naxes[1] + jj * naxes[0] + ii].re;
-                        data.image[IDout].array.CF[(kk - start[2])*naxesout[0]*naxesout[1] +
-                                                   (jj - start[1])*naxesout[0] + (ii - start[0])].im
-                            = data.image[IDin].array.CF[kk * naxes[0] * naxes[1] + jj * naxes[0] + ii].im;
+                        data.image[IDout]
+                            .array
+                            .CF[(kk - start[2]) * naxesout[0] * naxesout[1] + (jj - start[1]) * naxesout[0] +
+                                (ii - start[0])]
+                            .re = data.image[IDin].array.CF[kk * naxes[0] * naxes[1] + jj * naxes[0] + ii].re;
+                        data.image[IDout]
+                            .array
+                            .CF[(kk - start[2]) * naxesout[0] * naxesout[1] + (jj - start[1]) * naxesout[0] +
+                                (ii - start[0])]
+                            .im = data.image[IDin].array.CF[kk * naxes[0] * naxes[1] + jj * naxes[0] + ii].im;
                     }
         }
-        else if(datatype == _DATATYPE_COMPLEX_DOUBLE)
+        else if (datatype == _DATATYPE_COMPLEX_DOUBLE)
         {
-            for(uint32_t ii = start_c[0]; ii < end_c[0]; ii++)
-                for(uint32_t jj = start_c[1]; jj < end_c[1]; jj++)
-                    for(uint32_t kk = start_c[2]; kk < end_c[2]; kk++)
+            for (uint32_t ii = start_c[0]; ii < end_c[0]; ii++)
+                for (uint32_t jj = start_c[1]; jj < end_c[1]; jj++)
+                    for (uint32_t kk = start_c[2]; kk < end_c[2]; kk++)
                     {
-                        data.image[IDout].array.CD[(kk - start[2])*naxesout[0]*naxesout[1] +
-                                                   (jj - start[1])*naxesout[0] + (ii - start[0])].re
-                            = data.image[IDin].array.CD[kk * naxes[0] * naxes[1] + jj * naxes[0] + ii].re;
-                        data.image[IDout].array.CD[(kk - start[2])*naxesout[0]*naxesout[1] +
-                                                   (jj - start[1])*naxesout[0] + (ii - start[0])].im
-                            = data.image[IDin].array.CD[kk * naxes[0] * naxes[1] + jj * naxes[0] + ii].im;
+                        data.image[IDout]
+                            .array
+                            .CD[(kk - start[2]) * naxesout[0] * naxesout[1] + (jj - start[1]) * naxesout[0] +
+                                (ii - start[0])]
+                            .re = data.image[IDin].array.CD[kk * naxes[0] * naxes[1] + jj * naxes[0] + ii].re;
+                        data.image[IDout]
+                            .array
+                            .CD[(kk - start[2]) * naxesout[0] * naxesout[1] + (jj - start[1]) * naxesout[0] +
+                                (ii - start[0])]
+                            .im = data.image[IDin].array.CD[kk * naxes[0] * naxes[1] + jj * naxes[0] + ii].im;
                     }
         }
-        else if(datatype == _DATATYPE_UINT8)
+        else if (datatype == _DATATYPE_UINT8)
         {
-            for(uint32_t ii = start_c[0]; ii < end_c[0]; ii++)
-                for(uint32_t jj = start_c[1]; jj < end_c[1]; jj++)
-                    for(uint32_t kk = start_c[2]; kk < end_c[2]; kk++)
+            for (uint32_t ii = start_c[0]; ii < end_c[0]; ii++)
+                for (uint32_t jj = start_c[1]; jj < end_c[1]; jj++)
+                    for (uint32_t kk = start_c[2]; kk < end_c[2]; kk++)
                     {
-                        data.image[IDout].array.UI8[(kk - start[2])*naxesout[0]*naxesout[1] +
-                                                    (jj - start[1])*naxesout[0] + (ii - start[0])]
-                            = data.image[IDin].array.UI8[kk * naxes[0] * naxes[1] + jj * naxes[0] + ii];
+                        data.image[IDout].array.UI8[(kk - start[2]) * naxesout[0] * naxesout[1] +
+                                                    (jj - start[1]) * naxesout[0] + (ii - start[0])] =
+                            data.image[IDin].array.UI8[kk * naxes[0] * naxes[1] + jj * naxes[0] + ii];
                     }
         }
-        else if(datatype == _DATATYPE_UINT16)
+        else if (datatype == _DATATYPE_UINT16)
         {
-            for(uint32_t ii = start_c[0]; ii < end_c[0]; ii++)
-                for(uint32_t jj = start_c[1]; jj < end_c[1]; jj++)
-                    for(uint32_t kk = start_c[2]; kk < end_c[2]; kk++)
+            for (uint32_t ii = start_c[0]; ii < end_c[0]; ii++)
+                for (uint32_t jj = start_c[1]; jj < end_c[1]; jj++)
+                    for (uint32_t kk = start_c[2]; kk < end_c[2]; kk++)
                     {
-                        data.image[IDout].array.UI16[(kk - start[2])*naxesout[0]*naxesout[1] +
-                                                     (jj - start[1])*naxesout[0] + (ii - start[0])]
-                            = data.image[IDin].array.UI16[kk * naxes[0] * naxes[1] + jj * naxes[0] + ii];
+                        data.image[IDout].array.UI16[(kk - start[2]) * naxesout[0] * naxesout[1] +
+                                                     (jj - start[1]) * naxesout[0] + (ii - start[0])] =
+                            data.image[IDin].array.UI16[kk * naxes[0] * naxes[1] + jj * naxes[0] + ii];
                     }
         }
-        else if(datatype == _DATATYPE_UINT32)
+        else if (datatype == _DATATYPE_UINT32)
         {
-            for(uint32_t ii = start_c[0]; ii < end_c[0]; ii++)
-                for(uint32_t jj = start_c[1]; jj < end_c[1]; jj++)
-                    for(uint32_t kk = start_c[2]; kk < end_c[2]; kk++)
+            for (uint32_t ii = start_c[0]; ii < end_c[0]; ii++)
+                for (uint32_t jj = start_c[1]; jj < end_c[1]; jj++)
+                    for (uint32_t kk = start_c[2]; kk < end_c[2]; kk++)
                     {
-                        data.image[IDout].array.UI32[(kk - start[2])*naxesout[0]*naxesout[1] +
-                                                     (jj - start[1])*naxesout[0] + (ii - start[0])]
-                            = data.image[IDin].array.UI32[kk * naxes[0] * naxes[1] + jj * naxes[0] + ii];
+                        data.image[IDout].array.UI32[(kk - start[2]) * naxesout[0] * naxesout[1] +
+                                                     (jj - start[1]) * naxesout[0] + (ii - start[0])] =
+                            data.image[IDin].array.UI32[kk * naxes[0] * naxes[1] + jj * naxes[0] + ii];
                     }
         }
-        else if(datatype == _DATATYPE_UINT64)
+        else if (datatype == _DATATYPE_UINT64)
         {
-            for(uint32_t ii = start_c[0]; ii < end_c[0]; ii++)
-                for(uint32_t jj = start_c[1]; jj < end_c[1]; jj++)
-                    for(uint32_t kk = start_c[2]; kk < end_c[2]; kk++)
+            for (uint32_t ii = start_c[0]; ii < end_c[0]; ii++)
+                for (uint32_t jj = start_c[1]; jj < end_c[1]; jj++)
+                    for (uint32_t kk = start_c[2]; kk < end_c[2]; kk++)
                     {
-                        data.image[IDout].array.UI64[(kk - start[2])*naxesout[0]*naxesout[1] +
-                                                     (jj - start[1])*naxesout[0] + (ii - start[0])]
-                            = data.image[IDin].array.UI64[kk * naxes[0] * naxes[1] + jj * naxes[0] + ii];
+                        data.image[IDout].array.UI64[(kk - start[2]) * naxesout[0] * naxesout[1] +
+                                                     (jj - start[1]) * naxesout[0] + (ii - start[0])] =
+                            data.image[IDin].array.UI64[kk * naxes[0] * naxes[1] + jj * naxes[0] + ii];
                     }
         }
-        else if(datatype == _DATATYPE_INT8)
+        else if (datatype == _DATATYPE_INT8)
         {
-            for(uint32_t ii = start_c[0]; ii < end_c[0]; ii++)
-                for(uint32_t jj = start_c[1]; jj < end_c[1]; jj++)
-                    for(uint32_t kk = start_c[2]; kk < end_c[2]; kk++)
+            for (uint32_t ii = start_c[0]; ii < end_c[0]; ii++)
+                for (uint32_t jj = start_c[1]; jj < end_c[1]; jj++)
+                    for (uint32_t kk = start_c[2]; kk < end_c[2]; kk++)
                     {
-                        data.image[IDout].array.SI8[(kk - start[2])*naxesout[0]*naxesout[1] +
-                                                    (jj - start[1])*naxesout[0] + (ii - start[0])]
-                            = data.image[IDin].array.SI8[kk * naxes[0] * naxes[1] + jj * naxes[0] + ii];
+                        data.image[IDout].array.SI8[(kk - start[2]) * naxesout[0] * naxesout[1] +
+                                                    (jj - start[1]) * naxesout[0] + (ii - start[0])] =
+                            data.image[IDin].array.SI8[kk * naxes[0] * naxes[1] + jj * naxes[0] + ii];
                     }
         }
-        else if(datatype == _DATATYPE_INT16)
+        else if (datatype == _DATATYPE_INT16)
         {
-            for(uint32_t ii = start_c[0]; ii < end_c[0]; ii++)
-                for(uint32_t jj = start_c[1]; jj < end_c[1]; jj++)
-                    for(uint32_t kk = start_c[2]; kk < end_c[2]; kk++)
+            for (uint32_t ii = start_c[0]; ii < end_c[0]; ii++)
+                for (uint32_t jj = start_c[1]; jj < end_c[1]; jj++)
+                    for (uint32_t kk = start_c[2]; kk < end_c[2]; kk++)
                     {
-                        data.image[IDout].array.SI16[(kk - start[2])*naxesout[0]*naxesout[1] +
-                                                     (jj - start[1])*naxesout[0] + (ii - start[0])]
-                            = data.image[IDin].array.SI16[kk * naxes[0] * naxes[1] + jj * naxes[0] + ii];
+                        data.image[IDout].array.SI16[(kk - start[2]) * naxesout[0] * naxesout[1] +
+                                                     (jj - start[1]) * naxesout[0] + (ii - start[0])] =
+                            data.image[IDin].array.SI16[kk * naxes[0] * naxes[1] + jj * naxes[0] + ii];
                     }
         }
-        else if(datatype == _DATATYPE_INT32)
+        else if (datatype == _DATATYPE_INT32)
         {
-            for(uint32_t ii = start_c[0]; ii < end_c[0]; ii++)
-                for(uint32_t jj = start_c[1]; jj < end_c[1]; jj++)
-                    for(uint32_t kk = start_c[2]; kk < end_c[2]; kk++)
+            for (uint32_t ii = start_c[0]; ii < end_c[0]; ii++)
+                for (uint32_t jj = start_c[1]; jj < end_c[1]; jj++)
+                    for (uint32_t kk = start_c[2]; kk < end_c[2]; kk++)
                     {
-                        data.image[IDout].array.SI32[(kk - start[2])*naxesout[0]*naxesout[1] +
-                                                     (jj - start[1])*naxesout[0] + (ii - start[0])]
-                            = data.image[IDin].array.SI32[kk * naxes[0] * naxes[1] + jj * naxes[0] + ii];
+                        data.image[IDout].array.SI32[(kk - start[2]) * naxesout[0] * naxesout[1] +
+                                                     (jj - start[1]) * naxesout[0] + (ii - start[0])] =
+                            data.image[IDin].array.SI32[kk * naxes[0] * naxes[1] + jj * naxes[0] + ii];
                     }
         }
-        else if(datatype == _DATATYPE_INT64)
+        else if (datatype == _DATATYPE_INT64)
         {
-            for(uint32_t ii = start_c[0]; ii < end_c[0]; ii++)
-                for(uint32_t jj = start_c[1]; jj < end_c[1]; jj++)
-                    for(uint32_t kk = start_c[2]; kk < end_c[2]; kk++)
+            for (uint32_t ii = start_c[0]; ii < end_c[0]; ii++)
+                for (uint32_t jj = start_c[1]; jj < end_c[1]; jj++)
+                    for (uint32_t kk = start_c[2]; kk < end_c[2]; kk++)
                     {
-                        data.image[IDout].array.SI64[(kk - start[2])*naxesout[0]*naxesout[1] +
-                                                     (jj - start[1])*naxesout[0] + (ii - start[0])]
-                            = data.image[IDin].array.SI64[kk * naxes[0] * naxes[1] + jj * naxes[0] + ii];
+                        data.image[IDout].array.SI64[(kk - start[2]) * naxesout[0] * naxesout[1] +
+                                                     (jj - start[1]) * naxesout[0] + (ii - start[0])] =
+                            data.image[IDin].array.SI64[kk * naxes[0] * naxes[1] + jj * naxes[0] + ii];
                     }
         }
         else
@@ -625,45 +545,34 @@ imageID arith_image_crop(
     return IDout;
 }
 
-
-
-
-
-imageID arith_image_extract2D(
-    const char *in_name,
-    const char *out_name,
-    long        size_x,
-    long        size_y,
-    long        xstart,
-    long        ystart
-)
+imageID arith_image_extract2D(const char *in_name, const char *out_name, long size_x, long size_y, long xstart,
+                              long ystart)
 {
-    long    *start = NULL;
-    long    *end = NULL;
-    int      naxis;
-    imageID  ID;
-    imageID  IDout;
+    long *start = NULL;
+    long *end = NULL;
+    int naxis;
+    imageID ID;
+    imageID IDout;
     uint_fast8_t k;
 
     ID = image_ID(in_name);
     naxis = data.image[ID].md[0].naxis;
 
-
-    start = (long *) malloc(sizeof(long) * naxis);
-    if(start == NULL)
+    start = (long *)malloc(sizeof(long) * naxis);
+    if (start == NULL)
     {
         PRINT_ERROR("malloc() error");
         exit(0);
     }
 
-    end = (long *) malloc(sizeof(long) * naxis);
-    if(end == NULL)
+    end = (long *)malloc(sizeof(long) * naxis);
+    if (end == NULL)
     {
         PRINT_ERROR("malloc() error");
         exit(0);
     }
 
-    for(k = 0; k < naxis; k++)
+    for (k = 0; k < naxis; k++)
     {
         start[k] = 0;
         end[k] = data.image[ID].md[0].size[k];
@@ -681,41 +590,28 @@ imageID arith_image_extract2D(
     return IDout;
 }
 
-
-
-
-
-
-imageID arith_image_extract3D(
-    const char *in_name,
-    const char *out_name,
-    long        size_x,
-    long        size_y,
-    long        size_z,
-    long        xstart,
-    long        ystart,
-    long        zstart
-)
+imageID arith_image_extract3D(const char *in_name, const char *out_name, long size_x, long size_y, long size_z,
+                              long xstart, long ystart, long zstart)
 {
-    imageID   IDout;
-    long     *start = NULL;
-    long     *end = NULL;
+    imageID IDout;
+    long *start = NULL;
+    long *end = NULL;
 
-    start = (long *) malloc(sizeof(long) * 3);
-    if(start == NULL)
+    start = (long *)malloc(sizeof(long) * 3);
+    if (start == NULL)
     {
         PRINT_ERROR("malloc() error");
-        printf("params: %s %s %ld %ld %ld %ld %ld %ld \n", in_name, out_name, size_x,
-               size_y, size_z, xstart, ystart, zstart);
+        printf("params: %s %s %ld %ld %ld %ld %ld %ld \n", in_name, out_name, size_x, size_y, size_z, xstart, ystart,
+               zstart);
         exit(0);
     }
 
-    end = (long *) malloc(sizeof(long) * 3);
-    if(end == NULL)
+    end = (long *)malloc(sizeof(long) * 3);
+    if (end == NULL)
     {
         PRINT_ERROR("malloc() error");
-        printf("params: %s %s %ld %ld %ld %ld %ld %ld \n", in_name, out_name, size_x,
-               size_y, size_z, xstart, ystart, zstart);
+        printf("params: %s %s %ld %ld %ld %ld %ld %ld \n", in_name, out_name, size_x, size_y, size_z, xstart, ystart,
+               zstart);
         exit(0);
     }
 
diff --git a/src/COREMOD_arith/image_crop.h b/src/COREMOD_arith/image_crop.h
index 907eca79..f85488f6 100644
--- a/src/COREMOD_arith/image_crop.h
+++ b/src/COREMOD_arith/image_crop.h
@@ -3,41 +3,12 @@
  *
  */
 
-
-
 errno_t image_crop_addCLIcmd();
 
+imageID arith_image_crop(const char *ID_name, const char *ID_out, long *start, long *end, long cropdim);
 
+imageID arith_image_extract2D(const char *in_name, const char *out_name, long size_x, long size_y, long xstart,
+                              long ystart);
 
-imageID arith_image_crop(
-    const char *ID_name,
-    const char *ID_out,
-    long       *start,
-    long       *end,
-    long        cropdim
-);
-
-
-imageID arith_image_extract2D(
-    const char *in_name,
-    const char *out_name,
-    long        size_x,
-    long        size_y,
-    long        xstart,
-    long        ystart
-);
-
-
-
-imageID arith_image_extract3D(
-    const char *in_name,
-    const char *out_name,
-    long        size_x,
-    long        size_y,
-    long        size_z,
-    long        xstart,
-    long        ystart,
-    long        zstart
-);
-
-
+imageID arith_image_extract3D(const char *in_name, const char *out_name, long size_x, long size_y, long size_z,
+                              long xstart, long ystart, long zstart);
diff --git a/src/COREMOD_arith/image_dxdy.c b/src/COREMOD_arith/image_dxdy.c
index 356433c0..089c6c86 100644
--- a/src/COREMOD_arith/image_dxdy.c
+++ b/src/COREMOD_arith/image_dxdy.c
@@ -6,15 +6,10 @@
  */
 #include <assert.h>
 
-#include "CommandLineInterface/CLIcore.h"
 #include "COREMOD_memory/COREMOD_memory.h"
+#include "CommandLineInterface/CLIcore.h"
 
-
-
-imageID arith_image_dx(
-    const char *ID_name,
-    const char *IDout_name
-)
+imageID arith_image_dx(const char *ID_name, const char *IDout_name)
 {
     imageID ID;
     imageID IDout;
@@ -25,37 +20,33 @@ imageID arith_image_dx(
     ID = image_ID(ID_name);
     datatype = data.image[ID].md[0].datatype;
     naxis = data.image[ID].md[0].naxis;
-    if(naxis != 2)
+    if (naxis != 2)
     {
         PRINT_ERROR("Function only supports 2-D images\n");
         abort();
     }
 
     assert(naxis != 0);
-    naxes = (uint32_t *) malloc(sizeof(uint32_t) * naxis);
-    if(naxes == NULL)
+    naxes = (uint32_t *)malloc(sizeof(uint32_t) * naxis);
+    if (naxes == NULL)
     {
-        PRINT_ERROR("malloc error. size %d", (int) naxis);
+        PRINT_ERROR("malloc error. size %d", (int)naxis);
         abort();
     }
 
     naxes[0] = data.image[ID].md[0].size[0];
     naxes[1] = data.image[ID].md[0].size[1];
 
-    create_image_ID(IDout_name, naxis, naxes, datatype, data.SHARED_DFT,
-                            data.NBKEYWORD_DFT, 0, &IDout);
-    for(uint32_t jj = 0; jj < naxes[1]; jj++)
+    create_image_ID(IDout_name, naxis, naxes, datatype, data.SHARED_DFT, data.NBKEYWORD_DFT, 0, &IDout);
+    for (uint32_t jj = 0; jj < naxes[1]; jj++)
     {
-        for(uint32_t ii = 1; ii < naxes[0] - 1; ii++)
+        for (uint32_t ii = 1; ii < naxes[0] - 1; ii++)
             data.image[IDout].array.F[jj * naxes[0] + ii] =
-                (data.image[ID].array.F[jj * naxes[0] + ii + 1] - data.image[ID].array.F[jj *
-                        naxes[0] + ii - 1]) / 2.0;
+                (data.image[ID].array.F[jj * naxes[0] + ii + 1] - data.image[ID].array.F[jj * naxes[0] + ii - 1]) / 2.0;
         data.image[IDout].array.F[jj * naxes[0]] =
-            data.image[ID].array.F[jj * naxes[0] + 1] - data.image[ID].array.F[jj *
-                    naxes[0]];
+            data.image[ID].array.F[jj * naxes[0] + 1] - data.image[ID].array.F[jj * naxes[0]];
         data.image[IDout].array.F[jj * naxes[0] + naxes[0] - 1] =
-            data.image[ID].array.F[jj * naxes[0] + naxes[0] - 1] - data.image[ID].array.F[jj
-                    * naxes[0] + naxes[0] - 2];
+            data.image[ID].array.F[jj * naxes[0] + naxes[0] - 1] - data.image[ID].array.F[jj * naxes[0] + naxes[0] - 2];
     }
 
     free(naxes);
@@ -63,13 +54,7 @@ imageID arith_image_dx(
     return IDout;
 }
 
-
-
-
-imageID arith_image_dy(
-    const char *ID_name,
-    const char *IDout_name
-)
+imageID arith_image_dy(const char *ID_name, const char *IDout_name)
 {
     imageID ID;
     imageID IDout;
@@ -80,40 +65,38 @@ imageID arith_image_dy(
     ID = image_ID(ID_name);
     datatype = data.image[ID].md[0].datatype;
     naxis = data.image[ID].md[0].naxis;
-    if(naxis != 2)
+    if (naxis != 2)
     {
         PRINT_ERROR("Function only supports 2-D images\n");
         abort();
     }
 
     assert(naxis != 0);
-    naxes = (uint32_t *) malloc(sizeof(uint32_t) * naxis);
-    if(naxes == NULL)
+    naxes = (uint32_t *)malloc(sizeof(uint32_t) * naxis);
+    if (naxes == NULL)
     {
-        PRINT_ERROR("malloc error. size %d", (int) naxis);
+        PRINT_ERROR("malloc error. size %d", (int)naxis);
         abort();
     }
 
     naxes[0] = data.image[ID].md[0].size[0];
     naxes[1] = data.image[ID].md[0].size[1];
 
-    create_image_ID(IDout_name, naxis, naxes, datatype, data.SHARED_DFT,
-                            data.NBKEYWORD_DFT, 0, &IDout);
-    for(uint32_t ii = 0; ii < naxes[0]; ii++)
+    create_image_ID(IDout_name, naxis, naxes, datatype, data.SHARED_DFT, data.NBKEYWORD_DFT, 0, &IDout);
+    for (uint32_t ii = 0; ii < naxes[0]; ii++)
     {
-        for(uint32_t jj = 1; jj < naxes[1] - 1; jj++)
+        for (uint32_t jj = 1; jj < naxes[1] - 1; jj++)
         {
-            data.image[IDout].array.F[jj * naxes[0] + ii] = (data.image[ID].array.F[(jj + 1)
-                    * naxes[0] + ii] - data.image[ID].array.F[(jj - 1) * naxes[0] + ii]) / 2.0;
+            data.image[IDout].array.F[jj * naxes[0] + ii] =
+                (data.image[ID].array.F[(jj + 1) * naxes[0] + ii] - data.image[ID].array.F[(jj - 1) * naxes[0] + ii]) /
+                2.0;
         }
 
-        data.image[IDout].array.F[ii] = data.image[ID].array.F[1 * naxes[0] + ii] -
-                                        data.image[ID].array.F[ii];
+        data.image[IDout].array.F[ii] = data.image[ID].array.F[1 * naxes[0] + ii] - data.image[ID].array.F[ii];
 
-        data.image[IDout].array.F[(naxes[1] - 1)*naxes[0] + ii] =
+        data.image[IDout].array.F[(naxes[1] - 1) * naxes[0] + ii] =
             data.image[ID].array.F[(naxes[1] - 1) * naxes[0] + ii] -
             data.image[ID].array.F[(naxes[1] - 2) * naxes[0] + ii];
-
     }
 
     free(naxes);
diff --git a/src/COREMOD_arith/image_dxdy.h b/src/COREMOD_arith/image_dxdy.h
index f4571ee4..30db232c 100644
--- a/src/COREMOD_arith/image_dxdy.h
+++ b/src/COREMOD_arith/image_dxdy.h
@@ -2,7 +2,6 @@
  * @file    image_dxdy.c
  */
 
-
 imageID arith_image_dx(const char *ID_name, const char *IDout_name);
 
 imageID arith_image_dy(const char *ID_name, const char *IDout_name);
diff --git a/src/COREMOD_arith/image_merge3D.c b/src/COREMOD_arith/image_merge3D.c
index 9c7b9840..29395929 100644
--- a/src/COREMOD_arith/image_merge3D.c
+++ b/src/COREMOD_arith/image_merge3D.c
@@ -5,43 +5,25 @@
  *
  */
 
-
-#include "CommandLineInterface/CLIcore.h"
 #include "COREMOD_memory/COREMOD_memory.h"
-
-
-
-
+#include "CommandLineInterface/CLIcore.h"
 
 // ==========================================
 // Forward declaration(s)
 // ==========================================
 
-imageID arith_image_merge3D(
-    const char *ID_name1,
-    const char *ID_name2,
-    const char *IDout_name
-);
-
-
+imageID arith_image_merge3D(const char *ID_name1, const char *ID_name2, const char *IDout_name);
 
 // ==========================================
 // Command line interface wrapper function(s)
 // ==========================================
 
-
 static errno_t arith_image_merge3D_cli()
 {
-    if(0
-            + CLI_checkarg(1, CLIARG_IMG)
-            + CLI_checkarg(2, CLIARG_IMG)
-            + CLI_checkarg(3, CLIARG_STR_NOT_IMG)
-            == 0)
+    if (0 + CLI_checkarg(1, CLIARG_IMG) + CLI_checkarg(2, CLIARG_IMG) + CLI_checkarg(3, CLIARG_STR_NOT_IMG) == 0)
     {
-        arith_image_merge3D(
-            data.cmdargtoken[1].val.string,
-            data.cmdargtoken[2].val.string,
-            data.cmdargtoken[3].val.string);
+        arith_image_merge3D(data.cmdargtoken[1].val.string, data.cmdargtoken[2].val.string,
+                            data.cmdargtoken[3].val.string);
 
         return CLICMD_SUCCESS;
     }
@@ -51,9 +33,6 @@ static errno_t arith_image_merge3D_cli()
     }
 }
 
-
-
-
 // ==========================================
 // Register CLI command(s)
 // ==========================================
@@ -61,39 +40,15 @@ static errno_t arith_image_merge3D_cli()
 errno_t image_merge3D_addCLIcmd()
 {
 
-    RegisterCLIcommand(
-        "merge3d",
-        __FILE__,
-        arith_image_merge3D_cli,
-        "merge two 3D cubes into one",
-        "<input cube 1> <input cube 2> <output cube>",
-        "merge3d imc1 imc2 imcout",
-        "long arith_image_merge3D(const char *ID_name1, const char *ID_name2, const char *IDout_name)");
-
+    RegisterCLIcommand("merge3d", __FILE__, arith_image_merge3D_cli, "merge two 3D cubes into one",
+                       "<input cube 1> <input cube 2> <output cube>", "merge3d imc1 imc2 imcout",
+                       "long arith_image_merge3D(const char *ID_name1, const char *ID_name2, const char *IDout_name)");
 
     return RETURN_SUCCESS;
 }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 // join two cubes
-imageID arith_image_merge3D(
-    const char *ID_name1,
-    const char *ID_name2,
-    const char *IDout_name
-)
+imageID arith_image_merge3D(const char *ID_name1, const char *ID_name2, const char *IDout_name)
 {
     DEBUG_TRACE_FSTART();
 
@@ -109,7 +64,7 @@ imageID arith_image_merge3D(
     xsize = data.image[ID1].md[0].size[0];
     ysize = data.image[ID1].md[0].size[1];
 
-    if(data.image[ID1].md[0].naxis == 2)
+    if (data.image[ID1].md[0].naxis == 2)
     {
         zsize1 = 1;
     }
@@ -118,7 +73,7 @@ imageID arith_image_merge3D(
         zsize1 = data.image[ID1].md[0].size[2];
     }
 
-    if(data.image[ID2].md[0].naxis == 2)
+    if (data.image[ID2].md[0].naxis == 2)
     {
         zsize2 = 1;
     }
@@ -127,70 +82,57 @@ imageID arith_image_merge3D(
         zsize2 = data.image[ID2].md[0].size[2];
     }
 
-
-
-    if((xsize != data.image[ID2].md[0].size[0])
-            || (ysize != data.image[ID2].md[0].size[1]))
+    if ((xsize != data.image[ID2].md[0].size[0]) || (ysize != data.image[ID2].md[0].size[1]))
     {
         printf("ERROR: input images must have same x y sizes\n");
         printf("%s :  %u %u\n", ID_name1, xsize, ysize);
-        printf("%s :  %ld %ld\n", ID_name2, (long) data.image[ID2].md[0].size[0],
-               (long) data.image[ID2].md[0].size[1]);
+        printf("%s :  %ld %ld\n", ID_name2, (long)data.image[ID2].md[0].size[0], (long)data.image[ID2].md[0].size[1]);
         exit(0);
     }
 
-    uint32_t * sizearray = (uint32_t *) malloc(sizeof(uint32_t)*3);
+    uint32_t *sizearray = (uint32_t *)malloc(sizeof(uint32_t) * 3);
     sizearray[0] = xsize;
     sizearray[1] = xsize;
-    sizearray[2] = zsize1+zsize2;
+    sizearray[2] = zsize1 + zsize2;
 
     uint8_t datatype = data.image[ID1].md[0].datatype;
 
-    FUNC_CHECK_RETURN(
-        create_image_ID(IDout_name, 3, sizearray, datatype, 0, 0, 0, &IDout)
-    );
-
+    FUNC_CHECK_RETURN(create_image_ID(IDout_name, 3, sizearray, datatype, 0, 0, 0, &IDout));
 
     switch (datatype)
     {
-    case _DATATYPE_FLOAT :
-        mapv = (void *) data.image[IDout].array.F;
-        memcpy(mapv, (void *) data.image[ID1].array.F,
-               sizeof(float)*xsize * ysize * zsize1);
+    case _DATATYPE_FLOAT:
+        mapv = (void *)data.image[IDout].array.F;
+        memcpy(mapv, (void *)data.image[ID1].array.F, sizeof(float) * xsize * ysize * zsize1);
         mapv += sizeof(float) * xsize * ysize * zsize1;
-        memcpy(mapv, data.image[ID2].array.F, sizeof(float)*xsize * ysize * zsize2);
+        memcpy(mapv, data.image[ID2].array.F, sizeof(float) * xsize * ysize * zsize2);
         break;
 
-    case _DATATYPE_DOUBLE :
-        mapv = (void *) data.image[IDout].array.D;
-        memcpy(mapv, (void *) data.image[ID1].array.D,
-               sizeof(double)*xsize * ysize * zsize1);
+    case _DATATYPE_DOUBLE:
+        mapv = (void *)data.image[IDout].array.D;
+        memcpy(mapv, (void *)data.image[ID1].array.D, sizeof(double) * xsize * ysize * zsize1);
         mapv += sizeof(double) * xsize * ysize * zsize1;
-        memcpy(mapv, data.image[ID2].array.D, sizeof(double)*xsize * ysize * zsize2);
+        memcpy(mapv, data.image[ID2].array.D, sizeof(double) * xsize * ysize * zsize2);
         break;
 
-    case _DATATYPE_INT16 :
-        mapv = (void *) data.image[IDout].array.SI16;
-        memcpy(mapv, (void *) data.image[ID1].array.SI16,
-               sizeof(int16_t)*xsize * ysize * zsize1);
+    case _DATATYPE_INT16:
+        mapv = (void *)data.image[IDout].array.SI16;
+        memcpy(mapv, (void *)data.image[ID1].array.SI16, sizeof(int16_t) * xsize * ysize * zsize1);
         mapv += sizeof(int16_t) * xsize * ysize * zsize1;
-        memcpy(mapv, data.image[ID2].array.SI16, sizeof(int16_t)*xsize * ysize * zsize2);
+        memcpy(mapv, data.image[ID2].array.SI16, sizeof(int16_t) * xsize * ysize * zsize2);
         break;
 
-    case _DATATYPE_UINT16 :
-        mapv = (void *) data.image[IDout].array.UI16;
-        memcpy(mapv, (void *) data.image[ID1].array.UI16,
-               sizeof(uint16_t)*xsize * ysize * zsize1);
+    case _DATATYPE_UINT16:
+        mapv = (void *)data.image[IDout].array.UI16;
+        memcpy(mapv, (void *)data.image[ID1].array.UI16, sizeof(uint16_t) * xsize * ysize * zsize1);
         mapv += sizeof(uint16_t) * xsize * ysize * zsize1;
-        memcpy(mapv, data.image[ID2].array.UI16, sizeof(uint16_t)*xsize * ysize * zsize2);
+        memcpy(mapv, data.image[ID2].array.UI16, sizeof(uint16_t) * xsize * ysize * zsize2);
         break;
 
     default:
         printf("dataypte not supported\n");
     }
 
-
-
     DEBUG_TRACE_FEXIT();
     return IDout;
 }
diff --git a/src/COREMOD_arith/image_merge3D.h b/src/COREMOD_arith/image_merge3D.h
index 19c9e3f7..f8d71e7f 100644
--- a/src/COREMOD_arith/image_merge3D.h
+++ b/src/COREMOD_arith/image_merge3D.h
@@ -3,12 +3,6 @@
  *
  */
 
-
 errno_t image_merge3D_addCLIcmd();
 
-
-imageID arith_image_merge3D(
-    const char *ID_name1,
-    const char *ID_name2,
-    const char *IDout_name
-);
+imageID arith_image_merge3D(const char *ID_name1, const char *ID_name2, const char *IDout_name);
diff --git a/src/COREMOD_arith/image_stats.c b/src/COREMOD_arith/image_stats.c
index 47fa44b4..ede383c1 100644
--- a/src/COREMOD_arith/image_stats.c
+++ b/src/COREMOD_arith/image_stats.c
@@ -5,19 +5,14 @@
  *
  */
 
-
-#include "CommandLineInterface/CLIcore.h"
 #include "COREMOD_memory/COREMOD_memory.h"
+#include "CommandLineInterface/CLIcore.h"
 
 #include "COREMOD_tools/COREMOD_tools.h"
 
 #include "image_total.h"
 
-
-
-double arith_image_mean(
-    const char *ID_name
-)
+double arith_image_mean(const char *ID_name)
 {
     double value;
     imageID ID;
@@ -26,15 +21,10 @@ double arith_image_mean(
 
     value = (double)(arith_image_total(ID_name) / data.image[ID].md[0].nelement);
 
-    return(value);
+    return (value);
 }
 
-
-
-
-double arith_image_min(
-    const char *ID_name
-)
+double arith_image_min(const char *ID_name)
 {
     imageID ID;
     uint64_t nelement;
@@ -46,33 +36,32 @@ double arith_image_min(
 
     nelement = data.image[ID].md[0].nelement;
 
-
-    if(datatype == _DATATYPE_FLOAT)
+    if (datatype == _DATATYPE_FLOAT)
     {
         float value;
 
         value = data.image[ID].array.F[0];
-        for(uint64_t ii = 0; ii < nelement; ii++)
+        for (uint64_t ii = 0; ii < nelement; ii++)
         {
             float value1 = data.image[ID].array.F[ii];
-            if(value1 < value)
+            if (value1 < value)
             {
                 value = value1;
             }
         }
         OK = 1;
-        return ((double) value);
+        return ((double)value);
     }
 
-    if(datatype == _DATATYPE_DOUBLE)
+    if (datatype == _DATATYPE_DOUBLE)
     {
         double value;
 
         value = data.image[ID].array.D[0];
-        for(uint64_t ii = 0; ii < nelement; ii++)
+        for (uint64_t ii = 0; ii < nelement; ii++)
         {
             double value1 = data.image[ID].array.D[ii];
-            if(value1 < value)
+            if (value1 < value)
             {
                 value = value1;
             }
@@ -81,195 +70,189 @@ double arith_image_min(
         return (value);
     }
 
-    if(datatype == _DATATYPE_UINT8)
+    if (datatype == _DATATYPE_UINT8)
     {
         uint8_t value;
 
         value = data.image[ID].array.UI8[0];
-        for(uint64_t ii = 0; ii < nelement; ii++)
+        for (uint64_t ii = 0; ii < nelement; ii++)
         {
             uint8_t value1 = data.image[ID].array.UI8[ii];
-            if(value1 < value)
+            if (value1 < value)
             {
                 value = value1;
             }
         }
         OK = 1;
-        return ((double) value);
+        return ((double)value);
     }
 
-    if(datatype == _DATATYPE_UINT16)
+    if (datatype == _DATATYPE_UINT16)
     {
         uint16_t value;
 
         value = data.image[ID].array.UI16[0];
-        for(uint64_t ii = 0; ii < nelement; ii++)
+        for (uint64_t ii = 0; ii < nelement; ii++)
         {
             uint16_t value1 = data.image[ID].array.UI16[ii];
-            if(value1 < value)
+            if (value1 < value)
             {
                 value = value1;
             }
         }
         OK = 1;
-        return ((double) value);
+        return ((double)value);
     }
 
-    if(datatype == _DATATYPE_UINT32)
+    if (datatype == _DATATYPE_UINT32)
     {
         uint32_t value;
 
         value = data.image[ID].array.UI32[0];
-        for(uint64_t ii = 0; ii < nelement; ii++)
+        for (uint64_t ii = 0; ii < nelement; ii++)
         {
             uint32_t value1 = data.image[ID].array.UI32[ii];
-            if(value1 < value)
+            if (value1 < value)
             {
                 value = value1;
             }
         }
         OK = 1;
-        return ((double) value);
+        return ((double)value);
     }
 
-    if(datatype == _DATATYPE_UINT64)
+    if (datatype == _DATATYPE_UINT64)
     {
         uint64_t value;
 
         value = data.image[ID].array.UI64[0];
-        for(uint64_t ii = 0; ii < nelement; ii++)
+        for (uint64_t ii = 0; ii < nelement; ii++)
         {
             uint64_t value1 = data.image[ID].array.UI64[ii];
-            if(value1 < value)
+            if (value1 < value)
             {
                 value = value1;
             }
         }
         OK = 1;
-        return ((double) value);
+        return ((double)value);
     }
 
-    if(datatype == _DATATYPE_INT8)
+    if (datatype == _DATATYPE_INT8)
     {
         int8_t value;
 
         value = data.image[ID].array.SI8[0];
-        for(uint64_t ii = 0; ii < nelement; ii++)
+        for (uint64_t ii = 0; ii < nelement; ii++)
         {
             int8_t value1 = data.image[ID].array.SI8[ii];
-            if(value1 < value)
+            if (value1 < value)
             {
                 value = value1;
             }
         }
         OK = 1;
-        return ((double) value);
+        return ((double)value);
     }
 
-    if(datatype == _DATATYPE_INT16)
+    if (datatype == _DATATYPE_INT16)
     {
         int16_t value;
 
-        value = (double) data.image[ID].array.SI16[0];
-        for(uint64_t ii = 0; ii < nelement; ii++)
+        value = (double)data.image[ID].array.SI16[0];
+        for (uint64_t ii = 0; ii < nelement; ii++)
         {
             int16_t value1 = data.image[ID].array.SI16[ii];
-            if(value1 < value)
+            if (value1 < value)
             {
                 value = value1;
             }
         }
         OK = 1;
-        return ((double) value);
+        return ((double)value);
     }
 
-    if(datatype == _DATATYPE_INT32)
+    if (datatype == _DATATYPE_INT32)
     {
         int32_t value;
 
         value = data.image[ID].array.SI32[0];
-        for(uint64_t ii = 0; ii < nelement; ii++)
+        for (uint64_t ii = 0; ii < nelement; ii++)
         {
             int32_t value1 = data.image[ID].array.SI32[ii];
-            if(value1 < value)
+            if (value1 < value)
             {
                 value = value1;
             }
         }
         OK = 1;
-        return ((double) value);
+        return ((double)value);
     }
 
-    if(datatype == _DATATYPE_INT64)
+    if (datatype == _DATATYPE_INT64)
     {
         int64_t value;
 
         value = data.image[ID].array.SI64[0];
-        for(uint64_t ii = 0; ii < nelement; ii++)
+        for (uint64_t ii = 0; ii < nelement; ii++)
         {
             int64_t value1 = data.image[ID].array.SI64[ii];
-            if(value1 < value)
+            if (value1 < value)
             {
                 value = value1;
             }
         }
         OK = 1;
-        return ((double) value);
+        return ((double)value);
     }
 
-    if(OK == 0)
+    if (OK == 0)
     {
         printf("Error : Invalid data format for arith_image_min\n");
     }
 
-    return(0);
+    return (0);
 }
 
-
-
-
-
-double arith_image_max(
-    const char *ID_name
-)
+double arith_image_max(const char *ID_name)
 {
     imageID ID;
-    long    ii;
-    long    nelement;
+    long ii;
+    long nelement;
     uint8_t datatype;
-    int     OK = 0;
+    int OK = 0;
 
     ID = image_ID(ID_name);
     datatype = data.image[ID].md[0].datatype;
 
     nelement = data.image[ID].md[0].nelement;
 
-    if(datatype == _DATATYPE_FLOAT)
+    if (datatype == _DATATYPE_FLOAT)
     {
         float value, value1;
 
         value = data.image[ID].array.F[0];
-        for(ii = 0; ii < nelement; ii++)
+        for (ii = 0; ii < nelement; ii++)
         {
             value1 = data.image[ID].array.F[ii];
-            if(value1 > value)
+            if (value1 > value)
             {
                 value = value1;
             }
         }
         OK = 1;
-        return ((double) value);
+        return ((double)value);
     }
 
-    if(datatype == _DATATYPE_DOUBLE)
+    if (datatype == _DATATYPE_DOUBLE)
     {
         double value, value1;
 
         value = data.image[ID].array.D[0];
-        for(ii = 0; ii < nelement; ii++)
+        for (ii = 0; ii < nelement; ii++)
         {
             value1 = data.image[ID].array.D[ii];
-            if(value1 > value)
+            if (value1 > value)
             {
                 value = value1;
             }
@@ -278,357 +261,343 @@ double arith_image_max(
         return (value);
     }
 
-    if(datatype == _DATATYPE_UINT8)
+    if (datatype == _DATATYPE_UINT8)
     {
         uint8_t value, value1;
 
         value = data.image[ID].array.UI8[0];
-        for(ii = 0; ii < nelement; ii++)
+        for (ii = 0; ii < nelement; ii++)
         {
             value1 = data.image[ID].array.UI8[ii];
-            if(value1 > value)
+            if (value1 > value)
             {
                 value = value1;
             }
         }
         OK = 1;
-        return ((double) value);
+        return ((double)value);
     }
 
-    if(datatype == _DATATYPE_UINT16)
+    if (datatype == _DATATYPE_UINT16)
     {
         uint16_t value, value1;
 
         value = data.image[ID].array.UI16[0];
-        for(ii = 0; ii < nelement; ii++)
+        for (ii = 0; ii < nelement; ii++)
         {
             value1 = data.image[ID].array.UI16[ii];
-            if(value1 > value)
+            if (value1 > value)
             {
                 value = value1;
             }
         }
         OK = 1;
-        return ((double) value);
+        return ((double)value);
     }
 
-    if(datatype == _DATATYPE_UINT32)
+    if (datatype == _DATATYPE_UINT32)
     {
         uint32_t value, value1;
 
         value = data.image[ID].array.UI32[0];
-        for(ii = 0; ii < nelement; ii++)
+        for (ii = 0; ii < nelement; ii++)
         {
             value1 = data.image[ID].array.UI32[ii];
-            if(value1 > value)
+            if (value1 > value)
             {
                 value = value1;
             }
         }
         OK = 1;
-        return ((double) value);
+        return ((double)value);
     }
 
-    if(datatype == _DATATYPE_UINT64)
+    if (datatype == _DATATYPE_UINT64)
     {
         uint64_t value, value1;
 
         value = data.image[ID].array.UI64[0];
-        for(ii = 0; ii < nelement; ii++)
+        for (ii = 0; ii < nelement; ii++)
         {
             value1 = data.image[ID].array.UI64[ii];
-            if(value1 > value)
+            if (value1 > value)
             {
                 value = value1;
             }
         }
         OK = 1;
-        return ((double) value);
+        return ((double)value);
     }
 
-    if(datatype == _DATATYPE_INT8)
+    if (datatype == _DATATYPE_INT8)
     {
         int8_t value, value1;
 
         value = data.image[ID].array.SI8[0];
-        for(ii = 0; ii < nelement; ii++)
+        for (ii = 0; ii < nelement; ii++)
         {
             value1 = data.image[ID].array.SI8[ii];
-            if(value1 > value)
+            if (value1 > value)
             {
                 value = value1;
             }
         }
         OK = 1;
-        return ((double) value);
+        return ((double)value);
     }
 
-    if(datatype == _DATATYPE_INT16)
+    if (datatype == _DATATYPE_INT16)
     {
         int16_t value, value1;
 
-        value = (double) data.image[ID].array.SI16[0];
-        for(ii = 0; ii < nelement; ii++)
+        value = (double)data.image[ID].array.SI16[0];
+        for (ii = 0; ii < nelement; ii++)
         {
             value1 = data.image[ID].array.SI16[ii];
-            if(value1 > value)
+            if (value1 > value)
             {
                 value = value1;
             }
         }
         OK = 1;
-        return ((double) value);
+        return ((double)value);
     }
 
-    if(datatype == _DATATYPE_INT32)
+    if (datatype == _DATATYPE_INT32)
     {
         int32_t value, value1;
 
         value = data.image[ID].array.SI32[0];
-        for(ii = 0; ii < nelement; ii++)
+        for (ii = 0; ii < nelement; ii++)
         {
             value1 = data.image[ID].array.SI32[ii];
-            if(value1 > value)
+            if (value1 > value)
             {
                 value = value1;
             }
         }
         OK = 1;
-        return ((double) value);
+        return ((double)value);
     }
 
-    if(datatype == _DATATYPE_INT64)
+    if (datatype == _DATATYPE_INT64)
     {
         int64_t value, value1;
 
         value = data.image[ID].array.SI64[0];
-        for(ii = 0; ii < nelement; ii++)
+        for (ii = 0; ii < nelement; ii++)
         {
             value1 = data.image[ID].array.SI64[ii];
-            if(value1 > value)
+            if (value1 > value)
             {
                 value = value1;
             }
         }
         OK = 1;
-        return ((double) value);
+        return ((double)value);
     }
-    if(OK == 0)
+    if (OK == 0)
     {
         printf("Error : Invalid data format for arith_image_max\n");
     }
 
-    return(0);
+    return (0);
 }
 
-
-
-
-
-double arith_image_percentile(
-    const char *ID_name,
-    double      fraction
-)
+double arith_image_percentile(const char *ID_name, double fraction)
 {
-    imageID  ID;
-    long     ii;
-    double   value = 0;
-    long    *arrayL = NULL;
-    float   *arrayF = NULL;
-    double  *arrayD = NULL;
+    imageID ID;
+    long ii;
+    double value = 0;
+    long *arrayL = NULL;
+    float *arrayF = NULL;
+    double *arrayD = NULL;
     unsigned short *arrayU = NULL;
-    long     nelement;
-    uint8_t  datatype;
-    int      atypeOK = 1;
+    long nelement;
+    uint8_t datatype;
+    int atypeOK = 1;
 
     ID = image_ID(ID_name);
     datatype = data.image[ID].md[0].datatype;
 
     nelement = data.image[ID].md[0].nelement;
 
-
-    switch(datatype)
+    switch (datatype)
     {
 
-        case _DATATYPE_FLOAT :
-            arrayF = (float *) malloc(sizeof(float) * nelement);
-            if(arrayF == NULL)
-            {
-                PRINT_ERROR("malloc() error");
-                exit(EXIT_FAILURE);
-            }
-            memcpy(arrayF, data.image[ID].array.F, sizeof(float)*nelement);
-            quick_sort_float(arrayF, nelement);
-            value = (double) arrayF[(long)(fraction * nelement)];
-            free(arrayF);
-            break;
-
-        case _DATATYPE_DOUBLE :
-            arrayD = (double *) malloc(sizeof(double) * nelement);
-            if(arrayD == NULL)
-            {
-                PRINT_ERROR("malloc() error");
-                exit(EXIT_FAILURE);
-            }
-            memcpy(arrayD, data.image[ID].array.D, sizeof(double)*nelement);
-            quick_sort_double(arrayD, nelement);
-            value = arrayD[(long)(fraction * nelement)];
-            free(arrayD);
-            break;
-
-
-
-        case _DATATYPE_UINT8 :
-            arrayU = (unsigned short *) malloc(sizeof(unsigned short) * nelement);
-            if(arrayU == NULL)
-            {
-                PRINT_ERROR("malloc() error");
-                exit(EXIT_FAILURE);
-            }
-            for(ii = 0; ii < nelement; ii++)
-            {
-                arrayU[ii] = data.image[ID].array.UI8[ii];
-            }
-            quick_sort_ushort(arrayU, nelement);
-            value = arrayU[(long)(fraction * nelement)];
-            free(arrayU);
-            break;
-
-        case _DATATYPE_UINT16 :
-            arrayU = (unsigned short *) malloc(sizeof(unsigned short) * nelement);
-            if(arrayU == NULL)
-            {
-                PRINT_ERROR("malloc() error");
-                exit(EXIT_FAILURE);
-            }
-            for(ii = 0; ii < nelement; ii++)
-            {
-                arrayU[ii] = data.image[ID].array.UI16[ii];
-            }
-            quick_sort_ushort(arrayU, nelement);
-            value = arrayU[(long)(fraction * nelement)];
-            free(arrayU);
-            break;
-
-        case _DATATYPE_UINT32 :
-            arrayL = (long *) malloc(sizeof(long) * nelement);
-            if(arrayU == NULL)
-            {
-                PRINT_ERROR("malloc() error");
-                exit(EXIT_FAILURE);
-            }
-            for(ii = 0; ii < nelement; ii++)
-            {
-                arrayL[ii] = data.image[ID].array.UI32[ii];
-            }
-            quick_sort_long(arrayL, nelement);
-            value = arrayL[(long)(fraction * nelement)];
-            free(arrayL);
-            break;
-
-        case _DATATYPE_UINT64 :
-            arrayL = (long *) malloc(sizeof(long) * nelement);
-            if(arrayU == NULL)
-            {
-                PRINT_ERROR("malloc() error");
-                exit(EXIT_FAILURE);
-            }
-            for(ii = 0; ii < nelement; ii++)
-            {
-                arrayL[ii] = data.image[ID].array.UI64[ii];
-            }
-            quick_sort_long(arrayL, nelement);
-            value = arrayL[(long)(fraction * nelement)];
-            free(arrayL);
-            break;
-
-
-        case _DATATYPE_INT8 :
-            arrayL = (long *) malloc(sizeof(long) * nelement);
-            if(arrayL == NULL)
-            {
-                PRINT_ERROR("malloc() error");
-                exit(EXIT_FAILURE);
-            }
-            for(ii = 0; ii < nelement; ii++)
-            {
-                arrayL[ii] = (long) data.image[ID].array.SI8[ii];
-            }
-            quick_sort_long(arrayL, nelement);
-            value = (double) arrayL[(long)(fraction * nelement)];
-            free(arrayL);
-            break;
-
-        case _DATATYPE_INT16 :
-            arrayL = (long *) malloc(sizeof(long) * nelement);
-            if(arrayL == NULL)
-            {
-                PRINT_ERROR("malloc() error");
-                exit(EXIT_FAILURE);
-            }
-            for(ii = 0; ii < nelement; ii++)
-            {
-                arrayL[ii] = (long) data.image[ID].array.SI16[ii];
-            }
-            quick_sort_long(arrayL, nelement);
-            value = (double) arrayL[(long)(fraction * nelement)];
-            free(arrayL);
-            break;
-
-        case _DATATYPE_INT32 :
-            arrayL = (long *) malloc(sizeof(long) * nelement);
-            if(arrayL == NULL)
-            {
-                PRINT_ERROR("malloc() error");
-                exit(EXIT_FAILURE);
-            }
-            for(ii = 0; ii < nelement; ii++)
-            {
-                arrayL[ii] = (long) data.image[ID].array.SI32[ii];
-            }
-            quick_sort_long(arrayL, nelement);
-            value = (double) arrayL[(long)(fraction * nelement)];
-            free(arrayL);
-            break;
-
-        case _DATATYPE_INT64 :
-            arrayL = (long *) malloc(sizeof(long) * nelement);
-            if(arrayL == NULL)
-            {
-                PRINT_ERROR("malloc() error");
-                exit(EXIT_FAILURE);
-            }
-            for(ii = 0; ii < nelement; ii++)
-            {
-                arrayL[ii] = (long) data.image[ID].array.SI64[ii];
-            }
-            quick_sort_long(arrayL, nelement);
-            value = (double) arrayL[(long)(fraction * nelement)];
-            free(arrayL);
-            break;
-
-        default:
-            PRINT_ERROR("Image type not supported");
-            atypeOK = 0;
-            break;
+    case _DATATYPE_FLOAT:
+        arrayF = (float *)malloc(sizeof(float) * nelement);
+        if (arrayF == NULL)
+        {
+            PRINT_ERROR("malloc() error");
+            exit(EXIT_FAILURE);
+        }
+        memcpy(arrayF, data.image[ID].array.F, sizeof(float) * nelement);
+        quick_sort_float(arrayF, nelement);
+        value = (double)arrayF[(long)(fraction * nelement)];
+        free(arrayF);
+        break;
+
+    case _DATATYPE_DOUBLE:
+        arrayD = (double *)malloc(sizeof(double) * nelement);
+        if (arrayD == NULL)
+        {
+            PRINT_ERROR("malloc() error");
+            exit(EXIT_FAILURE);
+        }
+        memcpy(arrayD, data.image[ID].array.D, sizeof(double) * nelement);
+        quick_sort_double(arrayD, nelement);
+        value = arrayD[(long)(fraction * nelement)];
+        free(arrayD);
+        break;
+
+    case _DATATYPE_UINT8:
+        arrayU = (unsigned short *)malloc(sizeof(unsigned short) * nelement);
+        if (arrayU == NULL)
+        {
+            PRINT_ERROR("malloc() error");
+            exit(EXIT_FAILURE);
+        }
+        for (ii = 0; ii < nelement; ii++)
+        {
+            arrayU[ii] = data.image[ID].array.UI8[ii];
+        }
+        quick_sort_ushort(arrayU, nelement);
+        value = arrayU[(long)(fraction * nelement)];
+        free(arrayU);
+        break;
+
+    case _DATATYPE_UINT16:
+        arrayU = (unsigned short *)malloc(sizeof(unsigned short) * nelement);
+        if (arrayU == NULL)
+        {
+            PRINT_ERROR("malloc() error");
+            exit(EXIT_FAILURE);
+        }
+        for (ii = 0; ii < nelement; ii++)
+        {
+            arrayU[ii] = data.image[ID].array.UI16[ii];
+        }
+        quick_sort_ushort(arrayU, nelement);
+        value = arrayU[(long)(fraction * nelement)];
+        free(arrayU);
+        break;
+
+    case _DATATYPE_UINT32:
+        arrayL = (long *)malloc(sizeof(long) * nelement);
+        if (arrayU == NULL)
+        {
+            PRINT_ERROR("malloc() error");
+            exit(EXIT_FAILURE);
+        }
+        for (ii = 0; ii < nelement; ii++)
+        {
+            arrayL[ii] = data.image[ID].array.UI32[ii];
+        }
+        quick_sort_long(arrayL, nelement);
+        value = arrayL[(long)(fraction * nelement)];
+        free(arrayL);
+        break;
+
+    case _DATATYPE_UINT64:
+        arrayL = (long *)malloc(sizeof(long) * nelement);
+        if (arrayU == NULL)
+        {
+            PRINT_ERROR("malloc() error");
+            exit(EXIT_FAILURE);
+        }
+        for (ii = 0; ii < nelement; ii++)
+        {
+            arrayL[ii] = data.image[ID].array.UI64[ii];
+        }
+        quick_sort_long(arrayL, nelement);
+        value = arrayL[(long)(fraction * nelement)];
+        free(arrayL);
+        break;
+
+    case _DATATYPE_INT8:
+        arrayL = (long *)malloc(sizeof(long) * nelement);
+        if (arrayL == NULL)
+        {
+            PRINT_ERROR("malloc() error");
+            exit(EXIT_FAILURE);
+        }
+        for (ii = 0; ii < nelement; ii++)
+        {
+            arrayL[ii] = (long)data.image[ID].array.SI8[ii];
+        }
+        quick_sort_long(arrayL, nelement);
+        value = (double)arrayL[(long)(fraction * nelement)];
+        free(arrayL);
+        break;
+
+    case _DATATYPE_INT16:
+        arrayL = (long *)malloc(sizeof(long) * nelement);
+        if (arrayL == NULL)
+        {
+            PRINT_ERROR("malloc() error");
+            exit(EXIT_FAILURE);
+        }
+        for (ii = 0; ii < nelement; ii++)
+        {
+            arrayL[ii] = (long)data.image[ID].array.SI16[ii];
+        }
+        quick_sort_long(arrayL, nelement);
+        value = (double)arrayL[(long)(fraction * nelement)];
+        free(arrayL);
+        break;
+
+    case _DATATYPE_INT32:
+        arrayL = (long *)malloc(sizeof(long) * nelement);
+        if (arrayL == NULL)
+        {
+            PRINT_ERROR("malloc() error");
+            exit(EXIT_FAILURE);
+        }
+        for (ii = 0; ii < nelement; ii++)
+        {
+            arrayL[ii] = (long)data.image[ID].array.SI32[ii];
+        }
+        quick_sort_long(arrayL, nelement);
+        value = (double)arrayL[(long)(fraction * nelement)];
+        free(arrayL);
+        break;
+
+    case _DATATYPE_INT64:
+        arrayL = (long *)malloc(sizeof(long) * nelement);
+        if (arrayL == NULL)
+        {
+            PRINT_ERROR("malloc() error");
+            exit(EXIT_FAILURE);
+        }
+        for (ii = 0; ii < nelement; ii++)
+        {
+            arrayL[ii] = (long)data.image[ID].array.SI64[ii];
+        }
+        quick_sort_long(arrayL, nelement);
+        value = (double)arrayL[(long)(fraction * nelement)];
+        free(arrayL);
+        break;
+
+    default:
+        PRINT_ERROR("Image type not supported");
+        atypeOK = 0;
+        break;
     }
 
-    if(atypeOK == 0)
+    if (atypeOK == 0)
     {
         exit(EXIT_FAILURE);
     }
 
-    return(value);
+    return (value);
 }
 
-
-double arith_image_median(
-    const char *ID_name
-)
+double arith_image_median(const char *ID_name)
 {
     double value = 0.0;
 
     value = arith_image_percentile(ID_name, 0.5);
 
-    return(value);
+    return (value);
 }
diff --git a/src/COREMOD_arith/image_stats.h b/src/COREMOD_arith/image_stats.h
index 6da8dd62..6e3b7b7a 100644
--- a/src/COREMOD_arith/image_stats.h
+++ b/src/COREMOD_arith/image_stats.h
@@ -4,8 +4,6 @@
  *
  */
 
-
-
 double arith_image_mean(const char *ID_name);
 
 double arith_image_min(const char *ID_name);
diff --git a/src/COREMOD_arith/image_total.c b/src/COREMOD_arith/image_total.c
index 09d1db0a..bcea6ff3 100644
--- a/src/COREMOD_arith/image_total.c
+++ b/src/COREMOD_arith/image_total.c
@@ -5,18 +5,13 @@
  *
  */
 
-
-#include "CommandLineInterface/CLIcore.h"
 #include "COREMOD_memory/COREMOD_memory.h"
+#include "CommandLineInterface/CLIcore.h"
 
-
-
-double arith_image_total(
-    const char *ID_name
-)
+double arith_image_total(const char *ID_name)
 {
     long double lvalue; // uses long double internally
-    imageID ID;    
+    imageID ID;
     uint64_t nelement;
     uint8_t datatype;
 
@@ -27,74 +22,74 @@ double arith_image_total(
 
     lvalue = 0.0;
 
-    if(datatype == _DATATYPE_FLOAT)
+    if (datatype == _DATATYPE_FLOAT)
     {
-        for(uint64_t ii = 0; ii < nelement; ii++)
+        for (uint64_t ii = 0; ii < nelement; ii++)
         {
-            lvalue += (long double) data.image[ID].array.F[ii];
+            lvalue += (long double)data.image[ID].array.F[ii];
         }
     }
-    else if(datatype == _DATATYPE_DOUBLE)
+    else if (datatype == _DATATYPE_DOUBLE)
     {
-        for(uint64_t ii = 0; ii < nelement; ii++)
+        for (uint64_t ii = 0; ii < nelement; ii++)
         {
-            lvalue += (long double) data.image[ID].array.D[ii];
+            lvalue += (long double)data.image[ID].array.D[ii];
         }
     }
-    else if(datatype == _DATATYPE_UINT8)
+    else if (datatype == _DATATYPE_UINT8)
     {
-        for(uint64_t ii = 0; ii < nelement; ii++)
+        for (uint64_t ii = 0; ii < nelement; ii++)
         {
-            lvalue += (long double) data.image[ID].array.UI8[ii];
+            lvalue += (long double)data.image[ID].array.UI8[ii];
         }
     }
-    else if(datatype == _DATATYPE_UINT16)
+    else if (datatype == _DATATYPE_UINT16)
     {
-        for(uint64_t ii = 0; ii < nelement; ii++)
+        for (uint64_t ii = 0; ii < nelement; ii++)
         {
-            lvalue += (long double) data.image[ID].array.UI16[ii];
+            lvalue += (long double)data.image[ID].array.UI16[ii];
         }
     }
-    else if(datatype == _DATATYPE_UINT32)
+    else if (datatype == _DATATYPE_UINT32)
     {
-        for(uint64_t ii = 0; ii < nelement; ii++)
+        for (uint64_t ii = 0; ii < nelement; ii++)
         {
-            lvalue += (long double) data.image[ID].array.UI32[ii];
+            lvalue += (long double)data.image[ID].array.UI32[ii];
         }
     }
-    else if(datatype == _DATATYPE_UINT64)
+    else if (datatype == _DATATYPE_UINT64)
     {
-        for(uint64_t ii = 0; ii < nelement; ii++)
+        for (uint64_t ii = 0; ii < nelement; ii++)
         {
-            lvalue += (long double) data.image[ID].array.UI64[ii];
+            lvalue += (long double)data.image[ID].array.UI64[ii];
         }
     }
-    else if(datatype == _DATATYPE_INT8)
+    else if (datatype == _DATATYPE_INT8)
     {
-        for(uint64_t ii = 0; ii < nelement; ii++)
+        for (uint64_t ii = 0; ii < nelement; ii++)
         {
-            lvalue += (long double) data.image[ID].array.SI8[ii];
+            lvalue += (long double)data.image[ID].array.SI8[ii];
         }
     }
-    else if(datatype == _DATATYPE_INT16)
+    else if (datatype == _DATATYPE_INT16)
     {
-        for(uint64_t ii = 0; ii < nelement; ii++)
+        for (uint64_t ii = 0; ii < nelement; ii++)
         {
-            lvalue += (long double) data.image[ID].array.SI16[ii];
+            lvalue += (long double)data.image[ID].array.SI16[ii];
         }
     }
-    else if(datatype == _DATATYPE_INT32)
+    else if (datatype == _DATATYPE_INT32)
     {
-        for(uint64_t ii = 0; ii < nelement; ii++)
+        for (uint64_t ii = 0; ii < nelement; ii++)
         {
-            lvalue += (long double) data.image[ID].array.SI32[ii];
+            lvalue += (long double)data.image[ID].array.SI32[ii];
         }
     }
-    else if(datatype == _DATATYPE_INT64)
+    else if (datatype == _DATATYPE_INT64)
     {
-        for(uint64_t ii = 0; ii < nelement; ii++)
+        for (uint64_t ii = 0; ii < nelement; ii++)
         {
-            lvalue += (long double) data.image[ID].array.SI64[ii];
+            lvalue += (long double)data.image[ID].array.SI64[ii];
         }
     }
     else
@@ -104,17 +99,12 @@ double arith_image_total(
     }
 
     double value;
-    value = (double) lvalue;
+    value = (double)lvalue;
 
-    return(value);
+    return (value);
 }
 
-
-
-
-double arith_image_sumsquare(
-    const char *ID_name
-)
+double arith_image_sumsquare(const char *ID_name)
 {
     long double lvalue; // uses long double internally
     imageID ID;
@@ -128,74 +118,74 @@ double arith_image_sumsquare(
 
     lvalue = 0.0;
 
-	if(datatype == _DATATYPE_FLOAT)
+    if (datatype == _DATATYPE_FLOAT)
     {
-        for(uint64_t ii = 0; ii < nelement; ii++)
+        for (uint64_t ii = 0; ii < nelement; ii++)
         {
-            lvalue += (long double) (data.image[ID].array.F[ii]*data.image[ID].array.F[ii]);
+            lvalue += (long double)(data.image[ID].array.F[ii] * data.image[ID].array.F[ii]);
         }
     }
-    else if(datatype == _DATATYPE_DOUBLE)
+    else if (datatype == _DATATYPE_DOUBLE)
     {
-        for(uint64_t ii = 0; ii < nelement; ii++)
+        for (uint64_t ii = 0; ii < nelement; ii++)
         {
-            lvalue += (long double) (data.image[ID].array.D[ii]*data.image[ID].array.D[ii]);
+            lvalue += (long double)(data.image[ID].array.D[ii] * data.image[ID].array.D[ii]);
         }
     }
-    else if(datatype == _DATATYPE_UINT8)
+    else if (datatype == _DATATYPE_UINT8)
     {
-        for(uint64_t ii = 0; ii < nelement; ii++)
+        for (uint64_t ii = 0; ii < nelement; ii++)
         {
-            lvalue += (long double) (data.image[ID].array.UI8[ii]*data.image[ID].array.UI8[ii]);
+            lvalue += (long double)(data.image[ID].array.UI8[ii] * data.image[ID].array.UI8[ii]);
         }
     }
-    else if(datatype == _DATATYPE_UINT16)
+    else if (datatype == _DATATYPE_UINT16)
     {
-        for(uint64_t ii = 0; ii < nelement; ii++)
+        for (uint64_t ii = 0; ii < nelement; ii++)
         {
-            lvalue += (long double) (data.image[ID].array.UI16[ii]*data.image[ID].array.UI16[ii]);
+            lvalue += (long double)(data.image[ID].array.UI16[ii] * data.image[ID].array.UI16[ii]);
         }
     }
-    else if(datatype == _DATATYPE_UINT32)
+    else if (datatype == _DATATYPE_UINT32)
     {
-        for(uint64_t ii = 0; ii < nelement; ii++)
+        for (uint64_t ii = 0; ii < nelement; ii++)
         {
-            lvalue += (long double) (data.image[ID].array.UI32[ii]*data.image[ID].array.UI32[ii]);
+            lvalue += (long double)(data.image[ID].array.UI32[ii] * data.image[ID].array.UI32[ii]);
         }
     }
-    else if(datatype == _DATATYPE_UINT64)
+    else if (datatype == _DATATYPE_UINT64)
     {
-        for(uint64_t ii = 0; ii < nelement; ii++)
+        for (uint64_t ii = 0; ii < nelement; ii++)
         {
-            lvalue += (long double) (data.image[ID].array.UI64[ii]*data.image[ID].array.UI64[ii]);
+            lvalue += (long double)(data.image[ID].array.UI64[ii] * data.image[ID].array.UI64[ii]);
         }
     }
-    else if(datatype == _DATATYPE_INT8)
+    else if (datatype == _DATATYPE_INT8)
     {
-        for(uint64_t ii = 0; ii < nelement; ii++)
+        for (uint64_t ii = 0; ii < nelement; ii++)
         {
-            lvalue += (long double) (data.image[ID].array.SI8[ii]*data.image[ID].array.SI8[ii]);
+            lvalue += (long double)(data.image[ID].array.SI8[ii] * data.image[ID].array.SI8[ii]);
         }
     }
-    else if(datatype == _DATATYPE_INT16)
+    else if (datatype == _DATATYPE_INT16)
     {
-        for(uint64_t ii = 0; ii < nelement; ii++)
+        for (uint64_t ii = 0; ii < nelement; ii++)
         {
-            lvalue += (long double) (data.image[ID].array.SI16[ii]*data.image[ID].array.SI16[ii]);
+            lvalue += (long double)(data.image[ID].array.SI16[ii] * data.image[ID].array.SI16[ii]);
         }
     }
-    else if(datatype == _DATATYPE_INT32)
+    else if (datatype == _DATATYPE_INT32)
     {
-        for(uint64_t ii = 0; ii < nelement; ii++)
+        for (uint64_t ii = 0; ii < nelement; ii++)
         {
-            lvalue += (long double) (data.image[ID].array.SI32[ii]*data.image[ID].array.SI32[ii]);
+            lvalue += (long double)(data.image[ID].array.SI32[ii] * data.image[ID].array.SI32[ii]);
         }
     }
-    else if(datatype == _DATATYPE_INT64)
+    else if (datatype == _DATATYPE_INT64)
     {
-        for(uint64_t ii = 0; ii < nelement; ii++)
+        for (uint64_t ii = 0; ii < nelement; ii++)
         {
-            lvalue += (long double) (data.image[ID].array.SI64[ii]*data.image[ID].array.SI64[ii]);
+            lvalue += (long double)(data.image[ID].array.SI64[ii] * data.image[ID].array.SI64[ii]);
         }
     }
     else
@@ -205,10 +195,7 @@ double arith_image_sumsquare(
     }
 
     double value;
-    value = (double) lvalue;
+    value = (double)lvalue;
 
-    return(value);
+    return (value);
 }
-
-
-
diff --git a/src/COREMOD_arith/image_total.h b/src/COREMOD_arith/image_total.h
index 6a937f35..0aeefc6a 100644
--- a/src/COREMOD_arith/image_total.h
+++ b/src/COREMOD_arith/image_total.h
@@ -1,14 +1,8 @@
 /**
  * @file    image_total.h
- * 
+ *
  */
 
+double arith_image_total(const char *ID_name);
 
-
-double arith_image_total(
-    const char *ID_name
-);
-
-double arith_image_sumsquare(
-    const char *ID_name
-);
+double arith_image_sumsquare(const char *ID_name);
diff --git a/src/COREMOD_arith/imfunctions.c b/src/COREMOD_arith/imfunctions.c
index 9c4a3880..4d936705 100644
--- a/src/COREMOD_arith/imfunctions.c
+++ b/src/COREMOD_arith/imfunctions.c
@@ -7,19 +7,14 @@
 
 #include <assert.h>
 
-#include "CommandLineInterface/CLIcore.h"
 #include "COREMOD_memory/COREMOD_memory.h"
-
-
-
+#include "CommandLineInterface/CLIcore.h"
 
 #ifdef _OPENMP
 #include <omp.h>
 #define OMP_NELEMENT_LIMIT 1000000
 #endif
 
-
-
 /* ------------------------------------------------------------------------- */
 /* Functions for bison / flex                                                */
 /* im : image
@@ -32,12 +27,7 @@
 
   ------------------------------------------------------------------------- */
 
-
-errno_t arith_image_function_im_im__d_d(
-    const char *ID_name,
-    const char *ID_out,
-    double (*pt2function)(double)
-)
+errno_t arith_image_function_im_im__d_d(const char *ID_name, const char *ID_out, double (*pt2function)(double))
 {
     imageID ID;
     imageID IDout;
@@ -48,8 +38,7 @@ errno_t arith_image_function_im_im__d_d(
     uint8_t datatype, datatypeout;
     long i;
 
-
-    if(data.Debug > 0)
+    if (data.Debug > 0)
     {
         printf("arith_image_function_d_d  %s %s\n", ID_name, ID_out);
         fflush(stdout);
@@ -58,175 +47,151 @@ errno_t arith_image_function_im_im__d_d(
     ID = image_ID(ID_name);
     datatype = data.image[ID].md[0].datatype;
     naxis = data.image[ID].md[0].naxis;
-    naxes = (uint32_t *) malloc(sizeof(uint32_t) * naxis);
-    if(naxes == NULL)
+    naxes = (uint32_t *)malloc(sizeof(uint32_t) * naxis);
+    if (naxes == NULL)
     {
         PRINT_ERROR("malloc() error");
         exit(0);
     }
 
-
-    for(i = 0; i < naxis; i++)
+    for (i = 0; i < naxis; i++)
     {
         naxes[i] = data.image[ID].md[0].size[i];
     }
 
-
     datatypeout = _DATATYPE_FLOAT;
-    if(datatype == _DATATYPE_DOUBLE)
+    if (datatype == _DATATYPE_DOUBLE)
     {
         datatypeout = _DATATYPE_DOUBLE;
     }
 
-    create_image_ID(ID_out, naxis, naxes, datatypeout, data.SHARED_DFT,
-                            data.NBKEYWORD_DFT, 0, &IDout);
+    create_image_ID(ID_out, naxis, naxes, datatypeout, data.SHARED_DFT, data.NBKEYWORD_DFT, 0, &IDout);
     free(naxes);
 
     nelement = data.image[ID].md[0].nelement;
 
-
-# ifdef _OPENMP
-    #pragma omp parallel if (nelement>OMP_NELEMENT_LIMIT)
+#ifdef _OPENMP
+#pragma omp parallel if (nelement > OMP_NELEMENT_LIMIT)
     {
-# endif
-
+#endif
 
-        if(datatype == _DATATYPE_UINT8)
+        if (datatype == _DATATYPE_UINT8)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[IDout].array.F[ii] = (float) pt2function((double)(
-                                                    data.image[ID].array.UI8[ii]));
+                data.image[IDout].array.F[ii] = (float)pt2function((double)(data.image[ID].array.UI8[ii]));
             }
         }
-        if(datatype == _DATATYPE_UINT16)
+        if (datatype == _DATATYPE_UINT16)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[IDout].array.F[ii] = (float) pt2function((double)(
-                                                    data.image[ID].array.UI16[ii]));
+                data.image[IDout].array.F[ii] = (float)pt2function((double)(data.image[ID].array.UI16[ii]));
             }
         }
-        if(datatype == _DATATYPE_UINT32)
+        if (datatype == _DATATYPE_UINT32)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[IDout].array.F[ii] = (float) pt2function((double)(
-                                                    data.image[ID].array.UI32[ii]));
+                data.image[IDout].array.F[ii] = (float)pt2function((double)(data.image[ID].array.UI32[ii]));
             }
         }
-        if(datatype == _DATATYPE_UINT64)
+        if (datatype == _DATATYPE_UINT64)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[IDout].array.F[ii] = (float) pt2function((double)(
-                                                    data.image[ID].array.UI64[ii]));
+                data.image[IDout].array.F[ii] = (float)pt2function((double)(data.image[ID].array.UI64[ii]));
             }
         }
 
-        if(datatype == _DATATYPE_INT8)
+        if (datatype == _DATATYPE_INT8)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[IDout].array.F[ii] = (float) pt2function((double)(
-                                                    data.image[ID].array.SI8[ii]));
+                data.image[IDout].array.F[ii] = (float)pt2function((double)(data.image[ID].array.SI8[ii]));
             }
         }
-        if(datatype == _DATATYPE_INT16)
+        if (datatype == _DATATYPE_INT16)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[IDout].array.F[ii] = (float) pt2function((double)(
-                                                    data.image[ID].array.SI16[ii]));
+                data.image[IDout].array.F[ii] = (float)pt2function((double)(data.image[ID].array.SI16[ii]));
             }
         }
-        if(datatype == _DATATYPE_INT32)
+        if (datatype == _DATATYPE_INT32)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[IDout].array.F[ii] = (float) pt2function((double)(
-                                                    data.image[ID].array.SI32[ii]));
+                data.image[IDout].array.F[ii] = (float)pt2function((double)(data.image[ID].array.SI32[ii]));
             }
         }
-        if(datatype == _DATATYPE_INT64)
+        if (datatype == _DATATYPE_INT64)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[IDout].array.F[ii] = (float) pt2function((double)(
-                                                    data.image[ID].array.SI64[ii]));
+                data.image[IDout].array.F[ii] = (float)pt2function((double)(data.image[ID].array.SI64[ii]));
             }
         }
 
-        if(datatype == _DATATYPE_FLOAT)
+        if (datatype == _DATATYPE_FLOAT)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[IDout].array.F[ii] = (float) pt2function((double)(
-                                                    data.image[ID].array.F[ii]));
+                data.image[IDout].array.F[ii] = (float)pt2function((double)(data.image[ID].array.F[ii]));
             }
         }
-        if(datatype == _DATATYPE_DOUBLE)
+        if (datatype == _DATATYPE_DOUBLE)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
                 data.image[IDout].array.D[ii] = pt2function(data.image[ID].array.D[ii]);
             }
         }
-# ifdef _OPENMP
+#ifdef _OPENMP
     }
-# endif
-
+#endif
 
-    if(data.Debug > 0)
+    if (data.Debug > 0)
     {
         printf("arith_image_function_d_d  DONE\n");
         fflush(stdout);
     }
 
-
     return RETURN_SUCCESS;
 }
 
-
-
-
-
-errno_t arith_image_function_imd_im__dd_d(
-    const char *ID_name,
-    double      v0,
-    const char *ID_out,
-    double (*pt2function)(double, double)
-)
+errno_t arith_image_function_imd_im__dd_d(const char *ID_name, double v0, const char *ID_out,
+                                          double (*pt2function)(double, double))
 {
     imageID ID;
     imageID IDout;
@@ -237,183 +202,154 @@ errno_t arith_image_function_imd_im__dd_d(
     uint8_t datatype, datatypeout;
     long i;
 
-
-
     ID = image_ID(ID_name);
     datatype = data.image[ID].md[0].datatype;
     naxis = data.image[ID].md[0].naxis;
-    naxes = (uint32_t *) malloc(sizeof(uint32_t) * naxis);
-    if(naxes == NULL)
+    naxes = (uint32_t *)malloc(sizeof(uint32_t) * naxis);
+    if (naxes == NULL)
     {
         PRINT_ERROR("malloc() error");
         exit(0);
     }
 
-
-    for(i = 0; i < naxis; i++)
+    for (i = 0; i < naxis; i++)
     {
         naxes[i] = data.image[ID].md[0].size[i];
     }
 
-
     datatypeout = _DATATYPE_FLOAT;
-    if(datatype == _DATATYPE_DOUBLE)
+    if (datatype == _DATATYPE_DOUBLE)
     {
         datatypeout = _DATATYPE_DOUBLE;
     }
 
-    create_image_ID(ID_out, naxis, naxes, datatypeout, data.SHARED_DFT,
-                            data.NBKEYWORD_DFT, 0, &IDout);
+    create_image_ID(ID_out, naxis, naxes, datatypeout, data.SHARED_DFT, data.NBKEYWORD_DFT, 0, &IDout);
     free(naxes);
 
     nelement = data.image[ID].md[0].nelement;
 
-
-# ifdef _OPENMP
-    #pragma omp parallel if (nelement>OMP_NELEMENT_LIMIT)
+#ifdef _OPENMP
+#pragma omp parallel if (nelement > OMP_NELEMENT_LIMIT)
     {
-# endif
-
+#endif
 
-        if(datatype == _DATATYPE_UINT8)
+        if (datatype == _DATATYPE_UINT8)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[IDout].array.F[ii] = (float) pt2function((double)(
-                                                    data.image[ID].array.UI8[ii]), v0);
+                data.image[IDout].array.F[ii] = (float)pt2function((double)(data.image[ID].array.UI8[ii]), v0);
             }
         }
-        if(datatype == _DATATYPE_UINT16)
+        if (datatype == _DATATYPE_UINT16)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[IDout].array.F[ii] = (float) pt2function((double)(
-                                                    data.image[ID].array.UI16[ii]), v0);
+                data.image[IDout].array.F[ii] = (float)pt2function((double)(data.image[ID].array.UI16[ii]), v0);
             }
         }
-        if(datatype == _DATATYPE_UINT32)
+        if (datatype == _DATATYPE_UINT32)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[IDout].array.F[ii] = (float) pt2function((double)(
-                                                    data.image[ID].array.UI32[ii]), v0);
+                data.image[IDout].array.F[ii] = (float)pt2function((double)(data.image[ID].array.UI32[ii]), v0);
             }
         }
-        if(datatype == _DATATYPE_UINT64)
+        if (datatype == _DATATYPE_UINT64)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[IDout].array.F[ii] = (float) pt2function((double)(
-                                                    data.image[ID].array.UI64[ii]), v0);
+                data.image[IDout].array.F[ii] = (float)pt2function((double)(data.image[ID].array.UI64[ii]), v0);
             }
         }
 
-
-        if(datatype == _DATATYPE_INT8)
+        if (datatype == _DATATYPE_INT8)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[IDout].array.F[ii] = (float) pt2function((double)(
-                                                    data.image[ID].array.SI8[ii]), v0);
+                data.image[IDout].array.F[ii] = (float)pt2function((double)(data.image[ID].array.SI8[ii]), v0);
             }
         }
-        if(datatype == _DATATYPE_INT16)
+        if (datatype == _DATATYPE_INT16)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[IDout].array.F[ii] = (float) pt2function((double)(
-                                                    data.image[ID].array.SI16[ii]), v0);
+                data.image[IDout].array.F[ii] = (float)pt2function((double)(data.image[ID].array.SI16[ii]), v0);
             }
         }
-        if(datatype == _DATATYPE_INT32)
+        if (datatype == _DATATYPE_INT32)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[IDout].array.F[ii] = (float) pt2function((double)(
-                                                    data.image[ID].array.SI32[ii]), v0);
+                data.image[IDout].array.F[ii] = (float)pt2function((double)(data.image[ID].array.SI32[ii]), v0);
             }
         }
-        if(datatype == _DATATYPE_INT64)
+        if (datatype == _DATATYPE_INT64)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[IDout].array.F[ii] = (float) pt2function((double)(
-                                                    data.image[ID].array.SI64[ii]), v0);
+                data.image[IDout].array.F[ii] = (float)pt2function((double)(data.image[ID].array.SI64[ii]), v0);
             }
         }
 
-
-        if(datatype == _DATATYPE_FLOAT)
+        if (datatype == _DATATYPE_FLOAT)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[IDout].array.F[ii] = (float) pt2function((double)(
-                                                    data.image[ID].array.F[ii]), v0);
+                data.image[IDout].array.F[ii] = (float)pt2function((double)(data.image[ID].array.F[ii]), v0);
             }
         }
-        if(datatype == _DATATYPE_DOUBLE)
+        if (datatype == _DATATYPE_DOUBLE)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
                 data.image[IDout].array.D[ii] = pt2function(data.image[ID].array.D[ii], v0);
             }
         }
-# ifdef _OPENMP
+#ifdef _OPENMP
     }
-# endif
-
+#endif
 
-    if(data.Debug > 0)
+    if (data.Debug > 0)
     {
         printf("arith_image_function_d_d  DONE\n");
         fflush(stdout);
     }
 
-
     return RETURN_SUCCESS;
 }
 
-
-
-
-
-errno_t arith_image_function_imdd_im__ddd_d(
-    const char *ID_name,
-    double      v0,
-    double      v1,
-    const char *ID_out,
-    double (*pt2function)(double, double, double)
-)
+errno_t arith_image_function_imdd_im__ddd_d(const char *ID_name, double v0, double v1, const char *ID_out,
+                                            double (*pt2function)(double, double, double))
 {
     imageID ID;
     imageID IDout;
@@ -424,189 +360,157 @@ errno_t arith_image_function_imdd_im__ddd_d(
     uint8_t datatype, datatypeout;
     long i;
 
-
-
     ID = image_ID(ID_name);
     datatype = data.image[ID].md[0].datatype;
     naxis = data.image[ID].md[0].naxis;
-    naxes = (uint32_t *) malloc(sizeof(uint32_t) * naxis);
-    if(naxes == NULL)
+    naxes = (uint32_t *)malloc(sizeof(uint32_t) * naxis);
+    if (naxes == NULL)
     {
         PRINT_ERROR("malloc() error");
         exit(0);
     }
 
-
-    for(i = 0; i < naxis; i++)
+    for (i = 0; i < naxis; i++)
     {
         naxes[i] = data.image[ID].md[0].size[i];
     }
 
-
     datatypeout = _DATATYPE_FLOAT;
-    if(datatype == _DATATYPE_DOUBLE)
+    if (datatype == _DATATYPE_DOUBLE)
     {
         datatypeout = _DATATYPE_DOUBLE;
     }
 
-    create_image_ID(ID_out, naxis, naxes, datatypeout, data.SHARED_DFT,
-                            data.NBKEYWORD_DFT, 0, &IDout);
+    create_image_ID(ID_out, naxis, naxes, datatypeout, data.SHARED_DFT, data.NBKEYWORD_DFT, 0, &IDout);
     free(naxes);
 
     nelement = data.image[ID].md[0].nelement;
 
-
-# ifdef _OPENMP
-    #pragma omp parallel if (nelement>OMP_NELEMENT_LIMIT)
+#ifdef _OPENMP
+#pragma omp parallel if (nelement > OMP_NELEMENT_LIMIT)
     {
-# endif
-
+#endif
 
-        if(datatype == _DATATYPE_UINT8)
+        if (datatype == _DATATYPE_UINT8)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[IDout].array.F[ii] = (float) pt2function((double)(
-                                                    data.image[ID].array.UI8[ii]), v0, v1);
+                data.image[IDout].array.F[ii] = (float)pt2function((double)(data.image[ID].array.UI8[ii]), v0, v1);
             }
         }
-        if(datatype == _DATATYPE_UINT16)
+        if (datatype == _DATATYPE_UINT16)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[IDout].array.F[ii] = (float) pt2function((double)(
-                                                    data.image[ID].array.UI16[ii]), v0, v1);
+                data.image[IDout].array.F[ii] = (float)pt2function((double)(data.image[ID].array.UI16[ii]), v0, v1);
             }
         }
-        if(datatype == _DATATYPE_UINT32)
+        if (datatype == _DATATYPE_UINT32)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[IDout].array.F[ii] = (float) pt2function((double)(
-                                                    data.image[ID].array.UI32[ii]), v0, v1);
+                data.image[IDout].array.F[ii] = (float)pt2function((double)(data.image[ID].array.UI32[ii]), v0, v1);
             }
         }
-        if(datatype == _DATATYPE_UINT64)
+        if (datatype == _DATATYPE_UINT64)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[IDout].array.F[ii] = (float) pt2function((double)(
-                                                    data.image[ID].array.UI64[ii]), v0, v1);
+                data.image[IDout].array.F[ii] = (float)pt2function((double)(data.image[ID].array.UI64[ii]), v0, v1);
             }
         }
 
-
-        if(datatype == _DATATYPE_INT8)
+        if (datatype == _DATATYPE_INT8)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[IDout].array.F[ii] = (float) pt2function((double)(
-                                                    data.image[ID].array.SI8[ii]), v0, v1);
+                data.image[IDout].array.F[ii] = (float)pt2function((double)(data.image[ID].array.SI8[ii]), v0, v1);
             }
         }
-        if(datatype == _DATATYPE_INT16)
+        if (datatype == _DATATYPE_INT16)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[IDout].array.F[ii] = (float) pt2function((double)(
-                                                    data.image[ID].array.SI16[ii]), v0, v1);
+                data.image[IDout].array.F[ii] = (float)pt2function((double)(data.image[ID].array.SI16[ii]), v0, v1);
             }
         }
-        if(datatype == _DATATYPE_INT32)
+        if (datatype == _DATATYPE_INT32)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[IDout].array.F[ii] = (float) pt2function((double)(
-                                                    data.image[ID].array.SI32[ii]), v0, v1);
+                data.image[IDout].array.F[ii] = (float)pt2function((double)(data.image[ID].array.SI32[ii]), v0, v1);
             }
         }
-        if(datatype == _DATATYPE_INT64)
+        if (datatype == _DATATYPE_INT64)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[IDout].array.F[ii] = (float) pt2function((double)(
-                                                    data.image[ID].array.SI64[ii]), v0, v1);
+                data.image[IDout].array.F[ii] = (float)pt2function((double)(data.image[ID].array.SI64[ii]), v0, v1);
             }
         }
 
-
-        if(datatype == _DATATYPE_FLOAT)
+        if (datatype == _DATATYPE_FLOAT)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[IDout].array.F[ii] = (float) pt2function((double)(
-                                                    data.image[ID].array.F[ii]), v0, v1);
+                data.image[IDout].array.F[ii] = (float)pt2function((double)(data.image[ID].array.F[ii]), v0, v1);
             }
         }
-        if(datatype == _DATATYPE_DOUBLE)
+        if (datatype == _DATATYPE_DOUBLE)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[IDout].array.D[ii] = pt2function(data.image[ID].array.D[ii], v0,
-                                                v1);
+                data.image[IDout].array.D[ii] = pt2function(data.image[ID].array.D[ii], v0, v1);
             }
         }
-# ifdef _OPENMP
+#ifdef _OPENMP
     }
-# endif
-
+#endif
 
-    if(data.Debug > 0)
+    if (data.Debug > 0)
     {
         printf("arith_image_function_d_d  DONE\n");
         fflush(stdout);
     }
 
-
     return RETURN_SUCCESS;
 }
 
-
-
-
-
 /* ------------------------------------------------------------------------- */
 /* image  -> image                                                           */
 /* ------------------------------------------------------------------------- */
 
-
-
-
-errno_t arith_image_function_1_1_byID(
-    imageID ID,
-    imageID IDout,
-    double (*pt2function)(double)
-)
+errno_t arith_image_function_1_1_byID(imageID ID, imageID IDout, double (*pt2function)(double))
 {
     uint32_t *naxes = NULL;
     long naxis;
@@ -620,170 +524,144 @@ errno_t arith_image_function_1_1_byID(
 
     datatype = data.image[ID].md[0].datatype;
     naxis = data.image[ID].md[0].naxis;
-    naxes = (uint32_t *) malloc(sizeof(uint32_t) * naxis);
-    if(naxes == NULL)
+    naxes = (uint32_t *)malloc(sizeof(uint32_t) * naxis);
+    if (naxes == NULL)
     {
         PRINT_ERROR("malloc() error");
         exit(0);
     }
 
-
-    for(i = 0; i < naxis; i++)
+    for (i = 0; i < naxis; i++)
     {
         naxes[i] = data.image[ID].md[0].size[i];
     }
 
-
-//    datatypeout = _DATATYPE_FLOAT;
-//    if(datatype == _DATATYPE_DOUBLE)
-//        datatypeout = _DATATYPE_DOUBLE;
+    //    datatypeout = _DATATYPE_FLOAT;
+    //    if(datatype == _DATATYPE_DOUBLE)
+    //        datatypeout = _DATATYPE_DOUBLE;
 
     free(naxes);
 
     nelement = data.image[ID].md[0].nelement;
 
-
-# ifdef _OPENMP
-    #pragma omp parallel if (nelement>OMP_NELEMENT_LIMIT)
+#ifdef _OPENMP
+#pragma omp parallel if (nelement > OMP_NELEMENT_LIMIT)
     {
-# endif
-
+#endif
 
-        if(datatype == _DATATYPE_UINT8)
+        if (datatype == _DATATYPE_UINT8)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[IDout].array.F[ii] = pt2function((double)(
-                                                    data.image[ID].array.UI8[ii]));
+                data.image[IDout].array.F[ii] = pt2function((double)(data.image[ID].array.UI8[ii]));
             }
         }
 
-        if(datatype == _DATATYPE_UINT16)
+        if (datatype == _DATATYPE_UINT16)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[IDout].array.F[ii] = pt2function((double)(
-                                                    data.image[ID].array.UI16[ii]));
+                data.image[IDout].array.F[ii] = pt2function((double)(data.image[ID].array.UI16[ii]));
             }
         }
 
-        if(datatype == _DATATYPE_UINT32)
+        if (datatype == _DATATYPE_UINT32)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[IDout].array.F[ii] = pt2function((double)(
-                                                    data.image[ID].array.UI32[ii]));
+                data.image[IDout].array.F[ii] = pt2function((double)(data.image[ID].array.UI32[ii]));
             }
         }
 
-        if(datatype == _DATATYPE_UINT64)
+        if (datatype == _DATATYPE_UINT64)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[IDout].array.F[ii] = pt2function((double)(
-                                                    data.image[ID].array.UI64[ii]));
+                data.image[IDout].array.F[ii] = pt2function((double)(data.image[ID].array.UI64[ii]));
             }
         }
 
-
-
-        if(datatype == _DATATYPE_INT8)
+        if (datatype == _DATATYPE_INT8)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[IDout].array.F[ii] = pt2function((double)(
-                                                    data.image[ID].array.SI8[ii]));
+                data.image[IDout].array.F[ii] = pt2function((double)(data.image[ID].array.SI8[ii]));
             }
         }
-        if(datatype == _DATATYPE_INT16)
+        if (datatype == _DATATYPE_INT16)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[IDout].array.F[ii] = pt2function((double)(
-                                                    data.image[ID].array.SI16[ii]));
+                data.image[IDout].array.F[ii] = pt2function((double)(data.image[ID].array.SI16[ii]));
             }
         }
-        if(datatype == _DATATYPE_INT32)
+        if (datatype == _DATATYPE_INT32)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[IDout].array.F[ii] = pt2function((double)(
-                                                    data.image[ID].array.SI32[ii]));
+                data.image[IDout].array.F[ii] = pt2function((double)(data.image[ID].array.SI32[ii]));
             }
         }
-        if(datatype == _DATATYPE_INT64)
+        if (datatype == _DATATYPE_INT64)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[IDout].array.F[ii] = pt2function((double)(
-                                                    data.image[ID].array.SI64[ii]));
+                data.image[IDout].array.F[ii] = pt2function((double)(data.image[ID].array.SI64[ii]));
             }
         }
 
-
-        if(datatype == _DATATYPE_FLOAT)
+        if (datatype == _DATATYPE_FLOAT)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[IDout].array.F[ii] = pt2function((double)(
-                                                    data.image[ID].array.F[ii]));
+                data.image[IDout].array.F[ii] = pt2function((double)(data.image[ID].array.F[ii]));
             }
         }
-        if(datatype == _DATATYPE_DOUBLE)
+        if (datatype == _DATATYPE_DOUBLE)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[IDout].array.D[ii] = (double) pt2function((double)(
-                                                    data.image[ID].array.D[ii]));
+                data.image[IDout].array.D[ii] = (double)pt2function((double)(data.image[ID].array.D[ii]));
             }
         }
-# ifdef _OPENMP
+#ifdef _OPENMP
     }
-# endif
+#endif
 
     return RETURN_SUCCESS;
 }
 
-
-
-
-
-
-errno_t arith_image_function_1_1(
-    const char *ID_name,
-    const char *ID_out,
-    double (*pt2function)(double)
-)
+errno_t arith_image_function_1_1(const char *ID_name, const char *ID_out, double (*pt2function)(double))
 {
     imageID ID;
     imageID IDout;
@@ -799,170 +677,146 @@ errno_t arith_image_function_1_1(
     ID = image_ID(ID_name);
     datatype = data.image[ID].md[0].datatype;
     naxis = data.image[ID].md[0].naxis;
-    naxes = (uint32_t *) malloc(sizeof(uint32_t) * naxis);
-    if(naxes == NULL)
+    naxes = (uint32_t *)malloc(sizeof(uint32_t) * naxis);
+    if (naxes == NULL)
     {
         PRINT_ERROR("malloc() error");
         exit(0);
     }
 
-
-    for(i = 0; i < naxis; i++)
+    for (i = 0; i < naxis; i++)
     {
         naxes[i] = data.image[ID].md[0].size[i];
     }
 
-
     datatypeout = _DATATYPE_FLOAT;
-    if(datatype == _DATATYPE_DOUBLE)
+    if (datatype == _DATATYPE_DOUBLE)
     {
         datatypeout = _DATATYPE_DOUBLE;
     }
 
-    create_image_ID(ID_out, naxis, naxes, datatypeout, data.SHARED_DFT,
-                            data.NBKEYWORD_DFT, 0, &IDout);
+    create_image_ID(ID_out, naxis, naxes, datatypeout, data.SHARED_DFT, data.NBKEYWORD_DFT, 0, &IDout);
     free(naxes);
 
     nelement = data.image[ID].md[0].nelement;
 
-
-# ifdef _OPENMP
-    #pragma omp parallel if (nelement>OMP_NELEMENT_LIMIT)
+#ifdef _OPENMP
+#pragma omp parallel if (nelement > OMP_NELEMENT_LIMIT)
     {
-# endif
-
+#endif
 
-        if(datatype == _DATATYPE_UINT8)
+        if (datatype == _DATATYPE_UINT8)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[IDout].array.F[ii] = pt2function((double)(
-                                                    data.image[ID].array.UI8[ii]));
+                data.image[IDout].array.F[ii] = pt2function((double)(data.image[ID].array.UI8[ii]));
             }
         }
-        if(datatype == _DATATYPE_UINT16)
+        if (datatype == _DATATYPE_UINT16)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[IDout].array.F[ii] = pt2function((double)(
-                                                    data.image[ID].array.UI16[ii]));
+                data.image[IDout].array.F[ii] = pt2function((double)(data.image[ID].array.UI16[ii]));
             }
         }
-        if(datatype == _DATATYPE_UINT32)
+        if (datatype == _DATATYPE_UINT32)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[IDout].array.F[ii] = pt2function((double)(
-                                                    data.image[ID].array.UI32[ii]));
+                data.image[IDout].array.F[ii] = pt2function((double)(data.image[ID].array.UI32[ii]));
             }
         }
-        if(datatype == _DATATYPE_UINT64)
+        if (datatype == _DATATYPE_UINT64)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[IDout].array.F[ii] = pt2function((double)(
-                                                    data.image[ID].array.UI64[ii]));
+                data.image[IDout].array.F[ii] = pt2function((double)(data.image[ID].array.UI64[ii]));
             }
         }
 
-        if(datatype == _DATATYPE_INT8)
+        if (datatype == _DATATYPE_INT8)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[IDout].array.F[ii] = pt2function((double)(
-                                                    data.image[ID].array.SI8[ii]));
+                data.image[IDout].array.F[ii] = pt2function((double)(data.image[ID].array.SI8[ii]));
             }
         }
-        if(datatype == _DATATYPE_INT16)
+        if (datatype == _DATATYPE_INT16)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[IDout].array.F[ii] = pt2function((double)(
-                                                    data.image[ID].array.SI16[ii]));
+                data.image[IDout].array.F[ii] = pt2function((double)(data.image[ID].array.SI16[ii]));
             }
         }
-        if(datatype == _DATATYPE_INT32)
+        if (datatype == _DATATYPE_INT32)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[IDout].array.F[ii] = pt2function((double)(
-                                                    data.image[ID].array.SI32[ii]));
+                data.image[IDout].array.F[ii] = pt2function((double)(data.image[ID].array.SI32[ii]));
             }
         }
-        if(datatype == _DATATYPE_INT64)
+        if (datatype == _DATATYPE_INT64)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[IDout].array.F[ii] = pt2function((double)(
-                                                    data.image[ID].array.SI64[ii]));
+                data.image[IDout].array.F[ii] = pt2function((double)(data.image[ID].array.SI64[ii]));
             }
         }
 
-        if(datatype == _DATATYPE_FLOAT)
+        if (datatype == _DATATYPE_FLOAT)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[IDout].array.F[ii] = pt2function((double)(
-                                                    data.image[ID].array.F[ii]));
+                data.image[IDout].array.F[ii] = pt2function((double)(data.image[ID].array.F[ii]));
             }
         }
 
-
-        if(datatype == _DATATYPE_DOUBLE)
+        if (datatype == _DATATYPE_DOUBLE)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[IDout].array.D[ii] = (double) pt2function((double)(
-                                                    data.image[ID].array.D[ii]));
+                data.image[IDout].array.D[ii] = (double)pt2function((double)(data.image[ID].array.D[ii]));
             }
         }
-# ifdef _OPENMP
+#ifdef _OPENMP
     }
-# endif
+#endif
 
     return RETURN_SUCCESS;
 }
 
-
-
-
-
-
 // imagein -> imagein (in place)
-errno_t arith_image_function_1_1_inplace_byID(
-    imageID ID,
-    double (*pt2function)(double)
-)
+errno_t arith_image_function_1_1_inplace_byID(imageID ID, double (*pt2function)(double))
 {
     long ii;
     long nelement;
@@ -980,129 +834,118 @@ errno_t arith_image_function_1_1_inplace_byID(
     nelement = data.image[ID].md[0].nelement;
 
     data.image[ID].md[0].write = 0;
-# ifdef _OPENMP
-    #pragma omp parallel if (nelement>OMP_NELEMENT_LIMIT)
+#ifdef _OPENMP
+#pragma omp parallel if (nelement > OMP_NELEMENT_LIMIT)
     {
 #endif
 
-        if(datatype == _DATATYPE_UINT8)
+        if (datatype == _DATATYPE_UINT8)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[ID].array.F[ii] = pt2function((double)(
-                                                 data.image[ID].array.UI8[ii]));
+                data.image[ID].array.F[ii] = pt2function((double)(data.image[ID].array.UI8[ii]));
             }
         }
-        if(datatype == _DATATYPE_UINT16)
+        if (datatype == _DATATYPE_UINT16)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[ID].array.F[ii] = pt2function((double)(
-                                                 data.image[ID].array.UI16[ii]));
+                data.image[ID].array.F[ii] = pt2function((double)(data.image[ID].array.UI16[ii]));
             }
         }
-        if(datatype == _DATATYPE_UINT32)
+        if (datatype == _DATATYPE_UINT32)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[ID].array.F[ii] = pt2function((double)(
-                                                 data.image[ID].array.UI32[ii]));
+                data.image[ID].array.F[ii] = pt2function((double)(data.image[ID].array.UI32[ii]));
             }
         }
-        if(datatype == _DATATYPE_UINT64)
+        if (datatype == _DATATYPE_UINT64)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[ID].array.F[ii] = pt2function((double)(
-                                                 data.image[ID].array.UI64[ii]));
+                data.image[ID].array.F[ii] = pt2function((double)(data.image[ID].array.UI64[ii]));
             }
         }
 
-
-        if(datatype == _DATATYPE_INT8)
+        if (datatype == _DATATYPE_INT8)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[ID].array.F[ii] = pt2function((double)(
-                                                 data.image[ID].array.SI8[ii]));
+                data.image[ID].array.F[ii] = pt2function((double)(data.image[ID].array.SI8[ii]));
             }
         }
-        if(datatype == _DATATYPE_INT16)
+        if (datatype == _DATATYPE_INT16)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[ID].array.F[ii] = pt2function((double)(
-                                                 data.image[ID].array.SI16[ii]));
+                data.image[ID].array.F[ii] = pt2function((double)(data.image[ID].array.SI16[ii]));
             }
         }
-        if(datatype == _DATATYPE_INT32)
+        if (datatype == _DATATYPE_INT32)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[ID].array.F[ii] = pt2function((double)(
-                                                 data.image[ID].array.SI32[ii]));
+                data.image[ID].array.F[ii] = pt2function((double)(data.image[ID].array.SI32[ii]));
             }
         }
-        if(datatype == _DATATYPE_INT64)
+        if (datatype == _DATATYPE_INT64)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[ID].array.F[ii] = pt2function((double)(
-                                                 data.image[ID].array.SI64[ii]));
+                data.image[ID].array.F[ii] = pt2function((double)(data.image[ID].array.SI64[ii]));
             }
         }
 
-
-        if(datatype == _DATATYPE_FLOAT)
+        if (datatype == _DATATYPE_FLOAT)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
                 data.image[ID].array.F[ii] = pt2function((double)(data.image[ID].array.F[ii]));
             }
         }
 
-        if(datatype == _DATATYPE_DOUBLE)
+        if (datatype == _DATATYPE_DOUBLE)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[ID].array.D[ii] = (double) pt2function((double)(
-                                                 data.image[ID].array.D[ii]));
+                data.image[ID].array.D[ii] = (double)pt2function((double)(data.image[ID].array.D[ii]));
             }
         }
 
-# ifdef _OPENMP
+#ifdef _OPENMP
     }
-# endif
+#endif
 
     data.image[ID].md[0].write = 0;
     data.image[ID].md[0].cnt0++;
@@ -1110,16 +953,8 @@ errno_t arith_image_function_1_1_inplace_byID(
     return RETURN_SUCCESS;
 }
 
-
-
-
-
-
 // imagein -> imagein (in place)
-errno_t arith_image_function_1_1_inplace(
-    const char *ID_name,
-    double (*pt2function)(double)
-)
+errno_t arith_image_function_1_1_inplace(const char *ID_name, double (*pt2function)(double))
 {
     imageID ID;
     long ii;
@@ -1132,135 +967,124 @@ errno_t arith_image_function_1_1_inplace(
     ID = image_ID(ID_name);
     datatype = data.image[ID].md[0].datatype;
 
-//    datatypeout = _DATATYPE_FLOAT;
-//    if(datatype == _DATATYPE_DOUBLE)
-//        datatypeout = _DATATYPE_DOUBLE;
+    //    datatypeout = _DATATYPE_FLOAT;
+    //    if(datatype == _DATATYPE_DOUBLE)
+    //        datatypeout = _DATATYPE_DOUBLE;
 
     nelement = data.image[ID].md[0].nelement;
 
     data.image[ID].md[0].write = 0;
-# ifdef _OPENMP
-    #pragma omp parallel if (nelement>OMP_NELEMENT_LIMIT)
+#ifdef _OPENMP
+#pragma omp parallel if (nelement > OMP_NELEMENT_LIMIT)
     {
 #endif
 
-        if(datatype == _DATATYPE_UINT8)
+        if (datatype == _DATATYPE_UINT8)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[ID].array.F[ii] = pt2function((double)(
-                                                 data.image[ID].array.UI8[ii]));
+                data.image[ID].array.F[ii] = pt2function((double)(data.image[ID].array.UI8[ii]));
             }
         }
-        if(datatype == _DATATYPE_UINT16)
+        if (datatype == _DATATYPE_UINT16)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[ID].array.F[ii] = pt2function((double)(
-                                                 data.image[ID].array.UI16[ii]));
+                data.image[ID].array.F[ii] = pt2function((double)(data.image[ID].array.UI16[ii]));
             }
         }
-        if(datatype == _DATATYPE_UINT32)
+        if (datatype == _DATATYPE_UINT32)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[ID].array.F[ii] = pt2function((double)(
-                                                 data.image[ID].array.UI32[ii]));
+                data.image[ID].array.F[ii] = pt2function((double)(data.image[ID].array.UI32[ii]));
             }
         }
-        if(datatype == _DATATYPE_UINT64)
+        if (datatype == _DATATYPE_UINT64)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[ID].array.F[ii] = pt2function((double)(
-                                                 data.image[ID].array.UI64[ii]));
+                data.image[ID].array.F[ii] = pt2function((double)(data.image[ID].array.UI64[ii]));
             }
         }
 
-
-        if(datatype == _DATATYPE_INT8)
+        if (datatype == _DATATYPE_INT8)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[ID].array.F[ii] = pt2function((double)(
-                                                 data.image[ID].array.SI8[ii]));
+                data.image[ID].array.F[ii] = pt2function((double)(data.image[ID].array.SI8[ii]));
             }
         }
-        if(datatype == _DATATYPE_INT16)
+        if (datatype == _DATATYPE_INT16)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[ID].array.F[ii] = pt2function((double)(
-                                                 data.image[ID].array.SI16[ii]));
+                data.image[ID].array.F[ii] = pt2function((double)(data.image[ID].array.SI16[ii]));
             }
         }
-        if(datatype == _DATATYPE_INT32)
+        if (datatype == _DATATYPE_INT32)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[ID].array.F[ii] = pt2function((double)(
-                                                 data.image[ID].array.SI32[ii]));
+                data.image[ID].array.F[ii] = pt2function((double)(data.image[ID].array.SI32[ii]));
             }
         }
-        if(datatype == _DATATYPE_INT64)
+        if (datatype == _DATATYPE_INT64)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[ID].array.F[ii] = pt2function((double)(
-                                                 data.image[ID].array.SI64[ii]));
+                data.image[ID].array.F[ii] = pt2function((double)(data.image[ID].array.SI64[ii]));
             }
         }
 
-
-        if(datatype == _DATATYPE_FLOAT)
+        if (datatype == _DATATYPE_FLOAT)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
                 data.image[ID].array.F[ii] = pt2function((double)(data.image[ID].array.F[ii]));
             }
         }
-        if(datatype == _DATATYPE_DOUBLE)
+        if (datatype == _DATATYPE_DOUBLE)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[ID].array.D[ii] = (double) pt2function((double)(
-                                                 data.image[ID].array.D[ii]));
+                data.image[ID].array.D[ii] = (double)pt2function((double)(data.image[ID].array.D[ii]));
             }
         }
 
-# ifdef _OPENMP
+#ifdef _OPENMP
     }
-# endif
+#endif
 
     data.image[ID].md[0].write = 0;
     data.image[ID].md[0].cnt0++;
@@ -1268,24 +1092,12 @@ errno_t arith_image_function_1_1_inplace(
     return RETURN_SUCCESS;
 }
 
-
-
-
-
-
-
-
 /* ------------------------------------------------------------------------- */
 /* image, image  -> image                                                    */
 /* ------------------------------------------------------------------------- */
 
-
-errno_t arith_image_function_2_1(
-    const char *ID_name1,
-    const char *ID_name2,
-    const char *ID_out,
-    double (*pt2function)(double, double)
-)
+errno_t arith_image_function_2_1(const char *ID_name1, const char *ID_name2, const char *ID_out,
+                                 double (*pt2function)(double, double))
 {
     imageID ID1;
     imageID ID2;
@@ -1300,21 +1112,19 @@ errno_t arith_image_function_2_1(
     int op3D2Dto3D = 0; // 3D image, 2D image -> 3D image
     long xysize;
 
-
-
     ID1 = image_ID(ID_name1);
     ID2 = image_ID(ID_name2);
 
     //list_image_ID(); //TEST
     printf("%s  IDs : %ld %ld\n", __FUNCTION__, ID1, ID2);
 
-    if(ID1 == -1)
+    if (ID1 == -1)
     {
         PRINT_WARNING("Image %s does not exist: cannot proceed\n", ID_name1);
         return 1;
     }
 
-    if(ID2 == -1)
+    if (ID2 == -1)
     {
         PRINT_WARNING("Image %s does not exist: cannot proceed\n", ID_name2);
         return 1;
@@ -1325,68 +1135,59 @@ errno_t arith_image_function_2_1(
     naxis = data.image[ID1].md[0].naxis;
     naxis2 = data.image[ID2].md[0].naxis;
 
-    naxes = (uint32_t *) malloc(sizeof(uint32_t) * naxis);
-    if(naxes == NULL)
+    naxes = (uint32_t *)malloc(sizeof(uint32_t) * naxis);
+    if (naxes == NULL)
     {
         PRINT_ERROR("malloc() error");
         abort();
     }
 
-    naxes2 = (uint32_t *) malloc(sizeof(uint32_t) * naxis);
-    if(naxes2 == NULL)
+    naxes2 = (uint32_t *)malloc(sizeof(uint32_t) * naxis);
+    if (naxes2 == NULL)
     {
         PRINT_ERROR("malloc() error");
         abort();
     }
 
-
-    for(uint8_t i = 0; i < naxis; i++)
+    for (uint8_t i = 0; i < naxis; i++)
     {
         naxes[i] = data.image[ID1].md[0].size[i];
     }
-    for(uint8_t i = 0; i < naxis2; i++)
+    for (uint8_t i = 0; i < naxis2; i++)
     {
         naxes2[i] = data.image[ID2].md[0].size[i];
     }
 
-
     datatypeout = _DATATYPE_FLOAT; // default
 
     // other cases
 
     // DOUBLE * -> DOUBLE
-    if(datatype1 == _DATATYPE_DOUBLE)
+    if (datatype1 == _DATATYPE_DOUBLE)
     {
         datatypeout = _DATATYPE_DOUBLE;
     }
 
     // * DOUBLE -> DOUBLE
-    if(datatype2 == _DATATYPE_DOUBLE)
+    if (datatype2 == _DATATYPE_DOUBLE)
     {
         datatypeout = _DATATYPE_DOUBLE;
     }
 
-
-
-    create_image_ID(ID_out, naxis, naxes, datatypeout, data.SHARED_DFT,
-                            data.NBKEYWORD_DFT, 0, &IDout);
-
-
+    create_image_ID(ID_out, naxis, naxes, datatypeout, data.SHARED_DFT, data.NBKEYWORD_DFT, 0, &IDout);
 
     nelement1 = data.image[ID1].md[0].nelement;
     nelement2 = data.image[ID2].md[0].nelement;
 
-
     // test if 3D 2D -> 3D operation
 
     op3D2Dto3D = 0;
     xysize = 0;
-    if((naxis == 3) && (naxis2 == 2))
+    if ((naxis == 3) && (naxis2 == 2))
     {
-        printf("naxes:  %ld %ld     %ld %ld\n", (long) naxes[0], (long) naxes2[0],
-               (long) naxes[1], (long) naxes2[1]);
+        printf("naxes:  %ld %ld     %ld %ld\n", (long)naxes[0], (long)naxes2[0], (long)naxes[1], (long)naxes2[1]);
         fflush(stdout);
-        if((naxes[0] == naxes2[0]) && (naxes[1] == naxes2[1]))
+        if ((naxes[0] == naxes2[0]) && (naxes[1] == naxes2[1]))
         {
             op3D2Dto3D = 1;
             xysize = naxes[0] * naxes[1];
@@ -1396,2589 +1197,2551 @@ errno_t arith_image_function_2_1(
         }
     }
 
-
     nelement = nelement1;
-    if(op3D2Dto3D == 0)
-        if(nelement1 != nelement2)
+    if (op3D2Dto3D == 0)
+        if (nelement1 != nelement2)
         {
-            PRINT_ERROR(
-                "images %s and %s have different number of elements ( %ld %ld )\n", ID_name1,
-                ID_name2, nelement1, nelement2);
+            PRINT_ERROR("images %s and %s have different number of elements ( %ld %ld )\n", ID_name1, ID_name2,
+                        nelement1, nelement2);
             exit(0);
         }
 
+    //# ifdef _OPENMP
+    //    #pragma omp parallel if (nelement>OMP_NELEMENT_LIMIT)
+    //    {
+    //# endif
 
-
-
-//# ifdef _OPENMP
-//    #pragma omp parallel if (nelement>OMP_NELEMENT_LIMIT)
-//    {
-//# endif
-
-
-// ID1 datatype  UINT8
-    if(datatype1 == _DATATYPE_UINT8)
+    // ID1 datatype  UINT8
+    if (datatype1 == _DATATYPE_UINT8)
     {
-        if(datatype2 == _DATATYPE_UINT8) // UINT8 UINT8 -> FLOAT
+        if (datatype2 == _DATATYPE_UINT8) // UINT8 UINT8 -> FLOAT
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.F[ii] = pt2function((double)(
-                                                        data.image[ID1].array.UI8[ii]), (double)(data.image[ID2].array.UI8[ii]));
+                    data.image[IDout].array.F[ii] =
+                        pt2function((double)(data.image[ID1].array.UI8[ii]), (double)(data.image[ID2].array.UI8[ii]));
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
-                        data.image[IDout].array.F[kk * xysize + ii] = pt2function((double)(
-                                    data.image[ID1].array.UI8[kk * xysize + ii]),
-                                (double)(data.image[ID2].array.UI8[ii]));
+                        data.image[IDout].array.F[kk * xysize + ii] =
+                            pt2function((double)(data.image[ID1].array.UI8[kk * xysize + ii]),
+                                        (double)(data.image[ID2].array.UI8[ii]));
                     }
         }
 
-        if(datatype2 == _DATATYPE_UINT16) // UINT8 UINT16 -> FLOAT
+        if (datatype2 == _DATATYPE_UINT16) // UINT8 UINT16 -> FLOAT
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.F[ii] = pt2function((double)(
-                                                        data.image[ID1].array.UI8[ii]), (double)(data.image[ID2].array.UI16[ii]));
+                    data.image[IDout].array.F[ii] =
+                        pt2function((double)(data.image[ID1].array.UI8[ii]), (double)(data.image[ID2].array.UI16[ii]));
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
-                        data.image[IDout].array.F[kk * xysize + ii] = pt2function((double)(
-                                    data.image[ID1].array.UI8[kk * xysize + ii]),
-                                (double)(data.image[ID2].array.UI16[ii]));
+                        data.image[IDout].array.F[kk * xysize + ii] =
+                            pt2function((double)(data.image[ID1].array.UI8[kk * xysize + ii]),
+                                        (double)(data.image[ID2].array.UI16[ii]));
                     }
         }
 
-        if(datatype2 == _DATATYPE_UINT32) // UINT8 UINT32 -> FLOAT
+        if (datatype2 == _DATATYPE_UINT32) // UINT8 UINT32 -> FLOAT
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.F[ii] = pt2function((double)(
-                                                        data.image[ID1].array.UI8[ii]), (double)(data.image[ID2].array.UI32[ii]));
+                    data.image[IDout].array.F[ii] =
+                        pt2function((double)(data.image[ID1].array.UI8[ii]), (double)(data.image[ID2].array.UI32[ii]));
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
-                        data.image[IDout].array.F[kk * xysize + ii] = pt2function((double)(
-                                    data.image[ID1].array.UI8[kk * xysize + ii]),
-                                (double)(data.image[ID2].array.UI32[ii]));
+                        data.image[IDout].array.F[kk * xysize + ii] =
+                            pt2function((double)(data.image[ID1].array.UI8[kk * xysize + ii]),
+                                        (double)(data.image[ID2].array.UI32[ii]));
                     }
         }
 
-        if(datatype2 == _DATATYPE_UINT64) // UINT8 UINT64 -> FLOAT
+        if (datatype2 == _DATATYPE_UINT64) // UINT8 UINT64 -> FLOAT
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.F[ii] = pt2function((double)(
-                                                        data.image[ID1].array.UI8[ii]), (double)(data.image[ID2].array.UI64[ii]));
+                    data.image[IDout].array.F[ii] =
+                        pt2function((double)(data.image[ID1].array.UI8[ii]), (double)(data.image[ID2].array.UI64[ii]));
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
-                        data.image[IDout].array.F[kk * xysize + ii] = pt2function((double)(
-                                    data.image[ID1].array.UI8[kk * xysize + ii]),
-                                (double)(data.image[ID2].array.UI64[ii]));
+                        data.image[IDout].array.F[kk * xysize + ii] =
+                            pt2function((double)(data.image[ID1].array.UI8[kk * xysize + ii]),
+                                        (double)(data.image[ID2].array.UI64[ii]));
                     }
         }
 
-        if(datatype2 == _DATATYPE_INT8) // UINT8 INT8 -> FLOAT
+        if (datatype2 == _DATATYPE_INT8) // UINT8 INT8 -> FLOAT
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.F[ii] = pt2function((double)(
-                                                        data.image[ID1].array.UI8[ii]), (double)(data.image[ID2].array.SI8[ii]));
+                    data.image[IDout].array.F[ii] =
+                        pt2function((double)(data.image[ID1].array.UI8[ii]), (double)(data.image[ID2].array.SI8[ii]));
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
-                        data.image[IDout].array.F[kk * xysize + ii] = pt2function((double)(
-                                    data.image[ID1].array.UI8[kk * xysize + ii]),
-                                (double)(data.image[ID2].array.SI8[ii]));
+                        data.image[IDout].array.F[kk * xysize + ii] =
+                            pt2function((double)(data.image[ID1].array.UI8[kk * xysize + ii]),
+                                        (double)(data.image[ID2].array.SI8[ii]));
                     }
         }
 
-        if(datatype2 == _DATATYPE_INT16) // UINT8 INT16 -> FLOAT
+        if (datatype2 == _DATATYPE_INT16) // UINT8 INT16 -> FLOAT
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.F[ii] = pt2function((double)(
-                                                        data.image[ID1].array.UI8[ii]), (double)(data.image[ID2].array.SI16[ii]));
+                    data.image[IDout].array.F[ii] =
+                        pt2function((double)(data.image[ID1].array.UI8[ii]), (double)(data.image[ID2].array.SI16[ii]));
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
-                        data.image[IDout].array.F[kk * xysize + ii] = pt2function((double)(
-                                    data.image[ID1].array.UI8[kk * xysize + ii]),
-                                (double)(data.image[ID2].array.SI16[ii]));
+                        data.image[IDout].array.F[kk * xysize + ii] =
+                            pt2function((double)(data.image[ID1].array.UI8[kk * xysize + ii]),
+                                        (double)(data.image[ID2].array.SI16[ii]));
                     }
         }
 
-        if(datatype2 == _DATATYPE_INT32) // UINT8 INT32 -> FLOAT
+        if (datatype2 == _DATATYPE_INT32) // UINT8 INT32 -> FLOAT
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.F[ii] = pt2function((double)(
-                                                        data.image[ID1].array.UI8[ii]), (double)(data.image[ID2].array.SI32[ii]));
+                    data.image[IDout].array.F[ii] =
+                        pt2function((double)(data.image[ID1].array.UI8[ii]), (double)(data.image[ID2].array.SI32[ii]));
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
-                        data.image[IDout].array.F[kk * xysize + ii] = pt2function((double)(
-                                    data.image[ID1].array.UI8[kk * xysize + ii]),
-                                (double)(data.image[ID2].array.SI32[ii]));
+                        data.image[IDout].array.F[kk * xysize + ii] =
+                            pt2function((double)(data.image[ID1].array.UI8[kk * xysize + ii]),
+                                        (double)(data.image[ID2].array.SI32[ii]));
                     }
         }
 
-        if(datatype2 == _DATATYPE_INT64) // UINT8 INT64 -> FLOAT
+        if (datatype2 == _DATATYPE_INT64) // UINT8 INT64 -> FLOAT
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.F[ii] = pt2function((double)(
-                                                        data.image[ID1].array.UI8[ii]), (double)(data.image[ID2].array.SI64[ii]));
+                    data.image[IDout].array.F[ii] =
+                        pt2function((double)(data.image[ID1].array.UI8[ii]), (double)(data.image[ID2].array.SI64[ii]));
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
-                        data.image[IDout].array.F[kk * xysize + ii] = pt2function((double)(
-                                    data.image[ID1].array.UI8[kk * xysize + ii]),
-                                (double)(data.image[ID2].array.SI64[ii]));
+                        data.image[IDout].array.F[kk * xysize + ii] =
+                            pt2function((double)(data.image[ID1].array.UI8[kk * xysize + ii]),
+                                        (double)(data.image[ID2].array.SI64[ii]));
                     }
         }
 
-        if(datatype2 == _DATATYPE_FLOAT) // UINT8 FLOAT -> FLOAT
+        if (datatype2 == _DATATYPE_FLOAT) // UINT8 FLOAT -> FLOAT
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.F[ii] = pt2function((double)(
-                                                        data.image[ID1].array.UI8[ii]), (double)(data.image[ID2].array.F[ii]));
+                    data.image[IDout].array.F[ii] =
+                        pt2function((double)(data.image[ID1].array.UI8[ii]), (double)(data.image[ID2].array.F[ii]));
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
-                        data.image[IDout].array.F[kk * xysize + ii] = pt2function((double)(
-                                    data.image[ID1].array.UI8[kk * xysize + ii]),
-                                (double)(data.image[ID2].array.F[ii]));
+                        data.image[IDout].array.F[kk * xysize + ii] =
+                            pt2function((double)(data.image[ID1].array.UI8[kk * xysize + ii]),
+                                        (double)(data.image[ID2].array.F[ii]));
                     }
         }
 
-        if(datatype2 == _DATATYPE_DOUBLE) // UINT8 DOUBLE -> DOUBLE
+        if (datatype2 == _DATATYPE_DOUBLE) // UINT8 DOUBLE -> DOUBLE
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.D[ii] = pt2function((double)(
-                                                        data.image[ID1].array.UI8[ii]), data.image[ID2].array.D[ii]);
+                    data.image[IDout].array.D[ii] =
+                        pt2function((double)(data.image[ID1].array.UI8[ii]), data.image[ID2].array.D[ii]);
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
-                        data.image[IDout].array.D[kk * xysize + ii] = pt2function((double)(
-                                    data.image[ID1].array.UI8[kk * xysize + ii]), data.image[ID2].array.D[ii]);
+                        data.image[IDout].array.D[kk * xysize + ii] = pt2function(
+                            (double)(data.image[ID1].array.UI8[kk * xysize + ii]), data.image[ID2].array.D[ii]);
                     }
         }
     }
 
+    // ID1 datatype  UINT16
 
-
-// ID1 datatype  UINT16
-
-    if(datatype1 == _DATATYPE_UINT16)
+    if (datatype1 == _DATATYPE_UINT16)
     {
-        if(datatype2 == _DATATYPE_UINT8) // UINT16 UINT8 -> FLOAT
+        if (datatype2 == _DATATYPE_UINT8) // UINT16 UINT8 -> FLOAT
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.F[ii] = pt2function((double)(
-                                                        data.image[ID1].array.UI16[ii]), (double)(data.image[ID2].array.UI8[ii]));
+                    data.image[IDout].array.F[ii] =
+                        pt2function((double)(data.image[ID1].array.UI16[ii]), (double)(data.image[ID2].array.UI8[ii]));
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
-                        data.image[IDout].array.F[kk * xysize + ii] = pt2function((double)(
-                                    data.image[ID1].array.UI16[kk * xysize + ii]),
-                                (double)(data.image[ID2].array.UI8[ii]));
+                        data.image[IDout].array.F[kk * xysize + ii] =
+                            pt2function((double)(data.image[ID1].array.UI16[kk * xysize + ii]),
+                                        (double)(data.image[ID2].array.UI8[ii]));
                     }
         }
 
-        if(datatype2 == _DATATYPE_UINT16) // UINT16 UINT16 -> FLOAT
+        if (datatype2 == _DATATYPE_UINT16) // UINT16 UINT16 -> FLOAT
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.F[ii] = pt2function((double)(
-                                                        data.image[ID1].array.UI16[ii]), (double)(data.image[ID2].array.UI16[ii]));
+                    data.image[IDout].array.F[ii] =
+                        pt2function((double)(data.image[ID1].array.UI16[ii]), (double)(data.image[ID2].array.UI16[ii]));
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
-                        data.image[IDout].array.F[kk * xysize + ii] = pt2function((double)(
-                                    data.image[ID1].array.UI16[kk * xysize + ii]),
-                                (double)(data.image[ID2].array.UI16[ii]));
+                        data.image[IDout].array.F[kk * xysize + ii] =
+                            pt2function((double)(data.image[ID1].array.UI16[kk * xysize + ii]),
+                                        (double)(data.image[ID2].array.UI16[ii]));
                     }
         }
 
-        if(datatype2 == _DATATYPE_UINT32) // UINT16 UINT32 -> FLOAT
+        if (datatype2 == _DATATYPE_UINT32) // UINT16 UINT32 -> FLOAT
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.F[ii] = pt2function((double)(
-                                                        data.image[ID1].array.UI16[ii]), (double)(data.image[ID2].array.UI32[ii]));
+                    data.image[IDout].array.F[ii] =
+                        pt2function((double)(data.image[ID1].array.UI16[ii]), (double)(data.image[ID2].array.UI32[ii]));
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
-                        data.image[IDout].array.F[kk * xysize + ii] = pt2function((double)(
-                                    data.image[ID1].array.UI16[kk * xysize + ii]),
-                                (double)(data.image[ID2].array.UI32[ii]));
+                        data.image[IDout].array.F[kk * xysize + ii] =
+                            pt2function((double)(data.image[ID1].array.UI16[kk * xysize + ii]),
+                                        (double)(data.image[ID2].array.UI32[ii]));
                     }
         }
 
-        if(datatype2 == _DATATYPE_UINT64) // UINT16 UINT64 -> FLOAT
+        if (datatype2 == _DATATYPE_UINT64) // UINT16 UINT64 -> FLOAT
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.F[ii] = pt2function((double)(
-                                                        data.image[ID1].array.UI16[ii]), (double)(data.image[ID2].array.UI64[ii]));
+                    data.image[IDout].array.F[ii] =
+                        pt2function((double)(data.image[ID1].array.UI16[ii]), (double)(data.image[ID2].array.UI64[ii]));
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
-                        data.image[IDout].array.F[kk * xysize + ii] = pt2function((double)(
-                                    data.image[ID1].array.UI16[kk * xysize + ii]),
-                                (double)(data.image[ID2].array.UI64[ii]));
+                        data.image[IDout].array.F[kk * xysize + ii] =
+                            pt2function((double)(data.image[ID1].array.UI16[kk * xysize + ii]),
+                                        (double)(data.image[ID2].array.UI64[ii]));
                     }
         }
 
-        if(datatype2 == _DATATYPE_INT8) // UINT16 INT8 -> FLOAT
+        if (datatype2 == _DATATYPE_INT8) // UINT16 INT8 -> FLOAT
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.F[ii] = pt2function((double)(
-                                                        data.image[ID1].array.UI16[ii]), (double)(data.image[ID2].array.SI8[ii]));
+                    data.image[IDout].array.F[ii] =
+                        pt2function((double)(data.image[ID1].array.UI16[ii]), (double)(data.image[ID2].array.SI8[ii]));
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
-                        data.image[IDout].array.F[kk * xysize + ii] = pt2function((double)(
-                                    data.image[ID1].array.UI16[kk * xysize + ii]),
-                                (double)(data.image[ID2].array.SI8[ii]));
+                        data.image[IDout].array.F[kk * xysize + ii] =
+                            pt2function((double)(data.image[ID1].array.UI16[kk * xysize + ii]),
+                                        (double)(data.image[ID2].array.SI8[ii]));
                     }
         }
 
-        if(datatype2 == _DATATYPE_INT16) // UINT16 INT16 -> FLOAT
+        if (datatype2 == _DATATYPE_INT16) // UINT16 INT16 -> FLOAT
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.F[ii] = pt2function((double)(
-                                                        data.image[ID1].array.UI16[ii]), (double)(data.image[ID2].array.SI16[ii]));
+                    data.image[IDout].array.F[ii] =
+                        pt2function((double)(data.image[ID1].array.UI16[ii]), (double)(data.image[ID2].array.SI16[ii]));
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
-                        data.image[IDout].array.F[kk * xysize + ii] = pt2function((double)(
-                                    data.image[ID1].array.UI16[kk * xysize + ii]),
-                                (double)(data.image[ID2].array.SI16[ii]));
+                        data.image[IDout].array.F[kk * xysize + ii] =
+                            pt2function((double)(data.image[ID1].array.UI16[kk * xysize + ii]),
+                                        (double)(data.image[ID2].array.SI16[ii]));
                     }
         }
 
-        if(datatype2 == _DATATYPE_INT32) // UINT16 INT32 -> FLOAT
+        if (datatype2 == _DATATYPE_INT32) // UINT16 INT32 -> FLOAT
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.F[ii] = pt2function((double)(
-                                                        data.image[ID1].array.UI16[ii]), (double)(data.image[ID2].array.SI32[ii]));
+                    data.image[IDout].array.F[ii] =
+                        pt2function((double)(data.image[ID1].array.UI16[ii]), (double)(data.image[ID2].array.SI32[ii]));
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
-                        data.image[IDout].array.F[kk * xysize + ii] = pt2function((double)(
-                                    data.image[ID1].array.UI16[kk * xysize + ii]),
-                                (double)(data.image[ID2].array.SI32[ii]));
+                        data.image[IDout].array.F[kk * xysize + ii] =
+                            pt2function((double)(data.image[ID1].array.UI16[kk * xysize + ii]),
+                                        (double)(data.image[ID2].array.SI32[ii]));
                     }
         }
 
-        if(datatype2 == _DATATYPE_INT64) // UINT16 INT64 -> FLOAT
+        if (datatype2 == _DATATYPE_INT64) // UINT16 INT64 -> FLOAT
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.F[ii] = pt2function((double)(
-                                                        data.image[ID1].array.UI16[ii]), (double)(data.image[ID2].array.SI64[ii]));
+                    data.image[IDout].array.F[ii] =
+                        pt2function((double)(data.image[ID1].array.UI16[ii]), (double)(data.image[ID2].array.SI64[ii]));
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
-                        data.image[IDout].array.F[kk * xysize + ii] = pt2function((double)(
-                                    data.image[ID1].array.UI16[kk * xysize + ii]),
-                                (double)(data.image[ID2].array.SI64[ii]));
+                        data.image[IDout].array.F[kk * xysize + ii] =
+                            pt2function((double)(data.image[ID1].array.UI16[kk * xysize + ii]),
+                                        (double)(data.image[ID2].array.SI64[ii]));
                     }
         }
 
-        if(datatype2 == _DATATYPE_FLOAT) // UINT16 FLOAT -> FLOAT
+        if (datatype2 == _DATATYPE_FLOAT) // UINT16 FLOAT -> FLOAT
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.F[ii] = pt2function((double)(
-                                                        data.image[ID1].array.UI16[ii]), (double)(data.image[ID2].array.F[ii]));
+                    data.image[IDout].array.F[ii] =
+                        pt2function((double)(data.image[ID1].array.UI16[ii]), (double)(data.image[ID2].array.F[ii]));
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
-                        data.image[IDout].array.F[kk * xysize + ii] = pt2function((double)(
-                                    data.image[ID1].array.UI16[kk * xysize + ii]),
-                                (double)(data.image[ID2].array.F[ii]));
+                        data.image[IDout].array.F[kk * xysize + ii] =
+                            pt2function((double)(data.image[ID1].array.UI16[kk * xysize + ii]),
+                                        (double)(data.image[ID2].array.F[ii]));
                     }
         }
 
-        if(datatype2 == _DATATYPE_DOUBLE) // UINT16 DOUBLE -> DOUBLE
+        if (datatype2 == _DATATYPE_DOUBLE) // UINT16 DOUBLE -> DOUBLE
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.D[ii] = pt2function((double)(
-                                                        data.image[ID1].array.UI16[ii]), data.image[ID2].array.D[ii]);
+                    data.image[IDout].array.D[ii] =
+                        pt2function((double)(data.image[ID1].array.UI16[ii]), data.image[ID2].array.D[ii]);
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
-                        data.image[IDout].array.D[kk * xysize + ii] = pt2function((double)(
-                                    data.image[ID1].array.UI16[kk * xysize + ii]), data.image[ID2].array.D[ii]);
+                        data.image[IDout].array.D[kk * xysize + ii] = pt2function(
+                            (double)(data.image[ID1].array.UI16[kk * xysize + ii]), data.image[ID2].array.D[ii]);
                     }
         }
     }
 
-
-// ID1 datatype  UINT32
-    if(datatype1 == _DATATYPE_UINT32)
+    // ID1 datatype  UINT32
+    if (datatype1 == _DATATYPE_UINT32)
     {
 
-        if(datatype2 == _DATATYPE_UINT8) // UINT32 UINT8 -> FLOAT
+        if (datatype2 == _DATATYPE_UINT8) // UINT32 UINT8 -> FLOAT
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.F[ii] = pt2function((double)(
-                                                        data.image[ID1].array.UI32[ii]), (double)(data.image[ID2].array.UI8[ii]));
+                    data.image[IDout].array.F[ii] =
+                        pt2function((double)(data.image[ID1].array.UI32[ii]), (double)(data.image[ID2].array.UI8[ii]));
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
-                        data.image[IDout].array.F[kk * xysize + ii] = pt2function((double)(
-                                    data.image[ID1].array.UI32[kk * xysize + ii]),
-                                (double)(data.image[ID2].array.UI8[ii]));
+                        data.image[IDout].array.F[kk * xysize + ii] =
+                            pt2function((double)(data.image[ID1].array.UI32[kk * xysize + ii]),
+                                        (double)(data.image[ID2].array.UI8[ii]));
                     }
         }
 
-        if(datatype2 == _DATATYPE_UINT16) // UINT32 UINT16 -> FLOAT
+        if (datatype2 == _DATATYPE_UINT16) // UINT32 UINT16 -> FLOAT
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.F[ii] = pt2function((double)(
-                                                        data.image[ID1].array.UI32[ii]), (double)(data.image[ID2].array.UI16[ii]));
+                    data.image[IDout].array.F[ii] =
+                        pt2function((double)(data.image[ID1].array.UI32[ii]), (double)(data.image[ID2].array.UI16[ii]));
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
-                        data.image[IDout].array.F[kk * xysize + ii] = pt2function((double)(
-                                    data.image[ID1].array.UI32[kk * xysize + ii]),
-                                (double)(data.image[ID2].array.UI16[ii]));
+                        data.image[IDout].array.F[kk * xysize + ii] =
+                            pt2function((double)(data.image[ID1].array.UI32[kk * xysize + ii]),
+                                        (double)(data.image[ID2].array.UI16[ii]));
                     }
         }
 
-        if(datatype2 == _DATATYPE_UINT32) // UINT32 UINT32 -> FLOAT
+        if (datatype2 == _DATATYPE_UINT32) // UINT32 UINT32 -> FLOAT
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.F[ii] = pt2function((double)(
-                                                        data.image[ID1].array.UI32[ii]), (double)(data.image[ID2].array.UI32[ii]));
+                    data.image[IDout].array.F[ii] =
+                        pt2function((double)(data.image[ID1].array.UI32[ii]), (double)(data.image[ID2].array.UI32[ii]));
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
-                        data.image[IDout].array.F[kk * xysize + ii] = pt2function((double)(
-                                    data.image[ID1].array.UI32[kk * xysize + ii]),
-                                (double)(data.image[ID2].array.UI32[ii]));
+                        data.image[IDout].array.F[kk * xysize + ii] =
+                            pt2function((double)(data.image[ID1].array.UI32[kk * xysize + ii]),
+                                        (double)(data.image[ID2].array.UI32[ii]));
                     }
         }
 
-        if(datatype2 == _DATATYPE_UINT64) // UINT32 UINT64 -> FLOAT
+        if (datatype2 == _DATATYPE_UINT64) // UINT32 UINT64 -> FLOAT
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.F[ii] = pt2function((double)(
-                                                        data.image[ID1].array.UI32[ii]), (double)(data.image[ID2].array.UI64[ii]));
+                    data.image[IDout].array.F[ii] =
+                        pt2function((double)(data.image[ID1].array.UI32[ii]), (double)(data.image[ID2].array.UI64[ii]));
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
-                        data.image[IDout].array.F[kk * xysize + ii] = pt2function((double)(
-                                    data.image[ID1].array.UI32[kk * xysize + ii]),
-                                (double)(data.image[ID2].array.UI64[ii]));
+                        data.image[IDout].array.F[kk * xysize + ii] =
+                            pt2function((double)(data.image[ID1].array.UI32[kk * xysize + ii]),
+                                        (double)(data.image[ID2].array.UI64[ii]));
                     }
         }
 
-        if(datatype2 == _DATATYPE_INT8) // UINT32 INT8 -> FLOAT
+        if (datatype2 == _DATATYPE_INT8) // UINT32 INT8 -> FLOAT
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.F[ii] = pt2function((double)(
-                                                        data.image[ID1].array.UI32[ii]), (double)(data.image[ID2].array.SI8[ii]));
+                    data.image[IDout].array.F[ii] =
+                        pt2function((double)(data.image[ID1].array.UI32[ii]), (double)(data.image[ID2].array.SI8[ii]));
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
-                        data.image[IDout].array.F[kk * xysize + ii] = pt2function((double)(
-                                    data.image[ID1].array.UI32[kk * xysize + ii]),
-                                (double)(data.image[ID2].array.SI8[ii]));
+                        data.image[IDout].array.F[kk * xysize + ii] =
+                            pt2function((double)(data.image[ID1].array.UI32[kk * xysize + ii]),
+                                        (double)(data.image[ID2].array.SI8[ii]));
                     }
         }
 
-        if(datatype2 == _DATATYPE_INT16) // UINT32 INT16 -> FLOAT
+        if (datatype2 == _DATATYPE_INT16) // UINT32 INT16 -> FLOAT
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.F[ii] = pt2function((double)(
-                                                        data.image[ID1].array.UI32[ii]), (double)(data.image[ID2].array.SI16[ii]));
+                    data.image[IDout].array.F[ii] =
+                        pt2function((double)(data.image[ID1].array.UI32[ii]), (double)(data.image[ID2].array.SI16[ii]));
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
-                        data.image[IDout].array.F[kk * xysize + ii] = pt2function((double)(
-                                    data.image[ID1].array.UI32[kk * xysize + ii]),
-                                (double)(data.image[ID2].array.SI16[ii]));
+                        data.image[IDout].array.F[kk * xysize + ii] =
+                            pt2function((double)(data.image[ID1].array.UI32[kk * xysize + ii]),
+                                        (double)(data.image[ID2].array.SI16[ii]));
                     }
         }
 
-        if(datatype2 == _DATATYPE_INT32) // UINT32 INT32 -> FLOAT
+        if (datatype2 == _DATATYPE_INT32) // UINT32 INT32 -> FLOAT
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.F[ii] = pt2function((double)(
-                                                        data.image[ID1].array.UI32[ii]), (double)(data.image[ID2].array.SI32[ii]));
+                    data.image[IDout].array.F[ii] =
+                        pt2function((double)(data.image[ID1].array.UI32[ii]), (double)(data.image[ID2].array.SI32[ii]));
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
-                        data.image[IDout].array.F[kk * xysize + ii] = pt2function((double)(
-                                    data.image[ID1].array.UI32[kk * xysize + ii]),
-                                (double)(data.image[ID2].array.SI32[ii]));
+                        data.image[IDout].array.F[kk * xysize + ii] =
+                            pt2function((double)(data.image[ID1].array.UI32[kk * xysize + ii]),
+                                        (double)(data.image[ID2].array.SI32[ii]));
                     }
         }
 
-        if(datatype2 == _DATATYPE_INT64) // UINT32 INT64 -> FLOAT
+        if (datatype2 == _DATATYPE_INT64) // UINT32 INT64 -> FLOAT
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.F[ii] = pt2function((double)(
-                                                        data.image[ID1].array.UI32[ii]), (double)(data.image[ID2].array.SI64[ii]));
+                    data.image[IDout].array.F[ii] =
+                        pt2function((double)(data.image[ID1].array.UI32[ii]), (double)(data.image[ID2].array.SI64[ii]));
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
-                        data.image[IDout].array.F[kk * xysize + ii] = pt2function((double)(
-                                    data.image[ID1].array.UI32[kk * xysize + ii]),
-                                (double)(data.image[ID2].array.SI64[ii]));
+                        data.image[IDout].array.F[kk * xysize + ii] =
+                            pt2function((double)(data.image[ID1].array.UI32[kk * xysize + ii]),
+                                        (double)(data.image[ID2].array.SI64[ii]));
                     }
         }
 
-        if(datatype2 == _DATATYPE_FLOAT) // UINT32 FLOAT -> FLOAT
+        if (datatype2 == _DATATYPE_FLOAT) // UINT32 FLOAT -> FLOAT
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.F[ii] = pt2function((double)(
-                                                        data.image[ID1].array.UI32[ii]), (double)(data.image[ID2].array.F[ii]));
+                    data.image[IDout].array.F[ii] =
+                        pt2function((double)(data.image[ID1].array.UI32[ii]), (double)(data.image[ID2].array.F[ii]));
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
-                        data.image[IDout].array.F[kk * xysize + ii] = pt2function((double)(
-                                    data.image[ID1].array.UI32[kk * xysize + ii]),
-                                (double)(data.image[ID2].array.F[ii]));
+                        data.image[IDout].array.F[kk * xysize + ii] =
+                            pt2function((double)(data.image[ID1].array.UI32[kk * xysize + ii]),
+                                        (double)(data.image[ID2].array.F[ii]));
                     }
         }
 
-        if(datatype2 == _DATATYPE_DOUBLE) // UINT32 DOUBLE -> DOUBLE
+        if (datatype2 == _DATATYPE_DOUBLE) // UINT32 DOUBLE -> DOUBLE
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.D[ii] = pt2function((double)(
-                                                        data.image[ID1].array.UI32[ii]), data.image[ID2].array.D[ii]);
+                    data.image[IDout].array.D[ii] =
+                        pt2function((double)(data.image[ID1].array.UI32[ii]), data.image[ID2].array.D[ii]);
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
-                        data.image[IDout].array.D[kk * xysize + ii] = pt2function((double)(
-                                    data.image[ID1].array.UI32[kk * xysize + ii]), data.image[ID2].array.D[ii]);
+                        data.image[IDout].array.D[kk * xysize + ii] = pt2function(
+                            (double)(data.image[ID1].array.UI32[kk * xysize + ii]), data.image[ID2].array.D[ii]);
                     }
         }
     }
 
-
-
-// ID1 datatype  UINT64
-    if(datatype1 == _DATATYPE_UINT64)
+    // ID1 datatype  UINT64
+    if (datatype1 == _DATATYPE_UINT64)
     {
-        if(datatype2 == _DATATYPE_UINT8) // UINT64 UINT8 -> FLOAT
+        if (datatype2 == _DATATYPE_UINT8) // UINT64 UINT8 -> FLOAT
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.F[ii] = pt2function((double)(
-                                                        data.image[ID1].array.UI64[ii]), (double)(data.image[ID2].array.UI8[ii]));
+                    data.image[IDout].array.F[ii] =
+                        pt2function((double)(data.image[ID1].array.UI64[ii]), (double)(data.image[ID2].array.UI8[ii]));
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
-                        data.image[IDout].array.F[kk * xysize + ii] = pt2function((double)(
-                                    data.image[ID1].array.UI64[kk * xysize + ii]),
-                                (double)(data.image[ID2].array.UI8[ii]));
+                        data.image[IDout].array.F[kk * xysize + ii] =
+                            pt2function((double)(data.image[ID1].array.UI64[kk * xysize + ii]),
+                                        (double)(data.image[ID2].array.UI8[ii]));
                     }
         }
 
-        if(datatype2 == _DATATYPE_UINT16) // UINT64 UINT16 -> FLOAT
+        if (datatype2 == _DATATYPE_UINT16) // UINT64 UINT16 -> FLOAT
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.F[ii] = pt2function((double)(
-                                                        data.image[ID1].array.UI64[ii]), (double)(data.image[ID2].array.UI16[ii]));
+                    data.image[IDout].array.F[ii] =
+                        pt2function((double)(data.image[ID1].array.UI64[ii]), (double)(data.image[ID2].array.UI16[ii]));
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
-                        data.image[IDout].array.F[kk * xysize + ii] = pt2function((double)(
-                                    data.image[ID1].array.UI64[kk * xysize + ii]),
-                                (double)(data.image[ID2].array.UI16[ii]));
+                        data.image[IDout].array.F[kk * xysize + ii] =
+                            pt2function((double)(data.image[ID1].array.UI64[kk * xysize + ii]),
+                                        (double)(data.image[ID2].array.UI16[ii]));
                     }
         }
 
-        if(datatype2 == _DATATYPE_UINT32) // UINT64 UINT32 -> FLOAT
+        if (datatype2 == _DATATYPE_UINT32) // UINT64 UINT32 -> FLOAT
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.F[ii] = pt2function((double)(
-                                                        data.image[ID1].array.UI64[ii]), (double)(data.image[ID2].array.UI32[ii]));
+                    data.image[IDout].array.F[ii] =
+                        pt2function((double)(data.image[ID1].array.UI64[ii]), (double)(data.image[ID2].array.UI32[ii]));
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
-                        data.image[IDout].array.F[kk * xysize + ii] = pt2function((double)(
-                                    data.image[ID1].array.UI64[kk * xysize + ii]),
-                                (double)(data.image[ID2].array.UI32[ii]));
+                        data.image[IDout].array.F[kk * xysize + ii] =
+                            pt2function((double)(data.image[ID1].array.UI64[kk * xysize + ii]),
+                                        (double)(data.image[ID2].array.UI32[ii]));
                     }
         }
 
-        if(datatype2 == _DATATYPE_UINT64) // UINT64 UINT64 -> FLOAT
+        if (datatype2 == _DATATYPE_UINT64) // UINT64 UINT64 -> FLOAT
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.F[ii] = pt2function((double)(
-                                                        data.image[ID1].array.UI64[ii]), (double)(data.image[ID2].array.UI64[ii]));
+                    data.image[IDout].array.F[ii] =
+                        pt2function((double)(data.image[ID1].array.UI64[ii]), (double)(data.image[ID2].array.UI64[ii]));
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
-                        data.image[IDout].array.F[kk * xysize + ii] = pt2function((double)(
-                                    data.image[ID1].array.UI64[kk * xysize + ii]),
-                                (double)(data.image[ID2].array.UI64[ii]));
+                        data.image[IDout].array.F[kk * xysize + ii] =
+                            pt2function((double)(data.image[ID1].array.UI64[kk * xysize + ii]),
+                                        (double)(data.image[ID2].array.UI64[ii]));
                     }
         }
 
-        if(datatype2 == _DATATYPE_INT8) // UINT64 INT8 -> FLOAT
+        if (datatype2 == _DATATYPE_INT8) // UINT64 INT8 -> FLOAT
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.F[ii] = pt2function((double)(
-                                                        data.image[ID1].array.UI64[ii]), (double)(data.image[ID2].array.SI8[ii]));
+                    data.image[IDout].array.F[ii] =
+                        pt2function((double)(data.image[ID1].array.UI64[ii]), (double)(data.image[ID2].array.SI8[ii]));
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
-                        data.image[IDout].array.F[kk * xysize + ii] = pt2function((double)(
-                                    data.image[ID1].array.UI64[kk * xysize + ii]),
-                                (double)(data.image[ID2].array.SI8[ii]));
+                        data.image[IDout].array.F[kk * xysize + ii] =
+                            pt2function((double)(data.image[ID1].array.UI64[kk * xysize + ii]),
+                                        (double)(data.image[ID2].array.SI8[ii]));
                     }
         }
 
-        if(datatype2 == _DATATYPE_INT16) // UINT64 INT16 -> FLOAT
+        if (datatype2 == _DATATYPE_INT16) // UINT64 INT16 -> FLOAT
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.F[ii] = pt2function((double)(
-                                                        data.image[ID1].array.UI64[ii]), (double)(data.image[ID2].array.SI16[ii]));
+                    data.image[IDout].array.F[ii] =
+                        pt2function((double)(data.image[ID1].array.UI64[ii]), (double)(data.image[ID2].array.SI16[ii]));
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
-                        data.image[IDout].array.F[kk * xysize + ii] = pt2function((double)(
-                                    data.image[ID1].array.UI64[kk * xysize + ii]),
-                                (double)(data.image[ID2].array.SI16[ii]));
+                        data.image[IDout].array.F[kk * xysize + ii] =
+                            pt2function((double)(data.image[ID1].array.UI64[kk * xysize + ii]),
+                                        (double)(data.image[ID2].array.SI16[ii]));
                     }
         }
 
-        if(datatype2 == _DATATYPE_INT32) // UINT64 INT32 -> FLOAT
+        if (datatype2 == _DATATYPE_INT32) // UINT64 INT32 -> FLOAT
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.F[ii] = pt2function((double)(
-                                                        data.image[ID1].array.UI64[ii]), (double)(data.image[ID2].array.SI32[ii]));
+                    data.image[IDout].array.F[ii] =
+                        pt2function((double)(data.image[ID1].array.UI64[ii]), (double)(data.image[ID2].array.SI32[ii]));
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
-                        data.image[IDout].array.F[kk * xysize + ii] = pt2function((double)(
-                                    data.image[ID1].array.UI64[kk * xysize + ii]),
-                                (double)(data.image[ID2].array.SI32[ii]));
+                        data.image[IDout].array.F[kk * xysize + ii] =
+                            pt2function((double)(data.image[ID1].array.UI64[kk * xysize + ii]),
+                                        (double)(data.image[ID2].array.SI32[ii]));
                     }
         }
 
-        if(datatype2 == _DATATYPE_INT64) // UINT64 INT64 -> FLOAT
+        if (datatype2 == _DATATYPE_INT64) // UINT64 INT64 -> FLOAT
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.F[ii] = pt2function((double)(
-                                                        data.image[ID1].array.UI64[ii]), (double)(data.image[ID2].array.SI64[ii]));
+                    data.image[IDout].array.F[ii] =
+                        pt2function((double)(data.image[ID1].array.UI64[ii]), (double)(data.image[ID2].array.SI64[ii]));
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
-                        data.image[IDout].array.F[kk * xysize + ii] = pt2function((double)(
-                                    data.image[ID1].array.UI64[kk * xysize + ii]),
-                                (double)(data.image[ID2].array.SI64[ii]));
+                        data.image[IDout].array.F[kk * xysize + ii] =
+                            pt2function((double)(data.image[ID1].array.UI64[kk * xysize + ii]),
+                                        (double)(data.image[ID2].array.SI64[ii]));
                     }
         }
 
-        if(datatype2 == _DATATYPE_FLOAT) // UINT64 FLOAT -> FLOAT
+        if (datatype2 == _DATATYPE_FLOAT) // UINT64 FLOAT -> FLOAT
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.F[ii] = pt2function((double)(
-                                                        data.image[ID1].array.UI64[ii]), (double)(data.image[ID2].array.F[ii]));
+                    data.image[IDout].array.F[ii] =
+                        pt2function((double)(data.image[ID1].array.UI64[ii]), (double)(data.image[ID2].array.F[ii]));
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
-                        data.image[IDout].array.F[kk * xysize + ii] = pt2function((double)(
-                                    data.image[ID1].array.UI64[kk * xysize + ii]),
-                                (double)(data.image[ID2].array.F[ii]));
+                        data.image[IDout].array.F[kk * xysize + ii] =
+                            pt2function((double)(data.image[ID1].array.UI64[kk * xysize + ii]),
+                                        (double)(data.image[ID2].array.F[ii]));
                     }
         }
 
-        if(datatype2 == _DATATYPE_DOUBLE) // UINT64 DOUBLE -> DOUBLE
+        if (datatype2 == _DATATYPE_DOUBLE) // UINT64 DOUBLE -> DOUBLE
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.D[ii] = pt2function((double)(
-                                                        data.image[ID1].array.UI64[ii]), data.image[ID2].array.D[ii]);
+                    data.image[IDout].array.D[ii] =
+                        pt2function((double)(data.image[ID1].array.UI64[ii]), data.image[ID2].array.D[ii]);
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
-                        data.image[IDout].array.D[kk * xysize + ii] = pt2function((double)(
-                                    data.image[ID1].array.UI64[kk * xysize + ii]), data.image[ID2].array.D[ii]);
+                        data.image[IDout].array.D[kk * xysize + ii] = pt2function(
+                            (double)(data.image[ID1].array.UI64[kk * xysize + ii]), data.image[ID2].array.D[ii]);
                     }
         }
     }
 
+    // ID1 datatype  INT8
 
-
-// ID1 datatype  INT8
-
-    if(datatype1 == _DATATYPE_INT8)
+    if (datatype1 == _DATATYPE_INT8)
     {
-        if(datatype2 == _DATATYPE_UINT8) // INT8 UINT8 -> FLOAT
+        if (datatype2 == _DATATYPE_UINT8) // INT8 UINT8 -> FLOAT
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.F[ii] = pt2function((double)(
-                                                        data.image[ID1].array.SI8[ii]), (double)(data.image[ID2].array.UI8[ii]));
+                    data.image[IDout].array.F[ii] =
+                        pt2function((double)(data.image[ID1].array.SI8[ii]), (double)(data.image[ID2].array.UI8[ii]));
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
-                        data.image[IDout].array.F[kk * xysize + ii] = pt2function((double)(
-                                    data.image[ID1].array.SI8[kk * xysize + ii]),
-                                (double)(data.image[ID2].array.UI8[ii]));
+                        data.image[IDout].array.F[kk * xysize + ii] =
+                            pt2function((double)(data.image[ID1].array.SI8[kk * xysize + ii]),
+                                        (double)(data.image[ID2].array.UI8[ii]));
                     }
         }
 
-        if(datatype2 == _DATATYPE_UINT16) // INT8 UINT16 -> FLOAT
+        if (datatype2 == _DATATYPE_UINT16) // INT8 UINT16 -> FLOAT
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.F[ii] = pt2function((double)(
-                                                        data.image[ID1].array.SI8[ii]), (double)(data.image[ID2].array.UI16[ii]));
+                    data.image[IDout].array.F[ii] =
+                        pt2function((double)(data.image[ID1].array.SI8[ii]), (double)(data.image[ID2].array.UI16[ii]));
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
-                        data.image[IDout].array.F[kk * xysize + ii] = pt2function((double)(
-                                    data.image[ID1].array.SI8[kk * xysize + ii]),
-                                (double)(data.image[ID2].array.UI16[ii]));
+                        data.image[IDout].array.F[kk * xysize + ii] =
+                            pt2function((double)(data.image[ID1].array.SI8[kk * xysize + ii]),
+                                        (double)(data.image[ID2].array.UI16[ii]));
                     }
         }
 
-        if(datatype2 == _DATATYPE_UINT32) // INT8 UINT32 -> FLOAT
+        if (datatype2 == _DATATYPE_UINT32) // INT8 UINT32 -> FLOAT
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.F[ii] = pt2function((double)(
-                                                        data.image[ID1].array.SI8[ii]), (double)(data.image[ID2].array.UI32[ii]));
+                    data.image[IDout].array.F[ii] =
+                        pt2function((double)(data.image[ID1].array.SI8[ii]), (double)(data.image[ID2].array.UI32[ii]));
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
-                        data.image[IDout].array.F[kk * xysize + ii] = pt2function((double)(
-                                    data.image[ID1].array.SI8[kk * xysize + ii]),
-                                (double)(data.image[ID2].array.UI32[ii]));
+                        data.image[IDout].array.F[kk * xysize + ii] =
+                            pt2function((double)(data.image[ID1].array.SI8[kk * xysize + ii]),
+                                        (double)(data.image[ID2].array.UI32[ii]));
                     }
         }
 
-        if(datatype2 == _DATATYPE_UINT64) // INT8 UINT64 -> FLOAT
+        if (datatype2 == _DATATYPE_UINT64) // INT8 UINT64 -> FLOAT
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.F[ii] = pt2function((double)(
-                                                        data.image[ID1].array.SI8[ii]), (double)(data.image[ID2].array.UI64[ii]));
+                    data.image[IDout].array.F[ii] =
+                        pt2function((double)(data.image[ID1].array.SI8[ii]), (double)(data.image[ID2].array.UI64[ii]));
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
-                        data.image[IDout].array.F[kk * xysize + ii] = pt2function((double)(
-                                    data.image[ID1].array.SI8[kk * xysize + ii]),
-                                (double)(data.image[ID2].array.UI64[ii]));
+                        data.image[IDout].array.F[kk * xysize + ii] =
+                            pt2function((double)(data.image[ID1].array.SI8[kk * xysize + ii]),
+                                        (double)(data.image[ID2].array.UI64[ii]));
                     }
         }
 
-        if(datatype2 == _DATATYPE_INT8) // INT8 INT8 -> FLOAT
+        if (datatype2 == _DATATYPE_INT8) // INT8 INT8 -> FLOAT
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.F[ii] = pt2function((double)(
-                                                        data.image[ID1].array.SI8[ii]), (double)(data.image[ID2].array.SI8[ii]));
+                    data.image[IDout].array.F[ii] =
+                        pt2function((double)(data.image[ID1].array.SI8[ii]), (double)(data.image[ID2].array.SI8[ii]));
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
-                        data.image[IDout].array.F[kk * xysize + ii] = pt2function((double)(
-                                    data.image[ID1].array.SI8[kk * xysize + ii]),
-                                (double)(data.image[ID2].array.SI8[ii]));
+                        data.image[IDout].array.F[kk * xysize + ii] =
+                            pt2function((double)(data.image[ID1].array.SI8[kk * xysize + ii]),
+                                        (double)(data.image[ID2].array.SI8[ii]));
                     }
         }
 
-        if(datatype2 == _DATATYPE_INT16) // INT8 INT16 -> FLOAT
+        if (datatype2 == _DATATYPE_INT16) // INT8 INT16 -> FLOAT
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.F[ii] = pt2function((double)(
-                                                        data.image[ID1].array.SI8[ii]), (double)(data.image[ID2].array.SI16[ii]));
+                    data.image[IDout].array.F[ii] =
+                        pt2function((double)(data.image[ID1].array.SI8[ii]), (double)(data.image[ID2].array.SI16[ii]));
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
-                        data.image[IDout].array.F[kk * xysize + ii] = pt2function((double)(
-                                    data.image[ID1].array.SI8[kk * xysize + ii]),
-                                (double)(data.image[ID2].array.SI16[ii]));
+                        data.image[IDout].array.F[kk * xysize + ii] =
+                            pt2function((double)(data.image[ID1].array.SI8[kk * xysize + ii]),
+                                        (double)(data.image[ID2].array.SI16[ii]));
                     }
         }
 
-        if(datatype2 == _DATATYPE_INT32) // INT8 INT32 -> FLOAT
+        if (datatype2 == _DATATYPE_INT32) // INT8 INT32 -> FLOAT
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.F[ii] = pt2function((double)(
-                                                        data.image[ID1].array.SI8[ii]), (double)(data.image[ID2].array.SI32[ii]));
+                    data.image[IDout].array.F[ii] =
+                        pt2function((double)(data.image[ID1].array.SI8[ii]), (double)(data.image[ID2].array.SI32[ii]));
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
-                        data.image[IDout].array.F[kk * xysize + ii] = pt2function((double)(
-                                    data.image[ID1].array.SI8[kk * xysize + ii]),
-                                (double)(data.image[ID2].array.SI32[ii]));
+                        data.image[IDout].array.F[kk * xysize + ii] =
+                            pt2function((double)(data.image[ID1].array.SI8[kk * xysize + ii]),
+                                        (double)(data.image[ID2].array.SI32[ii]));
                     }
         }
 
-        if(datatype2 == _DATATYPE_INT64) // INT8 INT64 -> FLOAT
+        if (datatype2 == _DATATYPE_INT64) // INT8 INT64 -> FLOAT
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.F[ii] = pt2function((double)(
-                                                        data.image[ID1].array.SI8[ii]), (double)(data.image[ID2].array.SI64[ii]));
+                    data.image[IDout].array.F[ii] =
+                        pt2function((double)(data.image[ID1].array.SI8[ii]), (double)(data.image[ID2].array.SI64[ii]));
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
-                        data.image[IDout].array.F[kk * xysize + ii] = pt2function((double)(
-                                    data.image[ID1].array.SI8[kk * xysize + ii]),
-                                (double)(data.image[ID2].array.SI64[ii]));
+                        data.image[IDout].array.F[kk * xysize + ii] =
+                            pt2function((double)(data.image[ID1].array.SI8[kk * xysize + ii]),
+                                        (double)(data.image[ID2].array.SI64[ii]));
                     }
         }
 
-        if(datatype2 == _DATATYPE_FLOAT) // INT8 FLOAT -> FLOAT
+        if (datatype2 == _DATATYPE_FLOAT) // INT8 FLOAT -> FLOAT
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.F[ii] = pt2function((double)(
-                                                        data.image[ID1].array.SI8[ii]), (double)(data.image[ID2].array.F[ii]));
+                    data.image[IDout].array.F[ii] =
+                        pt2function((double)(data.image[ID1].array.SI8[ii]), (double)(data.image[ID2].array.F[ii]));
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
-                        data.image[IDout].array.F[kk * xysize + ii] = pt2function((double)(
-                                    data.image[ID1].array.SI8[kk * xysize + ii]),
-                                (double)(data.image[ID2].array.F[ii]));
+                        data.image[IDout].array.F[kk * xysize + ii] =
+                            pt2function((double)(data.image[ID1].array.SI8[kk * xysize + ii]),
+                                        (double)(data.image[ID2].array.F[ii]));
                     }
         }
 
-        if(datatype2 == _DATATYPE_DOUBLE) // INT8 DOUBLE -> DOUBLE
+        if (datatype2 == _DATATYPE_DOUBLE) // INT8 DOUBLE -> DOUBLE
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.D[ii] = pt2function((double)(
-                                                        data.image[ID1].array.SI8[ii]), data.image[ID2].array.D[ii]);
+                    data.image[IDout].array.D[ii] =
+                        pt2function((double)(data.image[ID1].array.SI8[ii]), data.image[ID2].array.D[ii]);
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
-                        data.image[IDout].array.D[kk * xysize + ii] = pt2function((double)(
-                                    data.image[ID1].array.SI8[kk * xysize + ii]), data.image[ID2].array.D[ii]);
+                        data.image[IDout].array.D[kk * xysize + ii] = pt2function(
+                            (double)(data.image[ID1].array.SI8[kk * xysize + ii]), data.image[ID2].array.D[ii]);
                     }
         }
     }
 
+    // ID1 datatype  INT16
 
-
-// ID1 datatype  INT16
-
-    if(datatype1 == _DATATYPE_INT16)
+    if (datatype1 == _DATATYPE_INT16)
     {
-        if(datatype2 == _DATATYPE_UINT8) // INT16 UINT8 -> FLOAT
+        if (datatype2 == _DATATYPE_UINT8) // INT16 UINT8 -> FLOAT
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.F[ii] = pt2function((double)(
-                                                        data.image[ID1].array.SI16[ii]), (double)(data.image[ID2].array.UI8[ii]));
+                    data.image[IDout].array.F[ii] =
+                        pt2function((double)(data.image[ID1].array.SI16[ii]), (double)(data.image[ID2].array.UI8[ii]));
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
-                        data.image[IDout].array.F[kk * xysize + ii] = pt2function((double)(
-                                    data.image[ID1].array.SI16[kk * xysize + ii]),
-                                (double)(data.image[ID2].array.UI8[ii]));
+                        data.image[IDout].array.F[kk * xysize + ii] =
+                            pt2function((double)(data.image[ID1].array.SI16[kk * xysize + ii]),
+                                        (double)(data.image[ID2].array.UI8[ii]));
                     }
         }
 
-        if(datatype2 == _DATATYPE_UINT16) // INT16 UINT16 -> FLOAT
+        if (datatype2 == _DATATYPE_UINT16) // INT16 UINT16 -> FLOAT
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.F[ii] = pt2function((double)(
-                                                        data.image[ID1].array.SI16[ii]), (double)(data.image[ID2].array.UI16[ii]));
+                    data.image[IDout].array.F[ii] =
+                        pt2function((double)(data.image[ID1].array.SI16[ii]), (double)(data.image[ID2].array.UI16[ii]));
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
-                        data.image[IDout].array.F[kk * xysize + ii] = pt2function((double)(
-                                    data.image[ID1].array.SI16[kk * xysize + ii]),
-                                (double)(data.image[ID2].array.UI16[ii]));
+                        data.image[IDout].array.F[kk * xysize + ii] =
+                            pt2function((double)(data.image[ID1].array.SI16[kk * xysize + ii]),
+                                        (double)(data.image[ID2].array.UI16[ii]));
                     }
         }
 
-        if(datatype2 == _DATATYPE_UINT32) // INT16 UINT32 -> FLOAT
+        if (datatype2 == _DATATYPE_UINT32) // INT16 UINT32 -> FLOAT
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.F[ii] = pt2function((double)(
-                                                        data.image[ID1].array.SI16[ii]), (double)(data.image[ID2].array.UI32[ii]));
+                    data.image[IDout].array.F[ii] =
+                        pt2function((double)(data.image[ID1].array.SI16[ii]), (double)(data.image[ID2].array.UI32[ii]));
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
-                        data.image[IDout].array.F[kk * xysize + ii] = pt2function((double)(
-                                    data.image[ID1].array.SI16[kk * xysize + ii]),
-                                (double)(data.image[ID2].array.UI32[ii]));
+                        data.image[IDout].array.F[kk * xysize + ii] =
+                            pt2function((double)(data.image[ID1].array.SI16[kk * xysize + ii]),
+                                        (double)(data.image[ID2].array.UI32[ii]));
                     }
         }
 
-        if(datatype2 == _DATATYPE_UINT64) // INT16 UINT64 -> FLOAT
+        if (datatype2 == _DATATYPE_UINT64) // INT16 UINT64 -> FLOAT
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.F[ii] = pt2function((double)(
-                                                        data.image[ID1].array.SI16[ii]), (double)(data.image[ID2].array.UI64[ii]));
+                    data.image[IDout].array.F[ii] =
+                        pt2function((double)(data.image[ID1].array.SI16[ii]), (double)(data.image[ID2].array.UI64[ii]));
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
-                        data.image[IDout].array.F[kk * xysize + ii] = pt2function((double)(
-                                    data.image[ID1].array.SI16[kk * xysize + ii]),
-                                (double)(data.image[ID2].array.UI64[ii]));
+                        data.image[IDout].array.F[kk * xysize + ii] =
+                            pt2function((double)(data.image[ID1].array.SI16[kk * xysize + ii]),
+                                        (double)(data.image[ID2].array.UI64[ii]));
                     }
         }
 
-        if(datatype2 == _DATATYPE_INT8) // INT16 INT8 -> FLOAT
+        if (datatype2 == _DATATYPE_INT8) // INT16 INT8 -> FLOAT
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.F[ii] = pt2function((double)(
-                                                        data.image[ID1].array.SI16[ii]), (double)(data.image[ID2].array.SI8[ii]));
+                    data.image[IDout].array.F[ii] =
+                        pt2function((double)(data.image[ID1].array.SI16[ii]), (double)(data.image[ID2].array.SI8[ii]));
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
-                        data.image[IDout].array.F[kk * xysize + ii] = pt2function((double)(
-                                    data.image[ID1].array.SI16[kk * xysize + ii]),
-                                (double)(data.image[ID2].array.SI8[ii]));
+                        data.image[IDout].array.F[kk * xysize + ii] =
+                            pt2function((double)(data.image[ID1].array.SI16[kk * xysize + ii]),
+                                        (double)(data.image[ID2].array.SI8[ii]));
                     }
         }
 
-        if(datatype2 == _DATATYPE_INT16) // INT16 INT16 -> FLOAT
+        if (datatype2 == _DATATYPE_INT16) // INT16 INT16 -> FLOAT
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.F[ii] = pt2function((double)(
-                                                        data.image[ID1].array.SI16[ii]), (double)(data.image[ID2].array.SI16[ii]));
+                    data.image[IDout].array.F[ii] =
+                        pt2function((double)(data.image[ID1].array.SI16[ii]), (double)(data.image[ID2].array.SI16[ii]));
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
-                        data.image[IDout].array.F[kk * xysize + ii] = pt2function((double)(
-                                    data.image[ID1].array.SI16[kk * xysize + ii]),
-                                (double)(data.image[ID2].array.SI16[ii]));
+                        data.image[IDout].array.F[kk * xysize + ii] =
+                            pt2function((double)(data.image[ID1].array.SI16[kk * xysize + ii]),
+                                        (double)(data.image[ID2].array.SI16[ii]));
                     }
         }
 
-        if(datatype2 == _DATATYPE_INT32) // INT16 INT32 -> FLOAT
+        if (datatype2 == _DATATYPE_INT32) // INT16 INT32 -> FLOAT
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.F[ii] = pt2function((double)(
-                                                        data.image[ID1].array.SI16[ii]), (double)(data.image[ID2].array.SI32[ii]));
+                    data.image[IDout].array.F[ii] =
+                        pt2function((double)(data.image[ID1].array.SI16[ii]), (double)(data.image[ID2].array.SI32[ii]));
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
-                        data.image[IDout].array.F[kk * xysize + ii] = pt2function((double)(
-                                    data.image[ID1].array.SI16[kk * xysize + ii]),
-                                (double)(data.image[ID2].array.SI32[ii]));
+                        data.image[IDout].array.F[kk * xysize + ii] =
+                            pt2function((double)(data.image[ID1].array.SI16[kk * xysize + ii]),
+                                        (double)(data.image[ID2].array.SI32[ii]));
                     }
         }
 
-        if(datatype2 == _DATATYPE_INT64) // INT16 INT64 -> FLOAT
+        if (datatype2 == _DATATYPE_INT64) // INT16 INT64 -> FLOAT
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.F[ii] = pt2function((double)(
-                                                        data.image[ID1].array.SI16[ii]), (double)(data.image[ID2].array.SI64[ii]));
+                    data.image[IDout].array.F[ii] =
+                        pt2function((double)(data.image[ID1].array.SI16[ii]), (double)(data.image[ID2].array.SI64[ii]));
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
-                        data.image[IDout].array.F[kk * xysize + ii] = pt2function((double)(
-                                    data.image[ID1].array.SI16[kk * xysize + ii]),
-                                (double)(data.image[ID2].array.SI64[ii]));
+                        data.image[IDout].array.F[kk * xysize + ii] =
+                            pt2function((double)(data.image[ID1].array.SI16[kk * xysize + ii]),
+                                        (double)(data.image[ID2].array.SI64[ii]));
                     }
         }
 
-        if(datatype2 == _DATATYPE_FLOAT) // INT16 FLOAT -> FLOAT
+        if (datatype2 == _DATATYPE_FLOAT) // INT16 FLOAT -> FLOAT
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.F[ii] = pt2function((double)(
-                                                        data.image[ID1].array.SI16[ii]), (double)(data.image[ID2].array.F[ii]));
+                    data.image[IDout].array.F[ii] =
+                        pt2function((double)(data.image[ID1].array.SI16[ii]), (double)(data.image[ID2].array.F[ii]));
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
-                        data.image[IDout].array.F[kk * xysize + ii] = pt2function((double)(
-                                    data.image[ID1].array.SI16[kk * xysize + ii]),
-                                (double)(data.image[ID2].array.F[ii]));
+                        data.image[IDout].array.F[kk * xysize + ii] =
+                            pt2function((double)(data.image[ID1].array.SI16[kk * xysize + ii]),
+                                        (double)(data.image[ID2].array.F[ii]));
                     }
         }
 
-        if(datatype2 == _DATATYPE_DOUBLE) // INT16 DOUBLE -> DOUBLE
+        if (datatype2 == _DATATYPE_DOUBLE) // INT16 DOUBLE -> DOUBLE
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.D[ii] = pt2function((double)(
-                                                        data.image[ID1].array.SI16[ii]), data.image[ID2].array.D[ii]);
+                    data.image[IDout].array.D[ii] =
+                        pt2function((double)(data.image[ID1].array.SI16[ii]), data.image[ID2].array.D[ii]);
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
-                        data.image[IDout].array.D[kk * xysize + ii] = pt2function((double)(
-                                    data.image[ID1].array.SI16[kk * xysize + ii]), data.image[ID2].array.D[ii]);
+                        data.image[IDout].array.D[kk * xysize + ii] = pt2function(
+                            (double)(data.image[ID1].array.SI16[kk * xysize + ii]), data.image[ID2].array.D[ii]);
                     }
         }
     }
 
+    // ID1 datatype  INT32
 
-
-// ID1 datatype  INT32
-
-    if(datatype1 == _DATATYPE_INT32)
+    if (datatype1 == _DATATYPE_INT32)
     {
-        if(datatype2 == _DATATYPE_UINT8) // INT32 UINT8 -> FLOAT
+        if (datatype2 == _DATATYPE_UINT8) // INT32 UINT8 -> FLOAT
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.F[ii] = pt2function((double)(
-                                                        data.image[ID1].array.SI32[ii]), (double)(data.image[ID2].array.UI8[ii]));
+                    data.image[IDout].array.F[ii] =
+                        pt2function((double)(data.image[ID1].array.SI32[ii]), (double)(data.image[ID2].array.UI8[ii]));
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
-                        data.image[IDout].array.F[kk * xysize + ii] = pt2function((double)(
-                                    data.image[ID1].array.SI32[kk * xysize + ii]),
-                                (double)(data.image[ID2].array.UI8[ii]));
+                        data.image[IDout].array.F[kk * xysize + ii] =
+                            pt2function((double)(data.image[ID1].array.SI32[kk * xysize + ii]),
+                                        (double)(data.image[ID2].array.UI8[ii]));
                     }
         }
 
-        if(datatype2 == _DATATYPE_UINT16) // INT32 UINT16 -> FLOAT
+        if (datatype2 == _DATATYPE_UINT16) // INT32 UINT16 -> FLOAT
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.F[ii] = pt2function((double)(
-                                                        data.image[ID1].array.SI32[ii]), (double)(data.image[ID2].array.UI16[ii]));
+                    data.image[IDout].array.F[ii] =
+                        pt2function((double)(data.image[ID1].array.SI32[ii]), (double)(data.image[ID2].array.UI16[ii]));
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
-                        data.image[IDout].array.F[kk * xysize + ii] = pt2function((double)(
-                                    data.image[ID1].array.SI32[kk * xysize + ii]),
-                                (double)(data.image[ID2].array.UI16[ii]));
+                        data.image[IDout].array.F[kk * xysize + ii] =
+                            pt2function((double)(data.image[ID1].array.SI32[kk * xysize + ii]),
+                                        (double)(data.image[ID2].array.UI16[ii]));
                     }
         }
 
-        if(datatype2 == _DATATYPE_UINT32) // INT32 UINT32 -> FLOAT
+        if (datatype2 == _DATATYPE_UINT32) // INT32 UINT32 -> FLOAT
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.F[ii] = pt2function((double)(
-                                                        data.image[ID1].array.SI32[ii]), (double)(data.image[ID2].array.UI32[ii]));
+                    data.image[IDout].array.F[ii] =
+                        pt2function((double)(data.image[ID1].array.SI32[ii]), (double)(data.image[ID2].array.UI32[ii]));
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
-                        data.image[IDout].array.F[kk * xysize + ii] = pt2function((double)(
-                                    data.image[ID1].array.SI32[kk * xysize + ii]),
-                                (double)(data.image[ID2].array.UI32[ii]));
+                        data.image[IDout].array.F[kk * xysize + ii] =
+                            pt2function((double)(data.image[ID1].array.SI32[kk * xysize + ii]),
+                                        (double)(data.image[ID2].array.UI32[ii]));
                     }
         }
 
-        if(datatype2 == _DATATYPE_UINT64) // INT32 UINT64 -> FLOAT
+        if (datatype2 == _DATATYPE_UINT64) // INT32 UINT64 -> FLOAT
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.F[ii] = pt2function((double)(
-                                                        data.image[ID1].array.SI32[ii]), (double)(data.image[ID2].array.UI64[ii]));
+                    data.image[IDout].array.F[ii] =
+                        pt2function((double)(data.image[ID1].array.SI32[ii]), (double)(data.image[ID2].array.UI64[ii]));
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
-                        data.image[IDout].array.F[kk * xysize + ii] = pt2function((double)(
-                                    data.image[ID1].array.SI32[kk * xysize + ii]),
-                                (double)(data.image[ID2].array.UI64[ii]));
+                        data.image[IDout].array.F[kk * xysize + ii] =
+                            pt2function((double)(data.image[ID1].array.SI32[kk * xysize + ii]),
+                                        (double)(data.image[ID2].array.UI64[ii]));
                     }
         }
 
-        if(datatype2 == _DATATYPE_INT8) // INT32 INT8 -> FLOAT
+        if (datatype2 == _DATATYPE_INT8) // INT32 INT8 -> FLOAT
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.F[ii] = pt2function((double)(
-                                                        data.image[ID1].array.SI32[ii]), (double)(data.image[ID2].array.SI8[ii]));
+                    data.image[IDout].array.F[ii] =
+                        pt2function((double)(data.image[ID1].array.SI32[ii]), (double)(data.image[ID2].array.SI8[ii]));
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
-                        data.image[IDout].array.F[kk * xysize + ii] = pt2function((double)(
-                                    data.image[ID1].array.SI32[kk * xysize + ii]),
-                                (double)(data.image[ID2].array.SI8[ii]));
+                        data.image[IDout].array.F[kk * xysize + ii] =
+                            pt2function((double)(data.image[ID1].array.SI32[kk * xysize + ii]),
+                                        (double)(data.image[ID2].array.SI8[ii]));
                     }
         }
 
-        if(datatype2 == _DATATYPE_INT16) // INT32 INT16 -> FLOAT
+        if (datatype2 == _DATATYPE_INT16) // INT32 INT16 -> FLOAT
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.F[ii] = pt2function((double)(
-                                                        data.image[ID1].array.SI32[ii]), (double)(data.image[ID2].array.SI16[ii]));
+                    data.image[IDout].array.F[ii] =
+                        pt2function((double)(data.image[ID1].array.SI32[ii]), (double)(data.image[ID2].array.SI16[ii]));
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
-                        data.image[IDout].array.F[kk * xysize + ii] = pt2function((double)(
-                                    data.image[ID1].array.SI32[kk * xysize + ii]),
-                                (double)(data.image[ID2].array.SI16[ii]));
+                        data.image[IDout].array.F[kk * xysize + ii] =
+                            pt2function((double)(data.image[ID1].array.SI32[kk * xysize + ii]),
+                                        (double)(data.image[ID2].array.SI16[ii]));
                     }
         }
 
-        if(datatype2 == _DATATYPE_INT32) // INT32 INT32 -> FLOAT
+        if (datatype2 == _DATATYPE_INT32) // INT32 INT32 -> FLOAT
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.F[ii] = pt2function((double)(
-                                                        data.image[ID1].array.SI32[ii]), (double)(data.image[ID2].array.SI32[ii]));
+                    data.image[IDout].array.F[ii] =
+                        pt2function((double)(data.image[ID1].array.SI32[ii]), (double)(data.image[ID2].array.SI32[ii]));
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
-                        data.image[IDout].array.F[kk * xysize + ii] = pt2function((double)(
-                                    data.image[ID1].array.SI32[kk * xysize + ii]),
-                                (double)(data.image[ID2].array.SI32[ii]));
+                        data.image[IDout].array.F[kk * xysize + ii] =
+                            pt2function((double)(data.image[ID1].array.SI32[kk * xysize + ii]),
+                                        (double)(data.image[ID2].array.SI32[ii]));
                     }
         }
 
-        if(datatype2 == _DATATYPE_INT64) // INT32 INT64 -> FLOAT
+        if (datatype2 == _DATATYPE_INT64) // INT32 INT64 -> FLOAT
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.F[ii] = pt2function((double)(
-                                                        data.image[ID1].array.SI32[ii]), (double)(data.image[ID2].array.SI64[ii]));
+                    data.image[IDout].array.F[ii] =
+                        pt2function((double)(data.image[ID1].array.SI32[ii]), (double)(data.image[ID2].array.SI64[ii]));
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
-                        data.image[IDout].array.F[kk * xysize + ii] = pt2function((double)(
-                                    data.image[ID1].array.SI32[kk * xysize + ii]),
-                                (double)(data.image[ID2].array.SI64[ii]));
+                        data.image[IDout].array.F[kk * xysize + ii] =
+                            pt2function((double)(data.image[ID1].array.SI32[kk * xysize + ii]),
+                                        (double)(data.image[ID2].array.SI64[ii]));
                     }
         }
 
-        if(datatype2 == _DATATYPE_FLOAT) // INT32 FLOAT -> FLOAT
+        if (datatype2 == _DATATYPE_FLOAT) // INT32 FLOAT -> FLOAT
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.F[ii] = pt2function((double)(
-                                                        data.image[ID1].array.SI32[ii]), (double)(data.image[ID2].array.F[ii]));
+                    data.image[IDout].array.F[ii] =
+                        pt2function((double)(data.image[ID1].array.SI32[ii]), (double)(data.image[ID2].array.F[ii]));
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
-                        data.image[IDout].array.F[kk * xysize + ii] = pt2function((double)(
-                                    data.image[ID1].array.SI32[kk * xysize + ii]),
-                                (double)(data.image[ID2].array.F[ii]));
+                        data.image[IDout].array.F[kk * xysize + ii] =
+                            pt2function((double)(data.image[ID1].array.SI32[kk * xysize + ii]),
+                                        (double)(data.image[ID2].array.F[ii]));
                     }
         }
 
-        if(datatype2 == _DATATYPE_DOUBLE) // INT32 DOUBLE -> DOUBLE
+        if (datatype2 == _DATATYPE_DOUBLE) // INT32 DOUBLE -> DOUBLE
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.D[ii] = pt2function((double)(
-                                                        data.image[ID1].array.SI32[ii]), data.image[ID2].array.D[ii]);
+                    data.image[IDout].array.D[ii] =
+                        pt2function((double)(data.image[ID1].array.SI32[ii]), data.image[ID2].array.D[ii]);
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
-                        data.image[IDout].array.D[kk * xysize + ii] = pt2function((double)(
-                                    data.image[ID1].array.SI32[kk * xysize + ii]), data.image[ID2].array.D[ii]);
+                        data.image[IDout].array.D[kk * xysize + ii] = pt2function(
+                            (double)(data.image[ID1].array.SI32[kk * xysize + ii]), data.image[ID2].array.D[ii]);
                     }
         }
     }
 
-
-
-// ID1 datatype  INT64
-    if(datatype1 == _DATATYPE_INT64)
+    // ID1 datatype  INT64
+    if (datatype1 == _DATATYPE_INT64)
     {
-        if(datatype2 == _DATATYPE_UINT8) // INT64 UINT8 -> FLOAT
+        if (datatype2 == _DATATYPE_UINT8) // INT64 UINT8 -> FLOAT
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.F[ii] = pt2function((double)(
-                                                        data.image[ID1].array.SI64[ii]), (double)(data.image[ID2].array.UI8[ii]));
+                    data.image[IDout].array.F[ii] =
+                        pt2function((double)(data.image[ID1].array.SI64[ii]), (double)(data.image[ID2].array.UI8[ii]));
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
-                        data.image[IDout].array.F[kk * xysize + ii] = pt2function((double)(
-                                    data.image[ID1].array.SI64[kk * xysize + ii]),
-                                (double)(data.image[ID2].array.UI8[ii]));
+                        data.image[IDout].array.F[kk * xysize + ii] =
+                            pt2function((double)(data.image[ID1].array.SI64[kk * xysize + ii]),
+                                        (double)(data.image[ID2].array.UI8[ii]));
                     }
         }
 
-        if(datatype2 == _DATATYPE_UINT16) // INT64 UINT16 -> FLOAT
+        if (datatype2 == _DATATYPE_UINT16) // INT64 UINT16 -> FLOAT
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.F[ii] = pt2function((double)(
-                                                        data.image[ID1].array.SI64[ii]), (double)(data.image[ID2].array.UI16[ii]));
+                    data.image[IDout].array.F[ii] =
+                        pt2function((double)(data.image[ID1].array.SI64[ii]), (double)(data.image[ID2].array.UI16[ii]));
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
-                        data.image[IDout].array.F[kk * xysize + ii] = pt2function((double)(
-                                    data.image[ID1].array.SI64[kk * xysize + ii]),
-                                (double)(data.image[ID2].array.UI16[ii]));
+                        data.image[IDout].array.F[kk * xysize + ii] =
+                            pt2function((double)(data.image[ID1].array.SI64[kk * xysize + ii]),
+                                        (double)(data.image[ID2].array.UI16[ii]));
                     }
         }
 
-        if(datatype2 == _DATATYPE_UINT32) // INT64 UINT32 -> FLOAT
+        if (datatype2 == _DATATYPE_UINT32) // INT64 UINT32 -> FLOAT
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.F[ii] = pt2function((double)(
-                                                        data.image[ID1].array.SI64[ii]), (double)(data.image[ID2].array.UI32[ii]));
+                    data.image[IDout].array.F[ii] =
+                        pt2function((double)(data.image[ID1].array.SI64[ii]), (double)(data.image[ID2].array.UI32[ii]));
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
-                        data.image[IDout].array.F[kk * xysize + ii] = pt2function((double)(
-                                    data.image[ID1].array.SI64[kk * xysize + ii]),
-                                (double)(data.image[ID2].array.UI32[ii]));
+                        data.image[IDout].array.F[kk * xysize + ii] =
+                            pt2function((double)(data.image[ID1].array.SI64[kk * xysize + ii]),
+                                        (double)(data.image[ID2].array.UI32[ii]));
                     }
         }
 
-        if(datatype2 == _DATATYPE_UINT64) // INT64 UINT64 -> FLOAT
+        if (datatype2 == _DATATYPE_UINT64) // INT64 UINT64 -> FLOAT
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.F[ii] = pt2function((double)(
-                                                        data.image[ID1].array.SI64[ii]), (double)(data.image[ID2].array.UI64[ii]));
+                    data.image[IDout].array.F[ii] =
+                        pt2function((double)(data.image[ID1].array.SI64[ii]), (double)(data.image[ID2].array.UI64[ii]));
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
-                        data.image[IDout].array.F[kk * xysize + ii] = pt2function((double)(
-                                    data.image[ID1].array.SI64[kk * xysize + ii]),
-                                (double)(data.image[ID2].array.UI64[ii]));
+                        data.image[IDout].array.F[kk * xysize + ii] =
+                            pt2function((double)(data.image[ID1].array.SI64[kk * xysize + ii]),
+                                        (double)(data.image[ID2].array.UI64[ii]));
                     }
         }
 
-        if(datatype2 == _DATATYPE_INT8) // INT64 INT8 -> FLOAT
+        if (datatype2 == _DATATYPE_INT8) // INT64 INT8 -> FLOAT
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.F[ii] = pt2function((double)(
-                                                        data.image[ID1].array.SI64[ii]), (double)(data.image[ID2].array.SI8[ii]));
+                    data.image[IDout].array.F[ii] =
+                        pt2function((double)(data.image[ID1].array.SI64[ii]), (double)(data.image[ID2].array.SI8[ii]));
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
-                        data.image[IDout].array.F[kk * xysize + ii] = pt2function((double)(
-                                    data.image[ID1].array.SI64[kk * xysize + ii]),
-                                (double)(data.image[ID2].array.SI8[ii]));
+                        data.image[IDout].array.F[kk * xysize + ii] =
+                            pt2function((double)(data.image[ID1].array.SI64[kk * xysize + ii]),
+                                        (double)(data.image[ID2].array.SI8[ii]));
                     }
         }
 
-        if(datatype2 == _DATATYPE_INT16) // INT64 INT16 -> FLOAT
+        if (datatype2 == _DATATYPE_INT16) // INT64 INT16 -> FLOAT
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.F[ii] = pt2function((double)(
-                                                        data.image[ID1].array.SI64[ii]), (double)(data.image[ID2].array.SI16[ii]));
+                    data.image[IDout].array.F[ii] =
+                        pt2function((double)(data.image[ID1].array.SI64[ii]), (double)(data.image[ID2].array.SI16[ii]));
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
-                        data.image[IDout].array.F[kk * xysize + ii] = pt2function((double)(
-                                    data.image[ID1].array.SI64[kk * xysize + ii]),
-                                (double)(data.image[ID2].array.SI16[ii]));
+                        data.image[IDout].array.F[kk * xysize + ii] =
+                            pt2function((double)(data.image[ID1].array.SI64[kk * xysize + ii]),
+                                        (double)(data.image[ID2].array.SI16[ii]));
                     }
         }
 
-        if(datatype2 == _DATATYPE_INT32) // INT64 INT32 -> FLOAT
+        if (datatype2 == _DATATYPE_INT32) // INT64 INT32 -> FLOAT
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.F[ii] = pt2function((double)(
-                                                        data.image[ID1].array.SI64[ii]), (double)(data.image[ID2].array.SI32[ii]));
+                    data.image[IDout].array.F[ii] =
+                        pt2function((double)(data.image[ID1].array.SI64[ii]), (double)(data.image[ID2].array.SI32[ii]));
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
-                        data.image[IDout].array.F[kk * xysize + ii] = pt2function((double)(
-                                    data.image[ID1].array.SI64[kk * xysize + ii]),
-                                (double)(data.image[ID2].array.SI32[ii]));
+                        data.image[IDout].array.F[kk * xysize + ii] =
+                            pt2function((double)(data.image[ID1].array.SI64[kk * xysize + ii]),
+                                        (double)(data.image[ID2].array.SI32[ii]));
                     }
         }
 
-        if(datatype2 == _DATATYPE_INT64) // INT64 INT64 -> FLOAT
+        if (datatype2 == _DATATYPE_INT64) // INT64 INT64 -> FLOAT
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.F[ii] = pt2function((double)(
-                                                        data.image[ID1].array.SI64[ii]), (double)(data.image[ID2].array.SI64[ii]));
+                    data.image[IDout].array.F[ii] =
+                        pt2function((double)(data.image[ID1].array.SI64[ii]), (double)(data.image[ID2].array.SI64[ii]));
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
-                        data.image[IDout].array.F[kk * xysize + ii] = pt2function((double)(
-                                    data.image[ID1].array.SI64[kk * xysize + ii]),
-                                (double)(data.image[ID2].array.SI64[ii]));
+                        data.image[IDout].array.F[kk * xysize + ii] =
+                            pt2function((double)(data.image[ID1].array.SI64[kk * xysize + ii]),
+                                        (double)(data.image[ID2].array.SI64[ii]));
                     }
         }
 
-        if(datatype2 == _DATATYPE_FLOAT) // INT64 FLOAT -> FLOAT
+        if (datatype2 == _DATATYPE_FLOAT) // INT64 FLOAT -> FLOAT
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.F[ii] = pt2function((double)(
-                                                        data.image[ID1].array.SI64[ii]), (double)(data.image[ID2].array.F[ii]));
+                    data.image[IDout].array.F[ii] =
+                        pt2function((double)(data.image[ID1].array.SI64[ii]), (double)(data.image[ID2].array.F[ii]));
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
-                        data.image[IDout].array.F[kk * xysize + ii] = pt2function((double)(
-                                    data.image[ID1].array.SI64[kk * xysize + ii]),
-                                (double)(data.image[ID2].array.F[ii]));
+                        data.image[IDout].array.F[kk * xysize + ii] =
+                            pt2function((double)(data.image[ID1].array.SI64[kk * xysize + ii]),
+                                        (double)(data.image[ID2].array.F[ii]));
                     }
         }
 
-        if(datatype2 == _DATATYPE_DOUBLE) // INT64 DOUBLE -> DOUBLE
+        if (datatype2 == _DATATYPE_DOUBLE) // INT64 DOUBLE -> DOUBLE
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.D[ii] = pt2function((double)(
-                                                        data.image[ID1].array.SI64[ii]), data.image[ID2].array.D[ii]);
+                    data.image[IDout].array.D[ii] =
+                        pt2function((double)(data.image[ID1].array.SI64[ii]), data.image[ID2].array.D[ii]);
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
-                        data.image[IDout].array.D[kk * xysize + ii] = pt2function((double)(
-                                    data.image[ID1].array.SI64[kk * xysize + ii]), data.image[ID2].array.D[ii]);
+                        data.image[IDout].array.D[kk * xysize + ii] = pt2function(
+                            (double)(data.image[ID1].array.SI64[kk * xysize + ii]), data.image[ID2].array.D[ii]);
                     }
         }
     }
 
-
-
-// ID1 datatype  FLOAT
-    if(datatype1 == _DATATYPE_FLOAT)
+    // ID1 datatype  FLOAT
+    if (datatype1 == _DATATYPE_FLOAT)
     {
-        if(datatype2 == _DATATYPE_UINT8) // FLOAT UINT8 -> FLOAT
+        if (datatype2 == _DATATYPE_UINT8) // FLOAT UINT8 -> FLOAT
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.F[ii] = pt2function((double)(
-                                                        data.image[ID1].array.F[ii]), (double)(data.image[ID2].array.UI8[ii]));
+                    data.image[IDout].array.F[ii] =
+                        pt2function((double)(data.image[ID1].array.F[ii]), (double)(data.image[ID2].array.UI8[ii]));
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
-                        data.image[IDout].array.F[kk * xysize + ii] = pt2function((double)(
-                                    data.image[ID1].array.F[kk * xysize + ii]),
-                                (double)(data.image[ID2].array.UI8[ii]));
+                        data.image[IDout].array.F[kk * xysize + ii] =
+                            pt2function((double)(data.image[ID1].array.F[kk * xysize + ii]),
+                                        (double)(data.image[ID2].array.UI8[ii]));
                     }
         }
 
-        if(datatype2 == _DATATYPE_UINT16) // FLOAT UINT16 -> FLOAT
+        if (datatype2 == _DATATYPE_UINT16) // FLOAT UINT16 -> FLOAT
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.F[ii] = pt2function((double)(
-                                                        data.image[ID1].array.F[ii]), (double)(data.image[ID2].array.UI16[ii]));
+                    data.image[IDout].array.F[ii] =
+                        pt2function((double)(data.image[ID1].array.F[ii]), (double)(data.image[ID2].array.UI16[ii]));
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
-                        data.image[IDout].array.F[kk * xysize + ii] = pt2function((double)(
-                                    data.image[ID1].array.F[kk * xysize + ii]),
-                                (double)(data.image[ID2].array.UI16[ii]));
+                        data.image[IDout].array.F[kk * xysize + ii] =
+                            pt2function((double)(data.image[ID1].array.F[kk * xysize + ii]),
+                                        (double)(data.image[ID2].array.UI16[ii]));
                     }
         }
 
-        if(datatype2 == _DATATYPE_UINT32) // FLOAT UINT32 -> FLOAT
+        if (datatype2 == _DATATYPE_UINT32) // FLOAT UINT32 -> FLOAT
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.F[ii] = pt2function((double)(
-                                                        data.image[ID1].array.F[ii]), (double)(data.image[ID2].array.UI32[ii]));
+                    data.image[IDout].array.F[ii] =
+                        pt2function((double)(data.image[ID1].array.F[ii]), (double)(data.image[ID2].array.UI32[ii]));
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
-                        data.image[IDout].array.F[kk * xysize + ii] = pt2function((double)(
-                                    data.image[ID1].array.F[kk * xysize + ii]),
-                                (double)(data.image[ID2].array.UI32[ii]));
+                        data.image[IDout].array.F[kk * xysize + ii] =
+                            pt2function((double)(data.image[ID1].array.F[kk * xysize + ii]),
+                                        (double)(data.image[ID2].array.UI32[ii]));
                     }
         }
 
-        if(datatype2 == _DATATYPE_UINT64) // FLOAT UINT64 -> FLOAT
+        if (datatype2 == _DATATYPE_UINT64) // FLOAT UINT64 -> FLOAT
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.F[ii] = pt2function((double)(
-                                                        data.image[ID1].array.F[ii]), (double)(data.image[ID2].array.UI64[ii]));
+                    data.image[IDout].array.F[ii] =
+                        pt2function((double)(data.image[ID1].array.F[ii]), (double)(data.image[ID2].array.UI64[ii]));
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
-                        data.image[IDout].array.F[kk * xysize + ii] = pt2function((double)(
-                                    data.image[ID1].array.F[kk * xysize + ii]),
-                                (double)(data.image[ID2].array.UI64[ii]));
+                        data.image[IDout].array.F[kk * xysize + ii] =
+                            pt2function((double)(data.image[ID1].array.F[kk * xysize + ii]),
+                                        (double)(data.image[ID2].array.UI64[ii]));
                     }
         }
 
-        if(datatype2 == _DATATYPE_INT8) // FLOAT INT8 -> FLOAT
+        if (datatype2 == _DATATYPE_INT8) // FLOAT INT8 -> FLOAT
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.F[ii] = pt2function((double)(
-                                                        data.image[ID1].array.F[ii]), (double)(data.image[ID2].array.SI8[ii]));
+                    data.image[IDout].array.F[ii] =
+                        pt2function((double)(data.image[ID1].array.F[ii]), (double)(data.image[ID2].array.SI8[ii]));
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
-                        data.image[IDout].array.F[kk * xysize + ii] = pt2function((double)(
-                                    data.image[ID1].array.F[kk * xysize + ii]),
-                                (double)(data.image[ID2].array.SI8[ii]));
+                        data.image[IDout].array.F[kk * xysize + ii] =
+                            pt2function((double)(data.image[ID1].array.F[kk * xysize + ii]),
+                                        (double)(data.image[ID2].array.SI8[ii]));
                     }
         }
 
-        if(datatype2 == _DATATYPE_INT16) // FLOAT INT16 -> FLOAT
+        if (datatype2 == _DATATYPE_INT16) // FLOAT INT16 -> FLOAT
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.F[ii] = pt2function((double)(
-                                                        data.image[ID1].array.F[ii]), (double)(data.image[ID2].array.SI16[ii]));
+                    data.image[IDout].array.F[ii] =
+                        pt2function((double)(data.image[ID1].array.F[ii]), (double)(data.image[ID2].array.SI16[ii]));
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
-                        data.image[IDout].array.F[kk * xysize + ii] = pt2function((double)(
-                                    data.image[ID1].array.F[kk * xysize + ii]),
-                                (double)(data.image[ID2].array.SI16[ii]));
+                        data.image[IDout].array.F[kk * xysize + ii] =
+                            pt2function((double)(data.image[ID1].array.F[kk * xysize + ii]),
+                                        (double)(data.image[ID2].array.SI16[ii]));
                     }
         }
 
-        if(datatype2 == _DATATYPE_INT32) // FLOAT INT32 -> FLOAT
+        if (datatype2 == _DATATYPE_INT32) // FLOAT INT32 -> FLOAT
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.F[ii] = pt2function((double)(
-                                                        data.image[ID1].array.F[ii]), (double)(data.image[ID2].array.SI32[ii]));
+                    data.image[IDout].array.F[ii] =
+                        pt2function((double)(data.image[ID1].array.F[ii]), (double)(data.image[ID2].array.SI32[ii]));
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
-                        data.image[IDout].array.F[kk * xysize + ii] = pt2function((double)(
-                                    data.image[ID1].array.F[kk * xysize + ii]),
-                                (double)(data.image[ID2].array.SI32[ii]));
+                        data.image[IDout].array.F[kk * xysize + ii] =
+                            pt2function((double)(data.image[ID1].array.F[kk * xysize + ii]),
+                                        (double)(data.image[ID2].array.SI32[ii]));
                     }
         }
 
-        if(datatype2 == _DATATYPE_INT64) // FLOAT INT64 -> FLOAT
+        if (datatype2 == _DATATYPE_INT64) // FLOAT INT64 -> FLOAT
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.F[ii] = pt2function((double)(
-                                                        data.image[ID1].array.F[ii]), (double)(data.image[ID2].array.SI64[ii]));
+                    data.image[IDout].array.F[ii] =
+                        pt2function((double)(data.image[ID1].array.F[ii]), (double)(data.image[ID2].array.SI64[ii]));
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
-                        data.image[IDout].array.F[kk * xysize + ii] = pt2function((double)(
-                                    data.image[ID1].array.F[kk * xysize + ii]),
-                                (double)(data.image[ID2].array.SI64[ii]));
+                        data.image[IDout].array.F[kk * xysize + ii] =
+                            pt2function((double)(data.image[ID1].array.F[kk * xysize + ii]),
+                                        (double)(data.image[ID2].array.SI64[ii]));
                     }
         }
 
-        if(datatype2 == _DATATYPE_FLOAT) // FLOAT FLOAT -> FLOAT
+        if (datatype2 == _DATATYPE_FLOAT) // FLOAT FLOAT -> FLOAT
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.F[ii] = pt2function((double)(
-                                                        data.image[ID1].array.F[ii]), (double)(data.image[ID2].array.F[ii]));
+                    data.image[IDout].array.F[ii] =
+                        pt2function((double)(data.image[ID1].array.F[ii]), (double)(data.image[ID2].array.F[ii]));
                 }
 
-            if(op3D2Dto3D == 1)
+            if (op3D2Dto3D == 1)
             {
-//# ifdef _OPENMP
-//                #pragma omp for
-//# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+                //# ifdef _OPENMP
+                //                #pragma omp for
+                //# endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
-                        data.image[IDout].array.F[kk * xysize + ii] = pt2function((double)(
-                                    data.image[ID1].array.F[kk * xysize + ii]),
-                                (double)(data.image[ID2].array.F[ii]));
+                        data.image[IDout].array.F[kk * xysize + ii] = pt2function(
+                            (double)(data.image[ID1].array.F[kk * xysize + ii]), (double)(data.image[ID2].array.F[ii]));
                     }
             }
         }
 
-        if(datatype2 == _DATATYPE_DOUBLE) // FLOAT DOUBLE -> DOUBLE
+        if (datatype2 == _DATATYPE_DOUBLE) // FLOAT DOUBLE -> DOUBLE
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.D[ii] = pt2function((double)(
-                                                        data.image[ID1].array.F[ii]), data.image[ID2].array.D[ii]);
+                    data.image[IDout].array.D[ii] =
+                        pt2function((double)(data.image[ID1].array.F[ii]), data.image[ID2].array.D[ii]);
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
-                        data.image[IDout].array.D[kk * xysize + ii] = pt2function((double)(
-                                    data.image[ID1].array.F[kk * xysize + ii]), data.image[ID2].array.D[ii]);
+                        data.image[IDout].array.D[kk * xysize + ii] = pt2function(
+                            (double)(data.image[ID1].array.F[kk * xysize + ii]), data.image[ID2].array.D[ii]);
                     }
         }
     }
 
+    // ID1 datatype  DOUBLE
 
-
-
-// ID1 datatype  DOUBLE
-
-    if(datatype1 == _DATATYPE_DOUBLE)
+    if (datatype1 == _DATATYPE_DOUBLE)
     {
-        if(datatype2 == _DATATYPE_UINT8) // DOUBLE UINT8 -> DOUBLE
+        if (datatype2 == _DATATYPE_UINT8) // DOUBLE UINT8 -> DOUBLE
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.F[ii] = pt2function(data.image[ID1].array.D[ii],
-                                                    (double)(data.image[ID2].array.UI8[ii]));
+                    data.image[IDout].array.F[ii] =
+                        pt2function(data.image[ID1].array.D[ii], (double)(data.image[ID2].array.UI8[ii]));
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
                         data.image[IDout].array.F[kk * xysize + ii] = pt2function(
-                                    data.image[ID1].array.D[kk * xysize + ii],
-                                    (double)(data.image[ID2].array.UI8[ii]));
+                            data.image[ID1].array.D[kk * xysize + ii], (double)(data.image[ID2].array.UI8[ii]));
                     }
         }
 
-        if(datatype2 == _DATATYPE_UINT16) // DOUBLE UINT16 -> DOUBLE
+        if (datatype2 == _DATATYPE_UINT16) // DOUBLE UINT16 -> DOUBLE
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.F[ii] = pt2function(data.image[ID1].array.D[ii],
-                                                    (double)(data.image[ID2].array.UI16[ii]));
+                    data.image[IDout].array.F[ii] =
+                        pt2function(data.image[ID1].array.D[ii], (double)(data.image[ID2].array.UI16[ii]));
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
                         data.image[IDout].array.F[kk * xysize + ii] = pt2function(
-                                    data.image[ID1].array.D[kk * xysize + ii],
-                                    (double)(data.image[ID2].array.UI16[ii]));
+                            data.image[ID1].array.D[kk * xysize + ii], (double)(data.image[ID2].array.UI16[ii]));
                     }
         }
 
-        if(datatype2 == _DATATYPE_UINT32) // DOUBLE UINT32 -> DOUBLE
+        if (datatype2 == _DATATYPE_UINT32) // DOUBLE UINT32 -> DOUBLE
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.F[ii] = pt2function(data.image[ID1].array.D[ii],
-                                                    (double)(data.image[ID2].array.UI32[ii]));
+                    data.image[IDout].array.F[ii] =
+                        pt2function(data.image[ID1].array.D[ii], (double)(data.image[ID2].array.UI32[ii]));
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
                         data.image[IDout].array.F[kk * xysize + ii] = pt2function(
-                                    data.image[ID1].array.D[kk * xysize + ii],
-                                    (double)(data.image[ID2].array.UI32[ii]));
+                            data.image[ID1].array.D[kk * xysize + ii], (double)(data.image[ID2].array.UI32[ii]));
                     }
         }
 
-        if(datatype2 == _DATATYPE_UINT64) // DOUBLE UINT64 -> DOUBLE
+        if (datatype2 == _DATATYPE_UINT64) // DOUBLE UINT64 -> DOUBLE
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.F[ii] = pt2function(data.image[ID1].array.D[ii],
-                                                    (double)(data.image[ID2].array.UI64[ii]));
+                    data.image[IDout].array.F[ii] =
+                        pt2function(data.image[ID1].array.D[ii], (double)(data.image[ID2].array.UI64[ii]));
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
                         data.image[IDout].array.F[kk * xysize + ii] = pt2function(
-                                    data.image[ID1].array.D[kk * xysize + ii],
-                                    (double)(data.image[ID2].array.UI64[ii]));
+                            data.image[ID1].array.D[kk * xysize + ii], (double)(data.image[ID2].array.UI64[ii]));
                     }
         }
 
-        if(datatype2 == _DATATYPE_INT8) // DOUBLE INT8 -> DOUBLE
+        if (datatype2 == _DATATYPE_INT8) // DOUBLE INT8 -> DOUBLE
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.F[ii] = pt2function(data.image[ID1].array.D[ii],
-                                                    (double)(data.image[ID2].array.SI8[ii]));
+                    data.image[IDout].array.F[ii] =
+                        pt2function(data.image[ID1].array.D[ii], (double)(data.image[ID2].array.SI8[ii]));
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
                         data.image[IDout].array.F[kk * xysize + ii] = pt2function(
-                                    data.image[ID1].array.D[kk * xysize + ii],
-                                    (double)(data.image[ID2].array.SI8[ii]));
+                            data.image[ID1].array.D[kk * xysize + ii], (double)(data.image[ID2].array.SI8[ii]));
                     }
         }
 
-        if(datatype2 == _DATATYPE_INT16) // DOUBLE INT16 -> DOUBLE
+        if (datatype2 == _DATATYPE_INT16) // DOUBLE INT16 -> DOUBLE
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.F[ii] = pt2function(data.image[ID1].array.D[ii],
-                                                    (double)(data.image[ID2].array.SI16[ii]));
+                    data.image[IDout].array.F[ii] =
+                        pt2function(data.image[ID1].array.D[ii], (double)(data.image[ID2].array.SI16[ii]));
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
                         data.image[IDout].array.F[kk * xysize + ii] = pt2function(
-                                    data.image[ID1].array.D[kk * xysize + ii],
-                                    (double)(data.image[ID2].array.SI16[ii]));
+                            data.image[ID1].array.D[kk * xysize + ii], (double)(data.image[ID2].array.SI16[ii]));
                     }
         }
 
-        if(datatype2 == _DATATYPE_INT32) // DOUBLE INT32 -> DOUBLE
+        if (datatype2 == _DATATYPE_INT32) // DOUBLE INT32 -> DOUBLE
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.F[ii] = pt2function(data.image[ID1].array.D[ii],
-                                                    (double)(data.image[ID2].array.SI32[ii]));
+                    data.image[IDout].array.F[ii] =
+                        pt2function(data.image[ID1].array.D[ii], (double)(data.image[ID2].array.SI32[ii]));
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
                         data.image[IDout].array.F[kk * xysize + ii] = pt2function(
-                                    data.image[ID1].array.D[kk * xysize + ii],
-                                    (double)(data.image[ID2].array.SI32[ii]));
+                            data.image[ID1].array.D[kk * xysize + ii], (double)(data.image[ID2].array.SI32[ii]));
                     }
         }
 
-        if(datatype2 == _DATATYPE_INT64) // DOUBLE INT64 -> DOUBLE
+        if (datatype2 == _DATATYPE_INT64) // DOUBLE INT64 -> DOUBLE
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.F[ii] = pt2function(data.image[ID1].array.D[ii],
-                                                    (double)(data.image[ID2].array.SI64[ii]));
+                    data.image[IDout].array.F[ii] =
+                        pt2function(data.image[ID1].array.D[ii], (double)(data.image[ID2].array.SI64[ii]));
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
                         data.image[IDout].array.F[kk * xysize + ii] = pt2function(
-                                    data.image[ID1].array.D[kk * xysize + ii],
-                                    (double)(data.image[ID2].array.SI64[ii]));
+                            data.image[ID1].array.D[kk * xysize + ii], (double)(data.image[ID2].array.SI64[ii]));
                     }
         }
 
-        if(datatype2 == _DATATYPE_FLOAT) // DOUBLE FLOAT -> DOUBLE
+        if (datatype2 == _DATATYPE_FLOAT) // DOUBLE FLOAT -> DOUBLE
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.F[ii] = pt2function(data.image[ID1].array.D[ii],
-                                                    (double)(data.image[ID2].array.F[ii]));
+                    data.image[IDout].array.F[ii] =
+                        pt2function(data.image[ID1].array.D[ii], (double)(data.image[ID2].array.F[ii]));
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
                         data.image[IDout].array.F[kk * xysize + ii] = pt2function(
-                                    data.image[ID1].array.D[kk * xysize + ii],
-                                    (double)(data.image[ID2].array.F[ii]));
+                            data.image[ID1].array.D[kk * xysize + ii], (double)(data.image[ID2].array.F[ii]));
                     }
         }
 
-        if(datatype2 == _DATATYPE_DOUBLE) // DOUBLE DOUBLE -> DOUBLE
+        if (datatype2 == _DATATYPE_DOUBLE) // DOUBLE DOUBLE -> DOUBLE
         {
-            if(op3D2Dto3D == 0)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+            if (op3D2Dto3D == 0)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[IDout].array.D[ii] = pt2function(data.image[ID1].array.D[ii],
-                                                    data.image[ID2].array.D[ii]);
+                    data.image[IDout].array.D[ii] =
+                        pt2function(data.image[ID1].array.D[ii], data.image[ID2].array.D[ii]);
                 }
 
-            if(op3D2Dto3D == 1)
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(kk = 0; kk < naxes[2]; kk++)
-                    for(ii = 0; ii < xysize; ii++)
+            if (op3D2Dto3D == 1)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (kk = 0; kk < naxes[2]; kk++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
-                        data.image[IDout].array.D[kk * xysize + ii] = pt2function(
-                                    data.image[ID1].array.D[kk * xysize + ii], data.image[ID2].array.D[ii]);
+                        data.image[IDout].array.D[kk * xysize + ii] =
+                            pt2function(data.image[ID1].array.D[kk * xysize + ii], data.image[ID2].array.D[ii]);
                     }
         }
     }
 
-
-
-
-
-//# ifdef _OPENMP
-//    }
-//# endif
+    //# ifdef _OPENMP
+    //    }
+    //# endif
 
     free(naxes);
     free(naxes2);
@@ -3986,16 +3749,7 @@ errno_t arith_image_function_2_1(
     return RETURN_SUCCESS;
 }
 
-
-
-
-
-
-errno_t arith_image_function_2_1_inplace_byID(
-    imageID ID1,
-    imageID ID2,
-    double (*pt2function)(double, double)
-)
+errno_t arith_image_function_2_1_inplace_byID(imageID ID1, imageID ID2, double (*pt2function)(double, double))
 {
     long ii;
     long nelement1, nelement2, nelement;
@@ -4007,313 +3761,297 @@ errno_t arith_image_function_2_1_inplace_byID(
     nelement2 = data.image[ID2].md[0].nelement;
 
     nelement = nelement1;
-    if(nelement1 != nelement2)
+    if (nelement1 != nelement2)
     {
-        PRINT_ERROR(
-            "images %ld and %ld have different number of elements\n", ID1, ID2);
+        PRINT_ERROR("images %ld and %ld have different number of elements\n", ID1, ID2);
         exit(0);
     }
 
     data.image[ID1].md[0].write = 1;
 
-# ifdef _OPENMP
-    #pragma omp parallel if (nelement>OMP_NELEMENT_LIMIT)
+#ifdef _OPENMP
+#pragma omp parallel if (nelement > OMP_NELEMENT_LIMIT)
     {
-# endif
+#endif
 
         // FLOAT
-        if(datatype1 == _DATATYPE_FLOAT)
+        if (datatype1 == _DATATYPE_FLOAT)
         {
-            if(datatype2 == _DATATYPE_UINT8) // FLOAT <- UINT8
+            if (datatype2 == _DATATYPE_UINT8) // FLOAT <- UINT8
             {
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[ID1].array.F[ii] = pt2function((double)(data.image[ID1].array.F[ii]),
-                                                  (double)(data.image[ID2].array.UI8[ii]));
+                    data.image[ID1].array.F[ii] =
+                        pt2function((double)(data.image[ID1].array.F[ii]), (double)(data.image[ID2].array.UI8[ii]));
                 }
             }
 
-            if(datatype2 == _DATATYPE_UINT16) // FLOAT <- UINT16
+            if (datatype2 == _DATATYPE_UINT16) // FLOAT <- UINT16
             {
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[ID1].array.F[ii] = pt2function((double)(data.image[ID1].array.F[ii]),
-                                                  (double)(data.image[ID2].array.UI16[ii]));
+                    data.image[ID1].array.F[ii] =
+                        pt2function((double)(data.image[ID1].array.F[ii]), (double)(data.image[ID2].array.UI16[ii]));
                 }
             }
 
-            if(datatype2 == _DATATYPE_UINT32) // FLOAT <- UINT32
+            if (datatype2 == _DATATYPE_UINT32) // FLOAT <- UINT32
             {
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[ID1].array.F[ii] = pt2function((double)(data.image[ID1].array.F[ii]),
-                                                  (double)(data.image[ID2].array.UI32[ii]));
+                    data.image[ID1].array.F[ii] =
+                        pt2function((double)(data.image[ID1].array.F[ii]), (double)(data.image[ID2].array.UI32[ii]));
                 }
             }
 
-            if(datatype2 == _DATATYPE_UINT64) // FLOAT <- UINT64
+            if (datatype2 == _DATATYPE_UINT64) // FLOAT <- UINT64
             {
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[ID1].array.F[ii] = pt2function((double)(data.image[ID1].array.F[ii]),
-                                                  (double)(data.image[ID2].array.UI64[ii]));
+                    data.image[ID1].array.F[ii] =
+                        pt2function((double)(data.image[ID1].array.F[ii]), (double)(data.image[ID2].array.UI64[ii]));
                 }
             }
 
-            if(datatype2 == _DATATYPE_INT8) // FLOAT <- INT8
+            if (datatype2 == _DATATYPE_INT8) // FLOAT <- INT8
             {
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[ID1].array.F[ii] = pt2function((double)(data.image[ID1].array.F[ii]),
-                                                  (double)(data.image[ID2].array.SI8[ii]));
+                    data.image[ID1].array.F[ii] =
+                        pt2function((double)(data.image[ID1].array.F[ii]), (double)(data.image[ID2].array.SI8[ii]));
                 }
             }
 
-            if(datatype2 == _DATATYPE_INT16) // FLOAT <- INT16
+            if (datatype2 == _DATATYPE_INT16) // FLOAT <- INT16
             {
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[ID1].array.F[ii] = pt2function((double)(data.image[ID1].array.F[ii]),
-                                                  (double)(data.image[ID2].array.SI16[ii]));
+                    data.image[ID1].array.F[ii] =
+                        pt2function((double)(data.image[ID1].array.F[ii]), (double)(data.image[ID2].array.SI16[ii]));
                 }
             }
 
-            if(datatype2 == _DATATYPE_INT32) // FLOAT <- INT32
+            if (datatype2 == _DATATYPE_INT32) // FLOAT <- INT32
             {
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[ID1].array.F[ii] = pt2function((double)(data.image[ID1].array.F[ii]),
-                                                  (double)(data.image[ID2].array.SI32[ii]));
+                    data.image[ID1].array.F[ii] =
+                        pt2function((double)(data.image[ID1].array.F[ii]), (double)(data.image[ID2].array.SI32[ii]));
                 }
             }
 
-            if(datatype2 == _DATATYPE_INT64) // FLOAT <- INT64
+            if (datatype2 == _DATATYPE_INT64) // FLOAT <- INT64
             {
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[ID1].array.F[ii] = pt2function((double)(data.image[ID1].array.F[ii]),
-                                                  (double)(data.image[ID2].array.SI64[ii]));
+                    data.image[ID1].array.F[ii] =
+                        pt2function((double)(data.image[ID1].array.F[ii]), (double)(data.image[ID2].array.SI64[ii]));
                 }
             }
 
-
-            if(datatype2 == _DATATYPE_FLOAT) // FLOAT <- FLOAT
+            if (datatype2 == _DATATYPE_FLOAT) // FLOAT <- FLOAT
             {
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[ID1].array.F[ii] = pt2function((double)(data.image[ID1].array.F[ii]),
-                                                  (double)(data.image[ID2].array.F[ii]));
+                    data.image[ID1].array.F[ii] =
+                        pt2function((double)(data.image[ID1].array.F[ii]), (double)(data.image[ID2].array.F[ii]));
                 }
             }
 
-            if(datatype2 == _DATATYPE_DOUBLE) // FLOAT <- DOUBLE
+            if (datatype2 == _DATATYPE_DOUBLE) // FLOAT <- DOUBLE
             {
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[ID1].array.F[ii] = pt2function((double)(data.image[ID1].array.F[ii]),
-                                                  data.image[ID2].array.D[ii]);
+                    data.image[ID1].array.F[ii] =
+                        pt2function((double)(data.image[ID1].array.F[ii]), data.image[ID2].array.D[ii]);
                 }
             }
-
         }
 
-
-
         // DOUBLE
-        if(datatype1 == _DATATYPE_DOUBLE)
+        if (datatype1 == _DATATYPE_DOUBLE)
         {
-            if(datatype2 == _DATATYPE_UINT8) // DOUBLE <- UINT8
+            if (datatype2 == _DATATYPE_UINT8) // DOUBLE <- UINT8
             {
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[ID1].array.D[ii] = pt2function(data.image[ID1].array.D[ii],
-                                                  (double)(data.image[ID2].array.UI8[ii]));
+                    data.image[ID1].array.D[ii] =
+                        pt2function(data.image[ID1].array.D[ii], (double)(data.image[ID2].array.UI8[ii]));
                 }
             }
 
-            if(datatype2 == _DATATYPE_UINT16) // DOUBLE <- UINT16
+            if (datatype2 == _DATATYPE_UINT16) // DOUBLE <- UINT16
             {
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[ID1].array.D[ii] = pt2function(data.image[ID1].array.D[ii],
-                                                  (double)(data.image[ID2].array.UI16[ii]));
+                    data.image[ID1].array.D[ii] =
+                        pt2function(data.image[ID1].array.D[ii], (double)(data.image[ID2].array.UI16[ii]));
                 }
             }
 
-            if(datatype2 == _DATATYPE_UINT32) // DOUBLE <- UINT32
+            if (datatype2 == _DATATYPE_UINT32) // DOUBLE <- UINT32
             {
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[ID1].array.D[ii] = pt2function(data.image[ID1].array.D[ii],
-                                                  (double)(data.image[ID2].array.UI32[ii]));
+                    data.image[ID1].array.D[ii] =
+                        pt2function(data.image[ID1].array.D[ii], (double)(data.image[ID2].array.UI32[ii]));
                 }
             }
 
-            if(datatype2 == _DATATYPE_UINT64) // DOUBLE <- UINT64
+            if (datatype2 == _DATATYPE_UINT64) // DOUBLE <- UINT64
             {
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[ID1].array.D[ii] = pt2function(data.image[ID1].array.D[ii],
-                                                  (double)(data.image[ID2].array.UI64[ii]));
+                    data.image[ID1].array.D[ii] =
+                        pt2function(data.image[ID1].array.D[ii], (double)(data.image[ID2].array.UI64[ii]));
                 }
             }
 
-            if(datatype2 == _DATATYPE_INT8) // DOUBLE <- INT8
+            if (datatype2 == _DATATYPE_INT8) // DOUBLE <- INT8
             {
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[ID1].array.D[ii] = pt2function(data.image[ID1].array.D[ii],
-                                                  (double)(data.image[ID2].array.SI8[ii]));
+                    data.image[ID1].array.D[ii] =
+                        pt2function(data.image[ID1].array.D[ii], (double)(data.image[ID2].array.SI8[ii]));
                 }
             }
 
-            if(datatype2 == _DATATYPE_INT16) // DOUBLE <- INT16
+            if (datatype2 == _DATATYPE_INT16) // DOUBLE <- INT16
             {
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[ID1].array.D[ii] = pt2function(data.image[ID1].array.D[ii],
-                                                  (double)(data.image[ID2].array.SI16[ii]));
+                    data.image[ID1].array.D[ii] =
+                        pt2function(data.image[ID1].array.D[ii], (double)(data.image[ID2].array.SI16[ii]));
                 }
             }
 
-            if(datatype2 == _DATATYPE_INT32) // DOUBLE <- INT32
+            if (datatype2 == _DATATYPE_INT32) // DOUBLE <- INT32
             {
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[ID1].array.D[ii] = pt2function(data.image[ID1].array.D[ii],
-                                                  (double)(data.image[ID2].array.SI32[ii]));
+                    data.image[ID1].array.D[ii] =
+                        pt2function(data.image[ID1].array.D[ii], (double)(data.image[ID2].array.SI32[ii]));
                 }
             }
 
-            if(datatype2 == _DATATYPE_INT64) // DOUBLE <- INT64
+            if (datatype2 == _DATATYPE_INT64) // DOUBLE <- INT64
             {
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[ID1].array.D[ii] = pt2function(data.image[ID1].array.D[ii],
-                                                  (double)(data.image[ID2].array.SI64[ii]));
+                    data.image[ID1].array.D[ii] =
+                        pt2function(data.image[ID1].array.D[ii], (double)(data.image[ID2].array.SI64[ii]));
                 }
             }
 
-
-            if(datatype2 == _DATATYPE_FLOAT) // DOUBLE <- FLOAT
+            if (datatype2 == _DATATYPE_FLOAT) // DOUBLE <- FLOAT
             {
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[ID1].array.D[ii] = pt2function(data.image[ID1].array.D[ii],
-                                                  (double)(data.image[ID2].array.F[ii]));
+                    data.image[ID1].array.D[ii] =
+                        pt2function(data.image[ID1].array.D[ii], (double)(data.image[ID2].array.F[ii]));
                 }
             }
 
-
-            if(datatype2 == _DATATYPE_DOUBLE) // DOUBLE <- DOUBLE
+            if (datatype2 == _DATATYPE_DOUBLE) // DOUBLE <- DOUBLE
             {
-# ifdef _OPENMP
-                #pragma omp for
-# endif
-                for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+                for (ii = 0; ii < nelement; ii++)
                 {
-                    data.image[ID1].array.D[ii] = pt2function(data.image[ID1].array.D[ii],
-                                                  data.image[ID2].array.D[ii]);
+                    data.image[ID1].array.D[ii] = pt2function(data.image[ID1].array.D[ii], data.image[ID2].array.D[ii]);
                 }
             }
         }
 
-
-
-
-
-
-
-        if((datatype1 == _DATATYPE_COMPLEX_FLOAT)
-                && (datatype2 == _DATATYPE_COMPLEX_FLOAT))
+        if ((datatype1 == _DATATYPE_COMPLEX_FLOAT) && (datatype2 == _DATATYPE_COMPLEX_FLOAT))
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[ID1].array.CF[ii].re = pt2function((double)(
-                                                      data.image[ID1].array.CF[ii].re), (double)(data.image[ID2].array.CF[ii].re));
-                data.image[ID1].array.CF[ii].im = pt2function((double)(
-                                                      data.image[ID1].array.CF[ii].im), (double)(data.image[ID2].array.CF[ii].im));
+                data.image[ID1].array.CF[ii].re =
+                    pt2function((double)(data.image[ID1].array.CF[ii].re), (double)(data.image[ID2].array.CF[ii].re));
+                data.image[ID1].array.CF[ii].im =
+                    pt2function((double)(data.image[ID1].array.CF[ii].im), (double)(data.image[ID2].array.CF[ii].im));
             }
         }
 
-        if((datatype1 == _DATATYPE_COMPLEX_DOUBLE)
-                && (datatype2 == _DATATYPE_COMPLEX_DOUBLE))
+        if ((datatype1 == _DATATYPE_COMPLEX_DOUBLE) && (datatype2 == _DATATYPE_COMPLEX_DOUBLE))
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[ID1].array.CD[ii].re = pt2function((double)(
-                                                      data.image[ID1].array.CD[ii].re), (double)(data.image[ID2].array.CD[ii].re));
-                data.image[ID1].array.CD[ii].im = pt2function((double)(
-                                                      data.image[ID1].array.CD[ii].im), (double)(data.image[ID2].array.CD[ii].im));
+                data.image[ID1].array.CD[ii].re =
+                    pt2function((double)(data.image[ID1].array.CD[ii].re), (double)(data.image[ID2].array.CD[ii].re));
+                data.image[ID1].array.CD[ii].im =
+                    pt2function((double)(data.image[ID1].array.CD[ii].im), (double)(data.image[ID2].array.CD[ii].im));
             }
         }
 
-# ifdef _OPENMP
+#ifdef _OPENMP
     }
-# endif
+#endif
 
     data.image[ID1].md[0].write = 0;
     data.image[ID1].md[0].cnt0++;
@@ -4321,16 +4059,8 @@ errno_t arith_image_function_2_1_inplace_byID(
     return EXIT_SUCCESS;
 }
 
-
-
-
-
-
-errno_t arith_image_function_2_1_inplace(
-    const char *ID_name1,
-    const char *ID_name2,
-    double (*pt2function)(double, double)
-)
+errno_t arith_image_function_2_1_inplace(const char *ID_name1, const char *ID_name2,
+                                         double (*pt2function)(double, double))
 {
     imageID ID1;
     imageID ID2;
@@ -4343,26 +4073,12 @@ errno_t arith_image_function_2_1_inplace(
     return EXIT_SUCCESS;
 }
 
-
-
-
-
-
-
-
-
-
-
 /* ------------------------------------------------------------------------- */
 /* complex image, complex image  -> complex image                            */
 /* ------------------------------------------------------------------------- */
 // complex float (CF), complex float (CF) -> complex float (CF)
-errno_t arith_image_function_CF_CF__CF(
-    const char *ID_name1,
-    const char *ID_name2,
-    const char *ID_out,
-    complex_float(*pt2function)(complex_float, complex_float)
-)
+errno_t arith_image_function_CF_CF__CF(const char *ID_name1, const char *ID_name2, const char *ID_out,
+                                       complex_float (*pt2function)(complex_float, complex_float))
 {
     imageID ID1;
     imageID ID2;
@@ -4379,50 +4095,41 @@ errno_t arith_image_function_CF_CF__CF(
     datatype1 = data.image[ID1].md[0].datatype;
     //datatype2 = data.image[ID2].md[0].datatype;
     naxis = data.image[ID1].md[0].naxis;
-    naxes = (uint32_t *) malloc(sizeof(uint32_t) * naxis);
-    if(naxes == NULL)
+    naxes = (uint32_t *)malloc(sizeof(uint32_t) * naxis);
+    if (naxes == NULL)
     {
         PRINT_ERROR("malloc() error");
         exit(0);
     }
 
-    for(i = 0; i < naxis; i++)
+    for (i = 0; i < naxis; i++)
     {
         naxes[i] = data.image[ID1].md[0].size[i];
     }
 
-    create_image_ID(ID_out, naxis, naxes, datatype1, data.SHARED_DFT,
-                            data.NBKEYWORD_DFT, 0, &IDout);
+    create_image_ID(ID_out, naxis, naxes, datatype1, data.SHARED_DFT, data.NBKEYWORD_DFT, 0, &IDout);
     free(naxes);
     nelement = data.image[ID1].md[0].nelement;
 
-# ifdef _OPENMP
-    #pragma omp parallel if (nelement>OMP_NELEMENT_LIMIT)
+#ifdef _OPENMP
+#pragma omp parallel if (nelement > OMP_NELEMENT_LIMIT)
     {
-        #pragma omp for
-# endif
-        for(ii = 0; ii < nelement; ii++)
+#pragma omp for
+#endif
+        for (ii = 0; ii < nelement; ii++)
         {
-            data.image[IDout].array.CF[ii] = pt2function(data.image[ID1].array.CF[ii],
-                                             data.image[ID2].array.CF[ii]);
+            data.image[IDout].array.CF[ii] = pt2function(data.image[ID1].array.CF[ii], data.image[ID2].array.CF[ii]);
         }
-# ifdef _OPENMP
+#ifdef _OPENMP
     }
-# endif
+#endif
 
     return RETURN_SUCCESS;
 }
 
-
-
-
 // complex double (CD), complex double (CD) -> complex double (CD)
-errno_t arith_image_function_CD_CD__CD(
-    const char *ID_name1,
-    const char *ID_name2,
-    const char *ID_out,
-    complex_double(*pt2function)(complex_double, complex_double)
-)
+errno_t arith_image_function_CD_CD__CD(const char *ID_name1, const char *ID_name2, const char *ID_out,
+                                       complex_double (*pt2function)(complex_double, complex_double))
 {
     imageID ID1;
     imageID ID2;
@@ -4439,51 +4146,43 @@ errno_t arith_image_function_CD_CD__CD(
     datatype1 = data.image[ID1].md[0].datatype;
     //datatype2 = data.image[ID2].md[0].datatype;
     naxis = data.image[ID1].md[0].naxis;
-    naxes = (uint32_t *) malloc(sizeof(uint32_t) * naxis);
-    if(naxes == NULL)
+    naxes = (uint32_t *)malloc(sizeof(uint32_t) * naxis);
+    if (naxes == NULL)
     {
         PRINT_ERROR("malloc() error");
         exit(0);
     }
 
-    for(i = 0; i < naxis; i++)
+    for (i = 0; i < naxis; i++)
     {
         naxes[i] = data.image[ID1].md[0].size[i];
     }
 
-    create_image_ID(ID_out, naxis, naxes, datatype1, data.SHARED_DFT,
-                            data.NBKEYWORD_DFT, 0, &IDout);
+    create_image_ID(ID_out, naxis, naxes, datatype1, data.SHARED_DFT, data.NBKEYWORD_DFT, 0, &IDout);
     free(naxes);
     nelement = data.image[ID1].md[0].nelement;
 
-# ifdef _OPENMP
-    #pragma omp parallel if (nelement>OMP_NELEMENT_LIMIT)
+#ifdef _OPENMP
+#pragma omp parallel if (nelement > OMP_NELEMENT_LIMIT)
     {
-        #pragma omp for
-# endif
-        for(ii = 0; ii < nelement; ii++)
+#pragma omp for
+#endif
+        for (ii = 0; ii < nelement; ii++)
         {
-            data.image[IDout].array.CD[ii] = pt2function(data.image[ID1].array.CD[ii],
-                                             data.image[ID2].array.CD[ii]);
+            data.image[IDout].array.CD[ii] = pt2function(data.image[ID1].array.CD[ii], data.image[ID2].array.CD[ii]);
         }
-# ifdef _OPENMP
+#ifdef _OPENMP
     }
-# endif
+#endif
 
     return RETURN_SUCCESS;
 }
 
-
-
-
-
 /* ------------------------------------------------------------------------- */
 /* image, double  -> image                                                */
 /* ------------------------------------------------------------------------- */
 
-
-int arith_image_function_1f_1(const char *ID_name, double f1,
-                              const char *ID_out, double (*pt2function)(double, double))
+int arith_image_function_1f_1(const char *ID_name, double f1, const char *ID_out, double (*pt2function)(double, double))
 {
     long ID;
     long IDout;
@@ -4497,165 +4196,144 @@ int arith_image_function_1f_1(const char *ID_name, double f1,
     ID = image_ID(ID_name);
     datatype = data.image[ID].md[0].datatype;
     naxis = data.image[ID].md[0].naxis;
-    naxes = (uint32_t *) malloc(sizeof(uint32_t) * naxis);
-    if(naxes == NULL)
+    naxes = (uint32_t *)malloc(sizeof(uint32_t) * naxis);
+    if (naxes == NULL)
     {
         PRINT_ERROR("malloc() error");
         exit(0);
     }
 
-    for(i = 0; i < naxis; i++)
+    for (i = 0; i < naxis; i++)
     {
         naxes[i] = data.image[ID].md[0].size[i];
     }
 
     datatypeout = _DATATYPE_FLOAT;
-    if(datatype == _DATATYPE_DOUBLE)
+    if (datatype == _DATATYPE_DOUBLE)
     {
         datatypeout = _DATATYPE_DOUBLE;
     }
 
-    create_image_ID(ID_out, naxis, naxes, datatypeout, data.SHARED_DFT,
-                            data.NBKEYWORD_DFT, 0, &IDout);
+    create_image_ID(ID_out, naxis, naxes, datatypeout, data.SHARED_DFT, data.NBKEYWORD_DFT, 0, &IDout);
 
     free(naxes);
     nelement = data.image[ID].md[0].nelement;
 
-
-
-# ifdef _OPENMP
-    #pragma omp parallel if (nelement>OMP_NELEMENT_LIMIT)
+#ifdef _OPENMP
+#pragma omp parallel if (nelement > OMP_NELEMENT_LIMIT)
     {
-# endif
-
+#endif
 
-        if(datatype == _DATATYPE_UINT8)
+        if (datatype == _DATATYPE_UINT8)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[IDout].array.F[ii] = pt2function((double)(
-                                                    data.image[ID].array.UI8[ii]), f1);
+                data.image[IDout].array.F[ii] = pt2function((double)(data.image[ID].array.UI8[ii]), f1);
             }
         }
-        if(datatype == _DATATYPE_UINT16)
+        if (datatype == _DATATYPE_UINT16)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[IDout].array.F[ii] = pt2function((double)(
-                                                    data.image[ID].array.UI16[ii]), f1);
+                data.image[IDout].array.F[ii] = pt2function((double)(data.image[ID].array.UI16[ii]), f1);
             }
         }
-        if(datatype == _DATATYPE_UINT32)
+        if (datatype == _DATATYPE_UINT32)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[IDout].array.F[ii] = pt2function((double)(
-                                                    data.image[ID].array.UI32[ii]), f1);
+                data.image[IDout].array.F[ii] = pt2function((double)(data.image[ID].array.UI32[ii]), f1);
             }
         }
-        if(datatype == _DATATYPE_UINT64)
+        if (datatype == _DATATYPE_UINT64)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[IDout].array.F[ii] = pt2function((double)(
-                                                    data.image[ID].array.UI64[ii]), f1);
+                data.image[IDout].array.F[ii] = pt2function((double)(data.image[ID].array.UI64[ii]), f1);
             }
         }
 
-
-        if(datatype == _DATATYPE_INT8)
+        if (datatype == _DATATYPE_INT8)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[IDout].array.F[ii] = pt2function((double)(
-                                                    data.image[ID].array.SI8[ii]), f1);
+                data.image[IDout].array.F[ii] = pt2function((double)(data.image[ID].array.SI8[ii]), f1);
             }
         }
-        if(datatype == _DATATYPE_INT16)
+        if (datatype == _DATATYPE_INT16)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[IDout].array.F[ii] = pt2function((double)(
-                                                    data.image[ID].array.SI16[ii]), f1);
+                data.image[IDout].array.F[ii] = pt2function((double)(data.image[ID].array.SI16[ii]), f1);
             }
         }
-        if(datatype == _DATATYPE_INT32)
+        if (datatype == _DATATYPE_INT32)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[IDout].array.F[ii] = pt2function((double)(
-                                                    data.image[ID].array.SI32[ii]), f1);
+                data.image[IDout].array.F[ii] = pt2function((double)(data.image[ID].array.SI32[ii]), f1);
             }
         }
-        if(datatype == _DATATYPE_INT64)
+        if (datatype == _DATATYPE_INT64)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[IDout].array.F[ii] = pt2function((double)(
-                                                    data.image[ID].array.SI64[ii]), f1);
+                data.image[IDout].array.F[ii] = pt2function((double)(data.image[ID].array.SI64[ii]), f1);
             }
         }
 
-
-        if(datatype == _DATATYPE_FLOAT)
+        if (datatype == _DATATYPE_FLOAT)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[IDout].array.F[ii] = pt2function((double)(
-                                                    data.image[ID].array.F[ii]), f1);
+                data.image[IDout].array.F[ii] = pt2function((double)(data.image[ID].array.F[ii]), f1);
             }
         }
-        if(datatype == _DATATYPE_DOUBLE)
+        if (datatype == _DATATYPE_DOUBLE)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[IDout].array.D[ii] = (double) pt2function((double)(
-                                                    data.image[ID].array.D[ii]), f1);
+                data.image[IDout].array.D[ii] = (double)pt2function((double)(data.image[ID].array.D[ii]), f1);
             }
         }
-# ifdef _OPENMP
+#ifdef _OPENMP
     }
-# endif
-
-
+#endif
 
     return EXIT_SUCCESS;
 }
 
-
-
-int arith_image_function_1f_1_inplace_byID(long ID, double f1,
-        double (*pt2function)(double, double))
+int arith_image_function_1f_1_inplace_byID(long ID, double f1, double (*pt2function)(double, double))
 {
     long ii;
     long nelement;
@@ -4664,138 +4342,121 @@ int arith_image_function_1f_1_inplace_byID(long ID, double f1,
     datatype = data.image[ID].md[0].datatype;
     nelement = data.image[ID].md[0].nelement;
 
-# ifdef _OPENMP
-    #pragma omp parallel if (nelement>OMP_NELEMENT_LIMIT)
+#ifdef _OPENMP
+#pragma omp parallel if (nelement > OMP_NELEMENT_LIMIT)
     {
-# endif
-
+#endif
 
-        if(datatype == _DATATYPE_UINT8)
+        if (datatype == _DATATYPE_UINT8)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[ID].array.F[ii] = pt2function((double)(data.image[ID].array.UI8[ii]),
-                                             f1);
+                data.image[ID].array.F[ii] = pt2function((double)(data.image[ID].array.UI8[ii]), f1);
             }
         }
-        if(datatype == _DATATYPE_UINT16)
+        if (datatype == _DATATYPE_UINT16)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[ID].array.F[ii] = pt2function((double)(
-                                                 data.image[ID].array.UI16[ii]), f1);
+                data.image[ID].array.F[ii] = pt2function((double)(data.image[ID].array.UI16[ii]), f1);
             }
         }
-        if(datatype == _DATATYPE_UINT32)
+        if (datatype == _DATATYPE_UINT32)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[ID].array.F[ii] = pt2function((double)(
-                                                 data.image[ID].array.UI32[ii]), f1);
+                data.image[ID].array.F[ii] = pt2function((double)(data.image[ID].array.UI32[ii]), f1);
             }
         }
-        if(datatype == _DATATYPE_UINT64)
+        if (datatype == _DATATYPE_UINT64)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[ID].array.F[ii] = pt2function((double)(
-                                                 data.image[ID].array.UI64[ii]), f1);
+                data.image[ID].array.F[ii] = pt2function((double)(data.image[ID].array.UI64[ii]), f1);
             }
         }
 
-
-        if(datatype == _DATATYPE_INT8)
+        if (datatype == _DATATYPE_INT8)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[ID].array.F[ii] = pt2function((double)(data.image[ID].array.SI8[ii]),
-                                             f1);
+                data.image[ID].array.F[ii] = pt2function((double)(data.image[ID].array.SI8[ii]), f1);
             }
         }
-        if(datatype == _DATATYPE_INT16)
+        if (datatype == _DATATYPE_INT16)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[ID].array.F[ii] = pt2function((double)(
-                                                 data.image[ID].array.SI16[ii]), f1);
+                data.image[ID].array.F[ii] = pt2function((double)(data.image[ID].array.SI16[ii]), f1);
             }
         }
-        if(datatype == _DATATYPE_INT32)
+        if (datatype == _DATATYPE_INT32)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[ID].array.F[ii] = pt2function((double)(
-                                                 data.image[ID].array.SI32[ii]), f1);
+                data.image[ID].array.F[ii] = pt2function((double)(data.image[ID].array.SI32[ii]), f1);
             }
         }
-        if(datatype == _DATATYPE_INT64)
+        if (datatype == _DATATYPE_INT64)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[ID].array.F[ii] = pt2function((double)(
-                                                 data.image[ID].array.SI64[ii]), f1);
+                data.image[ID].array.F[ii] = pt2function((double)(data.image[ID].array.SI64[ii]), f1);
             }
         }
 
-
-        if(datatype == _DATATYPE_FLOAT)
+        if (datatype == _DATATYPE_FLOAT)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[ID].array.F[ii] = pt2function((double)(data.image[ID].array.F[ii]),
-                                             f1);
+                data.image[ID].array.F[ii] = pt2function((double)(data.image[ID].array.F[ii]), f1);
             }
         }
-        if(datatype == _DATATYPE_DOUBLE)
+        if (datatype == _DATATYPE_DOUBLE)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[ID].array.D[ii] = (double) pt2function((double)(
-                                                 data.image[ID].array.D[ii]), f1);
+                data.image[ID].array.D[ii] = (double)pt2function((double)(data.image[ID].array.D[ii]), f1);
             }
         }
-# ifdef _OPENMP
+#ifdef _OPENMP
     }
-# endif
+#endif
 
     return EXIT_SUCCESS;
 }
 
-
-
-
-int arith_image_function_1f_1_inplace(const char *ID_name, double f1,
-                                      double (*pt2function)(double, double))
+int arith_image_function_1f_1_inplace(const char *ID_name, double f1, double (*pt2function)(double, double))
 {
     long ID;
     ID = image_ID(ID_name);
@@ -4803,18 +4464,12 @@ int arith_image_function_1f_1_inplace(const char *ID_name, double f1,
     return (arith_image_function_1f_1_inplace_byID(ID, f1, pt2function));
 }
 
-
-
-
-
-
 /* ------------------------------------------------------------------------- */
 /* image, double, double -> image                                      */
 /* ------------------------------------------------------------------------- */
 
-
-int arith_image_function_1ff_1(const char *ID_name, double f1, double f2,
-                               const char *ID_out, double (*pt2function)(double, double, double))
+int arith_image_function_1ff_1(const char *ID_name, double f1, double f2, const char *ID_out,
+                               double (*pt2function)(double, double, double))
 {
     long ID;
     long IDout;
@@ -4829,160 +4484,143 @@ int arith_image_function_1ff_1(const char *ID_name, double f1, double f2,
     ID = image_ID(ID_name);
     datatype = data.image[ID].md[0].datatype;
     naxis = data.image[ID].md[0].naxis;
-    naxes = (uint32_t *) malloc(sizeof(uint32_t) * naxis);
-    if(naxes == NULL)
+    naxes = (uint32_t *)malloc(sizeof(uint32_t) * naxis);
+    if (naxes == NULL)
     {
         PRINT_ERROR("malloc() error");
         exit(0);
     }
 
-    for(i = 0; i < naxis; i++)
+    for (i = 0; i < naxis; i++)
     {
         naxes[i] = data.image[ID].md[0].size[i];
     }
     datatypeout = _DATATYPE_FLOAT;
-    if(datatype == _DATATYPE_DOUBLE)
+    if (datatype == _DATATYPE_DOUBLE)
     {
         datatypeout = _DATATYPE_DOUBLE;
     }
 
-    create_image_ID(ID_out, naxis, naxes, datatypeout, data.SHARED_DFT,
-                            data.NBKEYWORD_DFT, 0, &IDout);
+    create_image_ID(ID_out, naxis, naxes, datatypeout, data.SHARED_DFT, data.NBKEYWORD_DFT, 0, &IDout);
     free(naxes);
     nelement = data.image[ID].md[0].nelement;
 
-# ifdef _OPENMP
-    #pragma omp parallel if (nelement>OMP_NELEMENT_LIMIT)
+#ifdef _OPENMP
+#pragma omp parallel if (nelement > OMP_NELEMENT_LIMIT)
     {
-# endif
+#endif
 
-        if(datatype == _DATATYPE_UINT8)
+        if (datatype == _DATATYPE_UINT8)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[IDout].array.F[ii] = pt2function((double)(
-                                                    data.image[ID].array.UI8[ii]), f1, f2);
+                data.image[IDout].array.F[ii] = pt2function((double)(data.image[ID].array.UI8[ii]), f1, f2);
             }
         }
-        if(datatype == _DATATYPE_UINT16)
+        if (datatype == _DATATYPE_UINT16)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[IDout].array.F[ii] = pt2function((double)(
-                                                    data.image[ID].array.UI16[ii]), f1, f2);
+                data.image[IDout].array.F[ii] = pt2function((double)(data.image[ID].array.UI16[ii]), f1, f2);
             }
         }
-        if(datatype == _DATATYPE_UINT32)
+        if (datatype == _DATATYPE_UINT32)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[IDout].array.F[ii] = pt2function((double)(
-                                                    data.image[ID].array.UI32[ii]), f1, f2);
+                data.image[IDout].array.F[ii] = pt2function((double)(data.image[ID].array.UI32[ii]), f1, f2);
             }
         }
-        if(datatype == _DATATYPE_UINT64)
+        if (datatype == _DATATYPE_UINT64)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[IDout].array.F[ii] = pt2function((double)(
-                                                    data.image[ID].array.UI64[ii]), f1, f2);
+                data.image[IDout].array.F[ii] = pt2function((double)(data.image[ID].array.UI64[ii]), f1, f2);
             }
         }
 
-
-        if(datatype == _DATATYPE_INT8)
+        if (datatype == _DATATYPE_INT8)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[IDout].array.F[ii] = pt2function((double)(
-                                                    data.image[ID].array.SI8[ii]), f1, f2);
+                data.image[IDout].array.F[ii] = pt2function((double)(data.image[ID].array.SI8[ii]), f1, f2);
             }
         }
-        if(datatype == _DATATYPE_INT16)
+        if (datatype == _DATATYPE_INT16)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[IDout].array.F[ii] = pt2function((double)(
-                                                    data.image[ID].array.SI16[ii]), f1, f2);
+                data.image[IDout].array.F[ii] = pt2function((double)(data.image[ID].array.SI16[ii]), f1, f2);
             }
         }
-        if(datatype == _DATATYPE_INT32)
+        if (datatype == _DATATYPE_INT32)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[IDout].array.F[ii] = pt2function((double)(
-                                                    data.image[ID].array.SI32[ii]), f1, f2);
+                data.image[IDout].array.F[ii] = pt2function((double)(data.image[ID].array.SI32[ii]), f1, f2);
             }
         }
-        if(datatype == _DATATYPE_INT64)
+        if (datatype == _DATATYPE_INT64)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[IDout].array.F[ii] = pt2function((double)(
-                                                    data.image[ID].array.SI64[ii]), f1, f2);
+                data.image[IDout].array.F[ii] = pt2function((double)(data.image[ID].array.SI64[ii]), f1, f2);
             }
         }
 
-        if(datatype == _DATATYPE_FLOAT)
+        if (datatype == _DATATYPE_FLOAT)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[IDout].array.F[ii] = pt2function((double)(
-                                                    data.image[ID].array.F[ii]), f1, f2);
+                data.image[IDout].array.F[ii] = pt2function((double)(data.image[ID].array.F[ii]), f1, f2);
             }
         }
-        if(datatype == _DATATYPE_DOUBLE)
+        if (datatype == _DATATYPE_DOUBLE)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[IDout].array.D[ii] = pt2function((double)(
-                                                    data.image[ID].array.D[ii]), f1, f2);
+                data.image[IDout].array.D[ii] = pt2function((double)(data.image[ID].array.D[ii]), f1, f2);
             }
         }
-# ifdef _OPENMP
+#ifdef _OPENMP
     }
-# endif
+#endif
 
-    return(0);
+    return (0);
 }
 
-
-
-
-
-
-int arith_image_function_1ff_1_inplace(const char *ID_name, double f1,
-                                       double f2, double (*pt2function)(double, double, double))
+int arith_image_function_1ff_1_inplace(const char *ID_name, double f1, double f2,
+                                       double (*pt2function)(double, double, double))
 {
     long ID;
     long ii;
@@ -4993,141 +4631,122 @@ int arith_image_function_1ff_1_inplace(const char *ID_name, double f1,
     datatype = data.image[ID].md[0].datatype;
     nelement = data.image[ID].md[0].nelement;
 
-
-# ifdef _OPENMP
-    #pragma omp parallel if (nelement>OMP_NELEMENT_LIMIT)
+#ifdef _OPENMP
+#pragma omp parallel if (nelement > OMP_NELEMENT_LIMIT)
     {
-# endif
-
+#endif
 
-        if(datatype == _DATATYPE_UINT8)
+        if (datatype == _DATATYPE_UINT8)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[ID].array.UI8[ii] = (uint8_t) pt2function((double)(
-                                                   data.image[ID].array.UI8[ii]), f1, f2);
+                data.image[ID].array.UI8[ii] = (uint8_t)pt2function((double)(data.image[ID].array.UI8[ii]), f1, f2);
             }
         }
-        if(datatype == _DATATYPE_UINT16)
+        if (datatype == _DATATYPE_UINT16)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[ID].array.UI16[ii] = (uint16_t) pt2function((double)(
-                                                    data.image[ID].array.UI16[ii]), f1, f2);
+                data.image[ID].array.UI16[ii] = (uint16_t)pt2function((double)(data.image[ID].array.UI16[ii]), f1, f2);
             }
         }
-        if(datatype == _DATATYPE_UINT32)
+        if (datatype == _DATATYPE_UINT32)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[ID].array.UI32[ii] = (uint32_t) pt2function((double)(
-                                                    data.image[ID].array.UI32[ii]), f1, f2);
+                data.image[ID].array.UI32[ii] = (uint32_t)pt2function((double)(data.image[ID].array.UI32[ii]), f1, f2);
             }
         }
-        if(datatype == _DATATYPE_UINT64)
+        if (datatype == _DATATYPE_UINT64)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[ID].array.UI64[ii] = (uint64_t) pt2function((double)(
-                                                    data.image[ID].array.UI64[ii]), f1, f2);
+                data.image[ID].array.UI64[ii] = (uint64_t)pt2function((double)(data.image[ID].array.UI64[ii]), f1, f2);
             }
         }
 
-
-        if(datatype == _DATATYPE_INT8)
+        if (datatype == _DATATYPE_INT8)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[ID].array.SI8[ii] = (int8_t) pt2function((double)(
-                                                   data.image[ID].array.SI8[ii]), f1, f2);
+                data.image[ID].array.SI8[ii] = (int8_t)pt2function((double)(data.image[ID].array.SI8[ii]), f1, f2);
             }
         }
-        if(datatype == _DATATYPE_INT16)
+        if (datatype == _DATATYPE_INT16)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[ID].array.SI16[ii] = (int16_t) pt2function((double)(
-                                                    data.image[ID].array.SI16[ii]), f1, f2);
+                data.image[ID].array.SI16[ii] = (int16_t)pt2function((double)(data.image[ID].array.SI16[ii]), f1, f2);
             }
         }
-        if(datatype == _DATATYPE_INT32)
+        if (datatype == _DATATYPE_INT32)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[ID].array.SI32[ii] = (int32_t) pt2function((double)(
-                                                    data.image[ID].array.SI32[ii]), f1, f2);
+                data.image[ID].array.SI32[ii] = (int32_t)pt2function((double)(data.image[ID].array.SI32[ii]), f1, f2);
             }
         }
-        if(datatype == _DATATYPE_INT64)
+        if (datatype == _DATATYPE_INT64)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[ID].array.SI64[ii] = (int64_t) pt2function((double)(
-                                                    data.image[ID].array.SI64[ii]), f1, f2);
+                data.image[ID].array.SI64[ii] = (int64_t)pt2function((double)(data.image[ID].array.SI64[ii]), f1, f2);
             }
         }
 
-
-
-        if(datatype == _DATATYPE_FLOAT)
+        if (datatype == _DATATYPE_FLOAT)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[ID].array.F[ii] = pt2function((double)(data.image[ID].array.F[ii]),
-                                             f1, f2);
+                data.image[ID].array.F[ii] = pt2function((double)(data.image[ID].array.F[ii]), f1, f2);
             }
         }
-        if(datatype == _DATATYPE_DOUBLE)
+        if (datatype == _DATATYPE_DOUBLE)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[ID].array.D[ii] = pt2function((double)(data.image[ID].array.D[ii]),
-                                             f1, f2);
+                data.image[ID].array.D[ii] = pt2function((double)(data.image[ID].array.D[ii]), f1, f2);
             }
         }
-# ifdef _OPENMP
+#ifdef _OPENMP
     }
-# endif
+#endif
 
-    return(0);
+    return (0);
 }
 
-
-
-
-
 int arith_image_function_1ff_1_inplace_byID(long ID, double f1, double f2,
-        double (*pt2function)(double, double, double))
+                                            double (*pt2function)(double, double, double))
 {
     long ii;
     long nelement;
@@ -5136,137 +4755,117 @@ int arith_image_function_1ff_1_inplace_byID(long ID, double f1, double f2,
     datatype = data.image[ID].md[0].datatype;
     nelement = data.image[ID].md[0].nelement;
 
-# ifdef _OPENMP
-    #pragma omp parallel if (nelement>OMP_NELEMENT_LIMIT)
+#ifdef _OPENMP
+#pragma omp parallel if (nelement > OMP_NELEMENT_LIMIT)
     {
-# endif
-
+#endif
 
-        if(datatype == _DATATYPE_UINT8)
+        if (datatype == _DATATYPE_UINT8)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[ID].array.UI8[ii] = (uint8_t) pt2function((double)(
-                                                   data.image[ID].array.UI8[ii]), f1, f2);
+                data.image[ID].array.UI8[ii] = (uint8_t)pt2function((double)(data.image[ID].array.UI8[ii]), f1, f2);
             }
         }
-        if(datatype == _DATATYPE_UINT16)
+        if (datatype == _DATATYPE_UINT16)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[ID].array.UI16[ii] = (uint16_t) pt2function((double)(
-                                                    data.image[ID].array.UI16[ii]), f1, f2);
+                data.image[ID].array.UI16[ii] = (uint16_t)pt2function((double)(data.image[ID].array.UI16[ii]), f1, f2);
             }
         }
-        if(datatype == _DATATYPE_UINT32)
+        if (datatype == _DATATYPE_UINT32)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[ID].array.UI32[ii] = (uint32_t) pt2function((double)(
-                                                    data.image[ID].array.UI32[ii]), f1, f2);
+                data.image[ID].array.UI32[ii] = (uint32_t)pt2function((double)(data.image[ID].array.UI32[ii]), f1, f2);
             }
         }
-        if(datatype == _DATATYPE_UINT64)
+        if (datatype == _DATATYPE_UINT64)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[ID].array.UI64[ii] = (uint64_t) pt2function((double)(
-                                                    data.image[ID].array.UI64[ii]), f1, f2);
+                data.image[ID].array.UI64[ii] = (uint64_t)pt2function((double)(data.image[ID].array.UI64[ii]), f1, f2);
             }
         }
 
-
-
-        if(datatype == _DATATYPE_INT32)
+        if (datatype == _DATATYPE_INT32)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[ID].array.SI8[ii] = (int8_t) pt2function((double)(
-                                                   data.image[ID].array.SI8[ii]), f1, f2);
+                data.image[ID].array.SI8[ii] = (int8_t)pt2function((double)(data.image[ID].array.SI8[ii]), f1, f2);
             }
         }
-        if(datatype == _DATATYPE_INT32)
+        if (datatype == _DATATYPE_INT32)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[ID].array.SI16[ii] = (int16_t) pt2function((double)(
-                                                    data.image[ID].array.SI16[ii]), f1, f2);
+                data.image[ID].array.SI16[ii] = (int16_t)pt2function((double)(data.image[ID].array.SI16[ii]), f1, f2);
             }
         }
-        if(datatype == _DATATYPE_INT32)
+        if (datatype == _DATATYPE_INT32)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[ID].array.SI32[ii] = (int32_t) pt2function((double)(
-                                                    data.image[ID].array.SI32[ii]), f1, f2);
+                data.image[ID].array.SI32[ii] = (int32_t)pt2function((double)(data.image[ID].array.SI32[ii]), f1, f2);
             }
         }
-        if(datatype == _DATATYPE_INT32)
+        if (datatype == _DATATYPE_INT32)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[ID].array.SI64[ii] = (int64_t) pt2function((double)(
-                                                    data.image[ID].array.SI64[ii]), f1, f2);
+                data.image[ID].array.SI64[ii] = (int64_t)pt2function((double)(data.image[ID].array.SI64[ii]), f1, f2);
             }
         }
 
-
-        if(datatype == _DATATYPE_FLOAT)
+        if (datatype == _DATATYPE_FLOAT)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[ID].array.F[ii] = pt2function((double)(data.image[ID].array.F[ii]),
-                                             f1, f2);
+                data.image[ID].array.F[ii] = pt2function((double)(data.image[ID].array.F[ii]), f1, f2);
             }
         }
 
-        if(datatype == _DATATYPE_DOUBLE)
+        if (datatype == _DATATYPE_DOUBLE)
         {
-# ifdef _OPENMP
-            #pragma omp for
-# endif
-            for(ii = 0; ii < nelement; ii++)
+#ifdef _OPENMP
+#pragma omp for
+#endif
+            for (ii = 0; ii < nelement; ii++)
             {
-                data.image[ID].array.D[ii] = pt2function((double)(data.image[ID].array.D[ii]),
-                                             f1, f2);
+                data.image[ID].array.D[ii] = pt2function((double)(data.image[ID].array.D[ii]), f1, f2);
             }
         }
-# ifdef _OPENMP
+#ifdef _OPENMP
     }
-# endif
+#endif
 
-    return(0);
+    return (0);
 }
-
-
-
-
-
-
diff --git a/src/COREMOD_arith/imfunctions.h b/src/COREMOD_arith/imfunctions.h
index f1585641..5ae666da 100644
--- a/src/COREMOD_arith/imfunctions.h
+++ b/src/COREMOD_arith/imfunctions.h
@@ -4,122 +4,52 @@
  *
  */
 
+/* Functions for bison / flex    */
 
+errno_t arith_image_function_im_im__d_d(const char *ID_name, const char *ID_out, double (*pt2function)(double));
 
-/* Functions for bison / flex    */ 
+errno_t arith_image_function_imd_im__dd_d(const char *ID_name, double v0, const char *ID_out,
+                                          double (*pt2function)(double, double));
 
-errno_t arith_image_function_im_im__d_d(
-    const char *ID_name,
-    const char *ID_out,
-    double (*pt2function)(double)
-);
-
-
-errno_t arith_image_function_imd_im__dd_d(
-    const char *ID_name,
-    double      v0,
-    const char *ID_out,
-    double (*pt2function)(double, double)
-);
-
-
-errno_t arith_image_function_imdd_im__ddd_d(
-    const char *ID_name,
-    double      v0,
-    double      v1,
-    const char *ID_out,
-    double (*pt2function)(double, double, double)
-);
-
-
-
-
-
-
-errno_t arith_image_function_1_1_byID(
-    imageID ID,
-    imageID IDout,
-    double (*pt2function)(double)
-);
-
-
-errno_t arith_image_function_1_1(
-    const char *ID_name,
-    const char *ID_out,
-    double (*pt2function)(double)
-);
+errno_t arith_image_function_imdd_im__ddd_d(const char *ID_name, double v0, double v1, const char *ID_out,
+                                            double (*pt2function)(double, double, double));
 
+errno_t arith_image_function_1_1_byID(imageID ID, imageID IDout, double (*pt2function)(double));
 
+errno_t arith_image_function_1_1(const char *ID_name, const char *ID_out, double (*pt2function)(double));
 
 // imagein -> imagein (in place)
-errno_t arith_image_function_1_1_inplace_byID(
-    imageID ID,
-    double (*pt2function)(double)
-);
-
+errno_t arith_image_function_1_1_inplace_byID(imageID ID, double (*pt2function)(double));
 
 // imagein -> imagein (in place)
-errno_t arith_image_function_1_1_inplace(
-    const char *ID_name,
-    double (*pt2function)(double)
-);
-
-
-
-errno_t arith_image_function_2_1(
-    const char *ID_name1,
-    const char *ID_name2,
-    const char *ID_out,
-    double (*pt2function)(double, double)
-);
-
-errno_t arith_image_function_2_1_inplace_byID(
-    imageID ID1,
-    imageID ID2,
-    double (*pt2function)(double, double)
-);
-
-errno_t arith_image_function_2_1_inplace(
-    const char *ID_name1,
-    const char *ID_name2,
-    double (*pt2function)(double, double)
-);
-
-
-errno_t arith_image_function_CF_CF__CF(
-    const char *ID_name1,
-    const char *ID_name2,
-    const char *ID_out,
-    complex_float(*pt2function)(complex_float, complex_float)
-);
-
-
-errno_t arith_image_function_CD_CD__CD(
-    const char *ID_name1,
-    const char *ID_name2,
-    const char *ID_out,
-    complex_double(*pt2function)(complex_double, complex_double)
-);
+errno_t arith_image_function_1_1_inplace(const char *ID_name, double (*pt2function)(double));
 
+errno_t arith_image_function_2_1(const char *ID_name1, const char *ID_name2, const char *ID_out,
+                                 double (*pt2function)(double, double));
 
+errno_t arith_image_function_2_1_inplace_byID(imageID ID1, imageID ID2, double (*pt2function)(double, double));
 
+errno_t arith_image_function_2_1_inplace(const char *ID_name1, const char *ID_name2,
+                                         double (*pt2function)(double, double));
 
-int arith_image_function_1f_1(const char *ID_name, double f1,
-                              const char *ID_out, double (*pt2function)(double, double));
+errno_t arith_image_function_CF_CF__CF(const char *ID_name1, const char *ID_name2, const char *ID_out,
+                                       complex_float (*pt2function)(complex_float, complex_float));
 
-int arith_image_function_1f_1_inplace_byID(long ID, double f1,
-        double (*pt2function)(double, double));
+errno_t arith_image_function_CD_CD__CD(const char *ID_name1, const char *ID_name2, const char *ID_out,
+                                       complex_double (*pt2function)(complex_double, complex_double));
 
-int arith_image_function_1f_1_inplace(const char *ID_name, double f1,
-                                      double (*pt2function)(double, double));
+int arith_image_function_1f_1(const char *ID_name, double f1, const char *ID_out,
+                              double (*pt2function)(double, double));
 
+int arith_image_function_1f_1_inplace_byID(long ID, double f1, double (*pt2function)(double, double));
 
+int arith_image_function_1f_1_inplace(const char *ID_name, double f1, double (*pt2function)(double, double));
 
-int arith_image_function_1ff_1(const char *ID_name, double f1, double f2,
-                               const char *ID_out, double (*pt2function)(double, double, double));
+int arith_image_function_1ff_1(const char *ID_name, double f1, double f2, const char *ID_out,
+                               double (*pt2function)(double, double, double));
 
-int arith_image_function_1ff_1_inplace(const char *ID_name, double f1,
-                                       double f2, double (*pt2function)(double, double, double));
+int arith_image_function_1ff_1_inplace(const char *ID_name, double f1, double f2,
+                                       double (*pt2function)(double, double, double));
 
 int arith_image_function_1ff_1_inplace_byID(long ID, double f1, double f2,
-        double (*pt2function)(double, double, double));
+                                            double (*pt2function)(double, double, double));
diff --git a/src/COREMOD_arith/mathfuncs.c b/src/COREMOD_arith/mathfuncs.c
index cb93bd89..3bd8a331 100644
--- a/src/COREMOD_arith/mathfuncs.c
+++ b/src/COREMOD_arith/mathfuncs.c
@@ -5,231 +5,131 @@
  *
  */
 
-
+#include "CommandLineInterface/CLIcore.h" // complex types
 #include <math.h>
-#include "CommandLineInterface/CLIcore.h"  // complex types
 
-double Pacos(double a)
-{
-    return((double) acos(a));
-}
-double Pasin(double a)
-{
-    return((double) asin(a));
-}
-double Patan(double a)
-{
-    return((double) atan(a));
-}
-double Pceil(double a)
-{
-    return((double) ceil(a));
-}
-double Pcos(double a)
-{
-    return((double) cos(a));
-}
-double Pcosh(double a)
-{
-    return((double) cosh(a));
-}
-double Pexp(double a)
-{
-    return((double) exp(a));
-}
-double Pfabs(double a)
-{
-    return((double) fabs(a));
-}
-double Pfloor(double a)
-{
-    return((double) floor(a));
-}
-double Pln(double a)
-{
-    return((double) log(a));
-}
-double Plog(double a)
-{
-    return((double) log10(a));
-}
-double Psqrt(double a)
-{
-    return((double) sqrt(a));
-}
-double Psin(double a)
-{
-    return((double) sin(a));
-}
-double Psinh(double a)
-{
-    return((double) sinh(a));
-}
-double Ptan(double a)
-{
-    return((double) tan(a));
-}
-double Ptanh(double a)
-{
-    return((double) tanh(a));
-}
+double Pacos(double a) { return ((double)acos(a)); }
+double Pasin(double a) { return ((double)asin(a)); }
+double Patan(double a) { return ((double)atan(a)); }
+double Pceil(double a) { return ((double)ceil(a)); }
+double Pcos(double a) { return ((double)cos(a)); }
+double Pcosh(double a) { return ((double)cosh(a)); }
+double Pexp(double a) { return ((double)exp(a)); }
+double Pfabs(double a) { return ((double)fabs(a)); }
+double Pfloor(double a) { return ((double)floor(a)); }
+double Pln(double a) { return ((double)log(a)); }
+double Plog(double a) { return ((double)log10(a)); }
+double Psqrt(double a) { return ((double)sqrt(a)); }
+double Psin(double a) { return ((double)sin(a)); }
+double Psinh(double a) { return ((double)sinh(a)); }
+double Ptan(double a) { return ((double)tan(a)); }
+double Ptanh(double a) { return ((double)tanh(a)); }
 
 double Ppositive(double a)
 {
     double value = 0.0;
-    if(a > 0.0)
+    if (a > 0.0)
     {
-        value = (double) 1.0;
+        value = (double)1.0;
     }
-    return(value);
-}
-
-
-
-
-
-
-
-
-
-
-double Pfmod(double a, double b)
-{
-    return((double) fmod(a, b));
+    return (value);
 }
 
+double Pfmod(double a, double b) { return ((double)fmod(a, b)); }
 
 double Ppow(double a, double b)
 {
-    if(b > 0)
+    if (b > 0)
     {
-        return((double) pow(a, b));
+        return ((double)pow(a, b));
     }
     else
     {
-        return((double) pow(a, -b));
+        return ((double)pow(a, -b));
     }
 }
 
+double Padd(double a, double b) { return ((double)a + b); }
 
-double Padd(double a, double b)
-{
-    return((double) a + b);
-}
-
-
-double Psubm(double a, double b)
-{
-    return((double) b - a);
-}
-
-
-double Psub(double a, double b)
-{
-    return((double) a - b);
-}
-
-
-double Pmult(double a, double b)
-{
-    return((double) a * b);
-}
+double Psubm(double a, double b) { return ((double)b - a); }
 
+double Psub(double a, double b) { return ((double)a - b); }
 
-double Pdiv(double a, double b)
-{
-    return((double) a / b);
-}
-
+double Pmult(double a, double b) { return ((double)a * b); }
 
-double Pdiv1(double a, double b)
-{
-    return((double) b / a);
-}
+double Pdiv(double a, double b) { return ((double)a / b); }
 
+double Pdiv1(double a, double b) { return ((double)b / a); }
 
 double Pminv(double a, double b)
 {
-    if(a < b)
+    if (a < b)
     {
-        return(a);
+        return (a);
     }
     else
     {
-        return(b);
+        return (b);
     }
 }
 
-
 double Pmaxv(double a, double b)
 {
-    if(a > b)
+    if (a > b)
     {
-        return(a);
+        return (a);
     }
     else
     {
-        return(b);
+        return (b);
     }
 }
 
-
 double Ptestlt(double a, double b)
 {
-    if(a < b)
+    if (a < b)
     {
-        return((double) 1.0);
+        return ((double)1.0);
     }
     else
     {
-        return((double) 0.0);
+        return ((double)0.0);
     }
 }
 
-
 double Ptestmt(double a, double b)
 {
-    if(a < b)
+    if (a < b)
     {
-        return((double) 0.0);
+        return ((double)0.0);
     }
     else
     {
-        return((double) 1.0);
+        return ((double)1.0);
     }
 }
 
-
-
-
-
-
-
 double Ptrunc(double a, double b, double c)
 {
     double value;
     value = a;
-    if(a < b)
+    if (a < b)
     {
         value = b;
     };
-    if(a > c)
+    if (a > c)
     {
         value = c;
     };
-    return(value);
+    return (value);
 }
 
-
-
-
-
 complex_double CPadd_CD_CD(complex_double a, complex_double b)
 {
     complex_double v;
     v.re = a.re + b.re;
     v.im = a.im + b.im;
-    return(v);
+    return (v);
 }
 
 complex_double CPsub_CD_CD(complex_double a, complex_double b)
@@ -237,7 +137,7 @@ complex_double CPsub_CD_CD(complex_double a, complex_double b)
     complex_double v;
     v.re = a.re - b.re;
     v.im = a.im - b.im;
-    return(v);
+    return (v);
 }
 
 complex_double CPmult_CD_CD(complex_double a, complex_double b)
@@ -245,10 +145,9 @@ complex_double CPmult_CD_CD(complex_double a, complex_double b)
     complex_double v;
     v.re = a.re * b.re - a.im * b.im;
     v.im = a.re * b.im + a.im * b.re;
-    return(v);
+    return (v);
 }
 
-
 complex_double CPdiv_CD_CD(complex_double a, complex_double b)
 {
     complex_double v;
@@ -268,7 +167,7 @@ complex_double CPdiv_CD_CD(complex_double a, complex_double b)
     v.re = (double)(amp * cos(pha));
     v.im = (double)(amp * sin(pha));
 
-    return(v);
+    return (v);
 }
 
 complex_float CPadd_CF_CF(complex_float a, complex_float b)
@@ -276,7 +175,7 @@ complex_float CPadd_CF_CF(complex_float a, complex_float b)
     complex_float v;
     v.re = a.re + b.re;
     v.im = a.im + b.im;
-    return(v);
+    return (v);
 }
 
 complex_float CPsub_CF_CF(complex_float a, complex_float b)
@@ -284,7 +183,7 @@ complex_float CPsub_CF_CF(complex_float a, complex_float b)
     complex_float v;
     v.re = a.re - b.re;
     v.im = a.im - b.im;
-    return(v);
+    return (v);
 }
 
 complex_float CPmult_CF_CF(complex_float a, complex_float b)
@@ -292,7 +191,7 @@ complex_float CPmult_CF_CF(complex_float a, complex_float b)
     complex_float v;
     v.re = a.re * b.re - a.im * b.im;
     v.im = a.re * b.im + a.im * b.re;
-    return(v);
+    return (v);
 }
 
 complex_float CPdiv_CF_CF(complex_float a, complex_float b)
@@ -314,8 +213,5 @@ complex_float CPdiv_CF_CF(complex_float a, complex_float b)
     v.re = (float)(amp * cos(pha));
     v.im = (float)(amp * sin(pha));
 
-    return(v);
+    return (v);
 }
-
-
-
diff --git a/src/COREMOD_arith/mathfuncs.h b/src/COREMOD_arith/mathfuncs.h
index e3503fed..c025168c 100644
--- a/src/COREMOD_arith/mathfuncs.h
+++ b/src/COREMOD_arith/mathfuncs.h
@@ -1,11 +1,8 @@
 /**
  * @file    mathfuncs.h
- * 
+ *
  */
 
-
-
-
 double Pacos(double a);
 
 double Pasin(double a);
@@ -40,10 +37,6 @@ double Ptanh(double a);
 
 double Ppositive(double a);
 
-
-
-
-
 double Pfmod(double a, double b);
 
 double Ppow(double a, double b);
@@ -68,14 +61,8 @@ double Ptestlt(double a, double b);
 
 double Ptestmt(double a, double b);
 
-
-
-
 double Ptrunc(double a, double b, double c);
 
-
-
-
 complex_double CPadd_CD_CD(complex_double a, complex_double b);
 
 complex_double CPsub_CD_CD(complex_double a, complex_double b);
@@ -91,5 +78,3 @@ complex_float CPsub_CF_CF(complex_float a, complex_float b);
 complex_float CPmult_CF_CF(complex_float a, complex_float b);
 
 complex_float CPdiv_CF_CF(complex_float a, complex_float b);
-
-
diff --git a/src/COREMOD_arith/set_pixel.c b/src/COREMOD_arith/set_pixel.c
index e5f04037..b2d373e7 100644
--- a/src/COREMOD_arith/set_pixel.c
+++ b/src/COREMOD_arith/set_pixel.c
@@ -5,78 +5,35 @@
  *
  */
 
-
-#include "CommandLineInterface/CLIcore.h"
 #include "COREMOD_memory/COREMOD_memory.h"
-
-
-
+#include "CommandLineInterface/CLIcore.h"
 
 // ==========================================
 // Forward declaration(s)
 // ==========================================
 
-imageID arith_set_pixel(
-    const char *ID_name,
-    double      value,
-    long        x,
-    long        y
-);
-
-
-
-imageID arith_set_pixel_1Drange(
-    const char *ID_name,
-    double      value,
-    long        x,
-    long        y
-);
-
+imageID arith_set_pixel(const char *ID_name, double value, long x, long y);
 
+imageID arith_set_pixel_1Drange(const char *ID_name, double value, long x, long y);
 
-imageID arith_set_row(
-    const char *ID_name,
-    double      value,
-    long        y
-);
-
-
-
-imageID arith_set_col(
-    const char *ID_name,
-    double      value,
-    long        x
-);
-
-
-imageID arith_image_zero(
-    const char *ID_name
-);
-
+imageID arith_set_row(const char *ID_name, double value, long y);
 
+imageID arith_set_col(const char *ID_name, double value, long x);
 
+imageID arith_image_zero(const char *ID_name);
 
 // ==========================================
 // Command line interface wrapper function(s)
 // ==========================================
 
-
-
-
 static errno_t arith_set_pixel_cli()
 {
-    if(0
-            + CLI_checkarg(1, CLIARG_IMG)
-            + CLI_checkarg(2, CLIARG_FLOAT)
-            + CLI_checkarg(3, CLIARG_LONG)
-            + CLI_checkarg(4, CLIARG_LONG)
-            == 0)
-    {
-        arith_set_pixel(
-            data.cmdargtoken[1].val.string,
-            data.cmdargtoken[2].val.numf,
-            data.cmdargtoken[3].val.numl,
-            data.cmdargtoken[4].val.numl);
+    if (0 + CLI_checkarg(1, CLIARG_IMG) + CLI_checkarg(2, CLIARG_FLOAT) + CLI_checkarg(3, CLIARG_LONG) +
+            CLI_checkarg(4, CLIARG_LONG) ==
+        0)
+    {
+        arith_set_pixel(data.cmdargtoken[1].val.string, data.cmdargtoken[2].val.numf, data.cmdargtoken[3].val.numl,
+                        data.cmdargtoken[4].val.numl);
 
         return CLICMD_SUCCESS;
     }
@@ -86,21 +43,14 @@ static errno_t arith_set_pixel_cli()
     }
 }
 
-
 static errno_t arith_set_pixel_1Drange_cli()
 {
-    if(0
-            + CLI_checkarg(1, CLIARG_IMG)
-            + CLI_checkarg(2, CLIARG_FLOAT)
-            + CLI_checkarg(3, CLIARG_LONG)
-            + CLI_checkarg(4, CLIARG_LONG)
-            == 0)
-    {
-        arith_set_pixel_1Drange(
-            data.cmdargtoken[1].val.string,
-            data.cmdargtoken[2].val.numf,
-            data.cmdargtoken[3].val.numl,
-            data.cmdargtoken[4].val.numl);
+    if (0 + CLI_checkarg(1, CLIARG_IMG) + CLI_checkarg(2, CLIARG_FLOAT) + CLI_checkarg(3, CLIARG_LONG) +
+            CLI_checkarg(4, CLIARG_LONG) ==
+        0)
+    {
+        arith_set_pixel_1Drange(data.cmdargtoken[1].val.string, data.cmdargtoken[2].val.numf,
+                                data.cmdargtoken[3].val.numl, data.cmdargtoken[4].val.numl);
 
         return CLICMD_SUCCESS;
     }
@@ -110,19 +60,11 @@ static errno_t arith_set_pixel_1Drange_cli()
     }
 }
 
-
 static errno_t arith_set_row_cli()
 {
-    if(0
-            + CLI_checkarg(1, CLIARG_IMG)
-            + CLI_checkarg(2, CLIARG_FLOAT)
-            + CLI_checkarg(3, CLIARG_LONG)
-            == 0)
+    if (0 + CLI_checkarg(1, CLIARG_IMG) + CLI_checkarg(2, CLIARG_FLOAT) + CLI_checkarg(3, CLIARG_LONG) == 0)
     {
-        arith_set_row(
-            data.cmdargtoken[1].val.string,
-            data.cmdargtoken[2].val.numf,
-            data.cmdargtoken[3].val.numl);
+        arith_set_row(data.cmdargtoken[1].val.string, data.cmdargtoken[2].val.numf, data.cmdargtoken[3].val.numl);
 
         return CLICMD_SUCCESS;
     }
@@ -132,19 +74,11 @@ static errno_t arith_set_row_cli()
     }
 }
 
-
 static errno_t arith_set_col_cli()
 {
-    if(0
-            + CLI_checkarg(1, CLIARG_IMG)
-            + CLI_checkarg(2, CLIARG_FLOAT)
-            + CLI_checkarg(3, CLIARG_LONG)
-            == 0)
+    if (0 + CLI_checkarg(1, CLIARG_IMG) + CLI_checkarg(2, CLIARG_FLOAT) + CLI_checkarg(3, CLIARG_LONG) == 0)
     {
-        arith_set_col(
-            data.cmdargtoken[1].val.string,
-            data.cmdargtoken[2].val.numf,
-            data.cmdargtoken[3].val.numl);
+        arith_set_col(data.cmdargtoken[1].val.string, data.cmdargtoken[2].val.numf, data.cmdargtoken[3].val.numl);
 
         return CLICMD_SUCCESS;
     }
@@ -154,12 +88,9 @@ static errno_t arith_set_col_cli()
     }
 }
 
-
 static errno_t arith_image_zero_cli()
 {
-    if(0
-            + CLI_checkarg(1, CLIARG_IMG)
-            == 0)
+    if (0 + CLI_checkarg(1, CLIARG_IMG) == 0)
     {
         arith_image_zero(data.cmdargtoken[1].val.string);
 
@@ -171,9 +102,6 @@ static errno_t arith_image_zero_cli()
     }
 }
 
-
-
-
 // ==========================================
 // Register CLI command(s)
 // ==========================================
@@ -181,98 +109,31 @@ static errno_t arith_image_zero_cli()
 errno_t set_pixel_addCLIcmd()
 {
 
-    RegisterCLIcommand(
-        "setpix",
-        __FILE__,
-        arith_set_pixel_cli,
-        "set pixel value",
-        "<input image> <value> <x> <y>",
-        "setpix im 1.24 100 100",
-        "int arith_set_pixel(const char *ID_name, double value, long x, long y)");
-
-
-    RegisterCLIcommand(
-        "setpix1Drange",
-        __FILE__,
-        arith_set_pixel_1Drange_cli,
-        "set pixel value for 1D area",
-        "<input image> <value> <first pix> <last pix>",
-        "setpix im 1.24 10 200",
-        "int arith_set_pixel_1Drange(const char *ID_name, double value, long x, long y)");
-
-
-    RegisterCLIcommand(
-        "setrow",
-        __FILE__,
-        arith_set_row_cli,
-        "set pixel row value",
-        "<input image> <value> <row>",
-        "setrow im 1.24 100",
-        "int arith_set_row(const char *ID_name, double value, long y)");
-
-
-    RegisterCLIcommand(
-        "setcol",
-        __FILE__,
-        arith_set_col_cli,
-        "set pixel column value",
-        "<input image> <value> <col>",
-        "setcol im 1.24 100",
-        "int arith_set_col(const char *ID_name, double value, long x)");
-
-
-    RegisterCLIcommand(
-        "imzero",
-        __FILE__,
-        arith_image_zero_cli,
-        "set pixels to zero",
-        "<input image>",
-        "imzero im",
-        "int arith_image_zero(const char *ID_name)");
-
-
-    return RETURN_SUCCESS;
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+    RegisterCLIcommand("setpix", __FILE__, arith_set_pixel_cli, "set pixel value", "<input image> <value> <x> <y>",
+                       "setpix im 1.24 100 100",
+                       "int arith_set_pixel(const char *ID_name, double value, long x, long y)");
 
+    RegisterCLIcommand("setpix1Drange", __FILE__, arith_set_pixel_1Drange_cli, "set pixel value for 1D area",
+                       "<input image> <value> <first pix> <last pix>", "setpix im 1.24 10 200",
+                       "int arith_set_pixel_1Drange(const char *ID_name, double value, long x, long y)");
 
+    RegisterCLIcommand("setrow", __FILE__, arith_set_row_cli, "set pixel row value", "<input image> <value> <row>",
+                       "setrow im 1.24 100", "int arith_set_row(const char *ID_name, double value, long y)");
 
+    RegisterCLIcommand("setcol", __FILE__, arith_set_col_cli, "set pixel column value", "<input image> <value> <col>",
+                       "setcol im 1.24 100", "int arith_set_col(const char *ID_name, double value, long x)");
 
+    RegisterCLIcommand("imzero", __FILE__, arith_image_zero_cli, "set pixels to zero", "<input image>", "imzero im",
+                       "int arith_image_zero(const char *ID_name)");
 
+    return RETURN_SUCCESS;
+}
 
-imageID arith_set_pixel(
-    const char *ID_name,
-    double      value,
-    long        x,
-    long        y
-)
+imageID arith_set_pixel(const char *ID_name, double value, long x, long y)
 {
-    imageID  ID;
+    imageID ID;
     uint32_t naxes[2];
-    uint8_t  datatype;
+    uint8_t datatype;
 
     ID = image_ID(ID_name);
     datatype = data.image[ID].md[0].datatype;
@@ -282,46 +143,46 @@ imageID arith_set_pixel(
     //  printf("Setting pixel %ld %ld of image %s [%ld] to %f\n", x, y, ID_name, ID, (float) value);
 
     data.image[ID].md[0].write = 1;
-    if(datatype == _DATATYPE_FLOAT)
+    if (datatype == _DATATYPE_FLOAT)
     {
-        data.image[ID].array.F[y * naxes[0] + x] = (float) value;
+        data.image[ID].array.F[y * naxes[0] + x] = (float)value;
         //    printf("float -> %f\n", data.image[ID].array.F[y*naxes[0]+x]);
     }
-    else if(datatype == _DATATYPE_DOUBLE)
+    else if (datatype == _DATATYPE_DOUBLE)
     {
         data.image[ID].array.D[y * naxes[0] + x] = value;
     }
-    else if(datatype == _DATATYPE_UINT8)
+    else if (datatype == _DATATYPE_UINT8)
     {
-        data.image[ID].array.UI8[y * naxes[0] + x] = (uint8_t) value;
+        data.image[ID].array.UI8[y * naxes[0] + x] = (uint8_t)value;
     }
-    else if(datatype == _DATATYPE_UINT16)
+    else if (datatype == _DATATYPE_UINT16)
     {
-        data.image[ID].array.UI16[y * naxes[0] + x] = (uint16_t) value;
+        data.image[ID].array.UI16[y * naxes[0] + x] = (uint16_t)value;
     }
-    else if(datatype == _DATATYPE_UINT32)
+    else if (datatype == _DATATYPE_UINT32)
     {
-        data.image[ID].array.UI32[y * naxes[0] + x] = (uint32_t) value;
+        data.image[ID].array.UI32[y * naxes[0] + x] = (uint32_t)value;
     }
-    else if(datatype == _DATATYPE_UINT64)
+    else if (datatype == _DATATYPE_UINT64)
     {
-        data.image[ID].array.UI64[y * naxes[0] + x] = (uint64_t) value;
+        data.image[ID].array.UI64[y * naxes[0] + x] = (uint64_t)value;
     }
-    else if(datatype == _DATATYPE_INT8)
+    else if (datatype == _DATATYPE_INT8)
     {
-        data.image[ID].array.SI8[y * naxes[0] + x] = (int8_t) value;
+        data.image[ID].array.SI8[y * naxes[0] + x] = (int8_t)value;
     }
-    else if(datatype == _DATATYPE_INT16)
+    else if (datatype == _DATATYPE_INT16)
     {
-        data.image[ID].array.SI16[y * naxes[0] + x] = (int16_t) value;
+        data.image[ID].array.SI16[y * naxes[0] + x] = (int16_t)value;
     }
-    else if(datatype == _DATATYPE_INT32)
+    else if (datatype == _DATATYPE_INT32)
     {
-        data.image[ID].array.SI32[y * naxes[0] + x] = (int32_t) value;
+        data.image[ID].array.SI32[y * naxes[0] + x] = (int32_t)value;
     }
-    else if(datatype == _DATATYPE_INT64)
+    else if (datatype == _DATATYPE_INT64)
     {
-        data.image[ID].array.SI64[y * naxes[0] + x] = (int64_t) value;
+        data.image[ID].array.SI64[y * naxes[0] + x] = (int64_t)value;
     }
     else
     {
@@ -335,21 +196,13 @@ imageID arith_set_pixel(
     return ID;
 }
 
-
-
-imageID arith_set_pixel_1Drange(
-    const char *ID_name,
-    double      value,
-    long        x,
-    long        y
-)
+imageID arith_set_pixel_1Drange(const char *ID_name, double value, long x, long y)
 {
     imageID ID;
     uint32_t naxes[2];
     uint8_t datatype;
     long ii, iistart, iiend;
 
-
     ID = image_ID(ID_name);
     datatype = data.image[ID].md[0].datatype;
     naxes[0] = data.image[ID].md[0].size[0];
@@ -357,20 +210,20 @@ imageID arith_set_pixel_1Drange(
     iistart = x;
     iiend = y + 1;
 
-    if(iistart < 0)
+    if (iistart < 0)
     {
         iistart = 0;
     }
-    if(iistart >= naxes[0]*naxes[1])
+    if (iistart >= naxes[0] * naxes[1])
     {
         iistart = naxes[0] * naxes[1];
     }
 
-    if(iiend < 0)
+    if (iiend < 0)
     {
         iiend = 0;
     }
-    if(iiend >= naxes[0]*naxes[1])
+    if (iiend >= naxes[0] * naxes[1])
     {
         iiend = naxes[0] * naxes[1];
     }
@@ -380,16 +233,16 @@ imageID arith_set_pixel_1Drange(
     fflush(stdout);
 
     data.image[ID].md[0].write = 1;
-    if(datatype == _DATATYPE_FLOAT)
+    if (datatype == _DATATYPE_FLOAT)
     {
-        for(ii = iistart; ii < iiend; ii++)
+        for (ii = iistart; ii < iiend; ii++)
         {
-            data.image[ID].array.F[ii] = (float) value;
+            data.image[ID].array.F[ii] = (float)value;
         }
     }
-    else if(datatype == _DATATYPE_DOUBLE)
+    else if (datatype == _DATATYPE_DOUBLE)
     {
-        for(ii = iistart; ii < iiend; ii++)
+        for (ii = iistart; ii < iiend; ii++)
         {
             data.image[ID].array.D[ii] = value;
         }
@@ -406,19 +259,12 @@ imageID arith_set_pixel_1Drange(
     return ID;
 }
 
-
-
-
-imageID arith_set_row(
-    const char *ID_name,
-    double      value,
-    long        y
-)
+imageID arith_set_row(const char *ID_name, double value, long y)
 {
-    imageID   ID;
-    uint32_t  naxes[2];
-    long      ii;
-    uint8_t   datatype;
+    imageID ID;
+    uint32_t naxes[2];
+    long ii;
+    uint8_t datatype;
 
     ID = image_ID(ID_name);
     datatype = data.image[ID].md[0].datatype;
@@ -426,16 +272,16 @@ imageID arith_set_row(
     naxes[1] = data.image[ID].md[0].size[1];
 
     data.image[ID].md[0].write = 1;
-    if(datatype == _DATATYPE_FLOAT)
+    if (datatype == _DATATYPE_FLOAT)
     {
-        for(ii = 0; ii < naxes[0]; ii++)
+        for (ii = 0; ii < naxes[0]; ii++)
         {
             data.image[ID].array.F[y * naxes[0] + ii] = value;
         }
     }
-    else if(datatype == _DATATYPE_DOUBLE)
+    else if (datatype == _DATATYPE_DOUBLE)
     {
-        for(ii = 0; ii < naxes[0]; ii++)
+        for (ii = 0; ii < naxes[0]; ii++)
         {
             data.image[ID].array.D[y * naxes[0] + ii] = value;
         }
@@ -453,37 +299,29 @@ imageID arith_set_row(
     return ID;
 }
 
-
-
-
-imageID arith_set_col(
-    const char *ID_name,
-    double      value,
-    long        x
-)
+imageID arith_set_col(const char *ID_name, double value, long x)
 {
-    imageID  ID;
+    imageID ID;
     uint32_t naxes[2];
-    long     y;
-    uint8_t  datatype;
+    long y;
+    uint8_t datatype;
 
     ID = image_ID(ID_name);
     naxes[0] = data.image[ID].md[0].size[0];
     naxes[1] = data.image[ID].md[0].size[1];
     datatype = data.image[ID].md[0].datatype;
 
-
     data.image[ID].md[0].write = 1;
-    if(datatype == _DATATYPE_FLOAT)
+    if (datatype == _DATATYPE_FLOAT)
     {
-        for(y = 0; y < naxes[1]; y++)
+        for (y = 0; y < naxes[1]; y++)
         {
             data.image[ID].array.F[y * naxes[0] + x] = value;
         }
     }
-    else if(datatype == _DATATYPE_DOUBLE)
+    else if (datatype == _DATATYPE_DOUBLE)
     {
-        for(y = 0; y < naxes[1]; y++)
+        for (y = 0; y < naxes[1]; y++)
         {
             data.image[ID].array.D[y * naxes[0] + x] = value;
         }
@@ -498,80 +336,73 @@ imageID arith_set_col(
     data.image[ID].md[0].cnt0++;
     COREMOD_MEMORY_image_set_sempost(ID_name, -1);
 
-
     return ID;
 }
 
-
-
-
-imageID arith_image_zero(
-    const char *ID_name
-)
+imageID arith_image_zero(const char *ID_name)
 {
     imageID ID;
     long nelem;
 
     ID = image_ID(ID_name);
 
-    if(ID != -1)
+    if (ID != -1)
     {
         nelem = data.image[ID].md[0].nelement;
 
         data.image[ID].md[0].write = 0;
 
-        if(data.image[ID].md[0].datatype == _DATATYPE_FLOAT)
+        if (data.image[ID].md[0].datatype == _DATATYPE_FLOAT)
         {
             memset(data.image[ID].array.F, 0, SIZEOF_DATATYPE_FLOAT * nelem);
         }
-        else if(data.image[ID].md[0].datatype == _DATATYPE_DOUBLE)
+        else if (data.image[ID].md[0].datatype == _DATATYPE_DOUBLE)
         {
             memset(data.image[ID].array.D, 0, SIZEOF_DATATYPE_DOUBLE * nelem);
         }
-        else if(data.image[ID].md[0].datatype == _DATATYPE_INT8)
+        else if (data.image[ID].md[0].datatype == _DATATYPE_INT8)
         {
             memset(data.image[ID].array.SI8, 0, SIZEOF_DATATYPE_INT8 * nelem);
         }
-        else if(data.image[ID].md[0].datatype == _DATATYPE_INT16)
+        else if (data.image[ID].md[0].datatype == _DATATYPE_INT16)
         {
             memset(data.image[ID].array.SI16, 0, SIZEOF_DATATYPE_INT16 * nelem);
         }
-        else if(data.image[ID].md[0].datatype == _DATATYPE_INT32)
+        else if (data.image[ID].md[0].datatype == _DATATYPE_INT32)
         {
             memset(data.image[ID].array.SI32, 0, SIZEOF_DATATYPE_INT32 * nelem);
         }
-        else if(data.image[ID].md[0].datatype == _DATATYPE_INT64)
+        else if (data.image[ID].md[0].datatype == _DATATYPE_INT64)
         {
             memset(data.image[ID].array.SI64, 0, SIZEOF_DATATYPE_INT64 * nelem);
         }
-        else if(data.image[ID].md[0].datatype == _DATATYPE_UINT8)
+        else if (data.image[ID].md[0].datatype == _DATATYPE_UINT8)
         {
             memset(data.image[ID].array.UI8, 0, SIZEOF_DATATYPE_UINT8 * nelem);
         }
-        else if(data.image[ID].md[0].datatype == _DATATYPE_UINT16)
+        else if (data.image[ID].md[0].datatype == _DATATYPE_UINT16)
         {
             memset(data.image[ID].array.UI16, 0, SIZEOF_DATATYPE_UINT16 * nelem);
         }
-        else if(data.image[ID].md[0].datatype == _DATATYPE_UINT32)
+        else if (data.image[ID].md[0].datatype == _DATATYPE_UINT32)
         {
             memset(data.image[ID].array.UI32, 0, SIZEOF_DATATYPE_UINT32 * nelem);
         }
-        else if(data.image[ID].md[0].datatype == _DATATYPE_UINT64)
+        else if (data.image[ID].md[0].datatype == _DATATYPE_UINT64)
         {
             memset(data.image[ID].array.UI64, 0, SIZEOF_DATATYPE_UINT64 * nelem);
         }
-        else if(data.image[ID].md[0].datatype == _DATATYPE_COMPLEX_FLOAT)
+        else if (data.image[ID].md[0].datatype == _DATATYPE_COMPLEX_FLOAT)
         {
             memset(data.image[ID].array.CF, 0, SIZEOF_DATATYPE_COMPLEX_FLOAT * nelem);
         }
-        else if(data.image[ID].md[0].datatype == _DATATYPE_COMPLEX_DOUBLE)
+        else if (data.image[ID].md[0].datatype == _DATATYPE_COMPLEX_DOUBLE)
         {
             memset(data.image[ID].array.CD, 0, SIZEOF_DATATYPE_COMPLEX_DOUBLE * nelem);
         }
         else
         {
-            PRINT_ERROR("cannot detect image type for image %s",
-                         ID_name);
+            PRINT_ERROR("cannot detect image type for image %s", ID_name);
             exit(0);
         }
         data.image[ID].md[0].write = 0;
@@ -579,6 +410,5 @@ imageID arith_image_zero(
         COREMOD_MEMORY_image_set_sempost(ID_name, -1);
     }
 
-    return(ID);
+    return (ID);
 }
-
diff --git a/src/COREMOD_arith/set_pixel.h b/src/COREMOD_arith/set_pixel.h
index 8b3a55fd..c8e766db 100644
--- a/src/COREMOD_arith/set_pixel.h
+++ b/src/COREMOD_arith/set_pixel.h
@@ -3,45 +3,14 @@
  *
  */
 
-
-
 errno_t set_pixel_addCLIcmd();
 
+imageID arith_set_pixel(const char *ID_name, double value, long x, long y);
 
-imageID arith_set_pixel(
-    const char *ID_name,
-    double      value,
-    long        x,
-    long        y
-);
-
-
-
-imageID arith_set_pixel_1Drange(
-    const char *ID_name,
-    double      value,
-    long        x,
-    long        y
-);
-
-
-
-imageID arith_set_row(
-    const char *ID_name,
-    double      value,
-    long        y
-);
-
-
-
-imageID arith_set_col(
-    const char *ID_name,
-    double      value,
-    long        x
-);
+imageID arith_set_pixel_1Drange(const char *ID_name, double value, long x, long y);
 
+imageID arith_set_row(const char *ID_name, double value, long y);
 
+imageID arith_set_col(const char *ID_name, double value, long x);
 
-imageID arith_image_zero(
-    const char *ID_name
-);
+imageID arith_image_zero(const char *ID_name);
diff --git a/src/COREMOD_iofits/COREMOD_iofits.c b/src/COREMOD_iofits/COREMOD_iofits.c
index 4709b6da..4ae48f66 100644
--- a/src/COREMOD_iofits/COREMOD_iofits.c
+++ b/src/COREMOD_iofits/COREMOD_iofits.c
@@ -6,10 +6,10 @@
  */
 
 #define MODULE_SHORTNAME_DEFAULT ""
-#define MODULE_DESCRIPTION       "Read/Write FITS files"
+#define MODULE_DESCRIPTION "Read/Write FITS files"
 
-#include "CommandLineInterface/CLIcore.h"
 #include "COREMOD_iofits_common.h"
+#include "CommandLineInterface/CLIcore.h"
 
 #include "breakcube.h"
 #include "images2cube.h"
@@ -19,20 +19,17 @@
 
 COREMOD_IOFITS_DATA COREMOD_iofits_data;
 
-
 INIT_MODULE_LIB(COREMOD_iofits)
 
-
 static errno_t init_module_CLI()
 {
-	COREMOD_iofits_data.FITSIO_status = 0;
-
-	CLIADDCMD_COREMOD_iofits__loadfits();
-	CLIADDCMD_COREMOD_iofits__saveFITS();
+    COREMOD_iofits_data.FITSIO_status = 0;
 
-	breakcube_addCLIcmd();
-	images2cube_addCLIcmd();
+    CLIADDCMD_COREMOD_iofits__loadfits();
+    CLIADDCMD_COREMOD_iofits__saveFITS();
 
+    breakcube_addCLIcmd();
+    images2cube_addCLIcmd();
 
     // add atexit functions here
 
diff --git a/src/COREMOD_iofits/COREMOD_iofits.h b/src/COREMOD_iofits/COREMOD_iofits.h
index 2d7f30cb..749f0eb7 100644
--- a/src/COREMOD_iofits/COREMOD_iofits.h
+++ b/src/COREMOD_iofits/COREMOD_iofits.h
@@ -3,9 +3,9 @@
 
 #include "COREMOD_iofits/COREMOD_iofits_common.h"
 
+#include "COREMOD_iofits/breakcube.h"
 #include "COREMOD_iofits/check_fitsio_status.h"
 #include "COREMOD_iofits/data_type_code.h"
-#include "COREMOD_iofits/breakcube.h"
 #include "COREMOD_iofits/file_exists.h"
 #include "COREMOD_iofits/images2cube.h"
 #include "COREMOD_iofits/is_fits_file.h"
diff --git a/src/COREMOD_iofits/COREMOD_iofits_common.h b/src/COREMOD_iofits/COREMOD_iofits_common.h
index b65d968c..e8d6374c 100644
--- a/src/COREMOD_iofits/COREMOD_iofits_common.h
+++ b/src/COREMOD_iofits/COREMOD_iofits_common.h
@@ -1,7 +1,6 @@
 #ifndef _IOFITS_COMMON_H
 #define _IOFITS_COMMON_H
 
-
 #include <fitsio.h>
 
 typedef struct
@@ -9,12 +8,11 @@ typedef struct
     int FITSIO_status;
 } COREMOD_IOFITS_DATA;
 
+#define STRINGMAXLEN_FITSKEYWORDNAME 8
+#define STRINGMAXLEN_FITSKEYWORDVALUE 68
+#define STRINGMAXLEN_FITSKEYWCOMMENT FLEN_COMMENT
 
-#define STRINGMAXLEN_FITSKEYWORDNAME     8
-#define STRINGMAXLEN_FITSKEYWORDVALUE   68
-#define STRINGMAXLEN_FITSKEYWCOMMENT    FLEN_COMMENT
-
-#define STRINGMAXLEN_FITSIOCHECK_ERRSTRING  100
+#define STRINGMAXLEN_FITSIOCHECK_ERRSTRING 100
 
 /**
  * @ingroup errcheckmacro
@@ -32,37 +30,38 @@ typedef struct
  *
  *
  */
-#define WRITE_FITSKEYWNAME(keywname, ...) do { \
-int slen = snprintf(keywname, STRINGMAXLEN_FITSKEYWORDNAME, __VA_ARGS__); \
-if(slen<1) {                                                    \
-    PRINT_ERROR("snprintf wrote <1 char");                      \
-    abort();                                                    \
-}                                                               \
-if(slen >= STRINGMAXLEN_FITSKEYWORDNAME) {                              \
-    PRINT_ERROR("snprintf string truncation");                  \
-    abort();                                                    \
-}                                                               \
-} while(0)
-
-
-
-#define FITSIO_CHECK_ERROR(status, errmode, ...) do { \
-if ((status != 0) && (errmode !=0)) { \
-    char errstr[STRINGMAXLEN_FITSIOCHECK_ERRSTRING]; \
-    fits_get_errstatus(status, errstr); \
-    fprintf(stderr, \
-        "%c[%d;%dmFITSIO error %d [%s, %s, %d]: %s%c[%d;m\n\a", \
-        (char) 27, 1, 31, status, __FILE__, __func__, __LINE__, errstr, (char) 27, 0); \
-    PRINT_ERROR(__VA_ARGS__); \
-    if(errmode > 2) { \
-        abort(); \
-        } \
-    } \
-    status =0; \
-} while(0)
-
+#define WRITE_FITSKEYWNAME(keywname, ...)                                                                              \
+    do                                                                                                                 \
+    {                                                                                                                  \
+        int slen = snprintf(keywname, STRINGMAXLEN_FITSKEYWORDNAME, __VA_ARGS__);                                      \
+        if (slen < 1)                                                                                                  \
+        {                                                                                                              \
+            PRINT_ERROR("snprintf wrote <1 char");                                                                     \
+            abort();                                                                                                   \
+        }                                                                                                              \
+        if (slen >= STRINGMAXLEN_FITSKEYWORDNAME)                                                                      \
+        {                                                                                                              \
+            PRINT_ERROR("snprintf string truncation");                                                                 \
+            abort();                                                                                                   \
+        }                                                                                                              \
+    } while (0)
 
+#define FITSIO_CHECK_ERROR(status, errmode, ...)                                                                       \
+    do                                                                                                                 \
+    {                                                                                                                  \
+        if ((status != 0) && (errmode != 0))                                                                           \
+        {                                                                                                              \
+            char errstr[STRINGMAXLEN_FITSIOCHECK_ERRSTRING];                                                           \
+            fits_get_errstatus(status, errstr);                                                                        \
+            fprintf(stderr, "%c[%d;%dmFITSIO error %d [%s, %s, %d]: %s%c[%d;m\n\a", (char)27, 1, 31, status, __FILE__, \
+                    __func__, __LINE__, errstr, (char)27, 0);                                                          \
+            PRINT_ERROR(__VA_ARGS__);                                                                                  \
+            if (errmode > 2)                                                                                           \
+            {                                                                                                          \
+                abort();                                                                                               \
+            }                                                                                                          \
+        }                                                                                                              \
+        status = 0;                                                                                                    \
+    } while (0)
 
 #endif
-
-
diff --git a/src/COREMOD_iofits/README.md b/src/COREMOD_iofits/README.md
index a27a5249..c16c8998 100644
--- a/src/COREMOD_iofits/README.md
+++ b/src/COREMOD_iofits/README.md
@@ -4,4 +4,3 @@
 # Module COREMOD_iofits {#page_module_COREMOD_iofits}
 
 I/O routines for FITS format
-
diff --git a/src/COREMOD_iofits/breakcube.c b/src/COREMOD_iofits/breakcube.c
index 6e138756..b262cbb1 100644
--- a/src/COREMOD_iofits/breakcube.c
+++ b/src/COREMOD_iofits/breakcube.c
@@ -2,30 +2,22 @@
  * @file    breakcube.c
  */
 
-#include "CommandLineInterface/CLIcore.h"
 #include "COREMOD_memory/COREMOD_memory.h"
-
-
+#include "CommandLineInterface/CLIcore.h"
 
 // ==========================================
 // Forward declaration(s)
 // ==========================================
 
-imageID break_cube(
-    const char *restrict ID_name
-);
+imageID break_cube(const char *restrict ID_name);
 
 // ==========================================
 // Command line interface wrapper function(s)
 // ==========================================
 
-
-
 errno_t break_cube_cli()
 {
-    if(0
-            + CLI_checkarg(1, CLIARG_IMG)
-            == 0)
+    if (0 + CLI_checkarg(1, CLIARG_IMG) == 0)
     {
         break_cube(data.cmdargtoken[1].val.string);
 
@@ -43,8 +35,6 @@ errno_t break_cube_cli()
     return CLICMD_SUCCESS;
 }
 
-
-
 // ==========================================
 // Register CLI command(s)
 // ==========================================
@@ -52,29 +42,13 @@ errno_t break_cube_cli()
 errno_t breakcube_addCLIcmd()
 {
 
-    RegisterCLIcommand(
-        "breakcube",
-        __FILE__,
-        break_cube_cli,
-        "break cube into individual images (slices)",
-        "<input image>",
-        "breakcube imc",
-        "int break_cube(char *ID_name)"
-    );
+    RegisterCLIcommand("breakcube", __FILE__, break_cube_cli, "break cube into individual images (slices)",
+                       "<input image>", "breakcube imc", "int break_cube(char *ID_name)");
 
     return RETURN_SUCCESS;
 }
 
-
-
-
-
-
-
-
-imageID break_cube(
-    const char *restrict ID_name
-)
+imageID break_cube(const char *restrict ID_name)
 {
     imageID ID;
     uint32_t naxes[3];
@@ -85,29 +59,27 @@ imageID break_cube(
     naxes[1] = data.image[ID].md[0].size[1];
     naxes[2] = data.image[ID].md[0].size[2];
 
-    for(uint32_t kk = 0; kk < naxes[2]; kk++)
+    for (uint32_t kk = 0; kk < naxes[2]; kk++)
     {
         long ID1;
 
-		CREATE_IMAGENAME(framename, "%s_%5u", ID_name, kk);
+        CREATE_IMAGENAME(framename, "%s_%5u", ID_name, kk);
 
-        for(i = 0; i < (long) strlen(framename); i++)
+        for (i = 0; i < (long)strlen(framename); i++)
         {
-            if(framename[i] == ' ')
+            if (framename[i] == ' ')
             {
                 framename[i] = '0';
             }
         }
         create_2Dimage_ID(framename, naxes[0], naxes[1], &ID1);
-        for(uint32_t ii = 0; ii < naxes[0]; ii++)
-            for(uint32_t jj = 0; jj < naxes[1]; jj++)
+        for (uint32_t ii = 0; ii < naxes[0]; ii++)
+            for (uint32_t jj = 0; jj < naxes[1]; jj++)
             {
-                data.image[ID1].array.F[jj * naxes[0] + ii] = data.image[ID].array.F[kk *
-                        naxes[0] * naxes[1] + jj * naxes[0] + ii];
+                data.image[ID1].array.F[jj * naxes[0] + ii] =
+                    data.image[ID].array.F[kk * naxes[0] * naxes[1] + jj * naxes[0] + ii];
             }
     }
 
     return ID;
 }
-
-
diff --git a/src/COREMOD_iofits/breakcube.h b/src/COREMOD_iofits/breakcube.h
index 8825acac..53e3d58c 100644
--- a/src/COREMOD_iofits/breakcube.h
+++ b/src/COREMOD_iofits/breakcube.h
@@ -4,7 +4,4 @@
 
 errno_t breakcube_addCLIcmd();
 
-
-imageID break_cube(
-    const char *restrict ID_name
-);
+imageID break_cube(const char *restrict ID_name);
diff --git a/src/COREMOD_iofits/check_fitsio_status.c b/src/COREMOD_iofits/check_fitsio_status.c
index 0af20576..9bb59eb1 100644
--- a/src/COREMOD_iofits/check_fitsio_status.c
+++ b/src/COREMOD_iofits/check_fitsio_status.c
@@ -2,35 +2,28 @@
  * @file    ckeck_fitsio_status.c
  */
 
-
 #include "COREMOD_iofits_common.h"
 
 extern COREMOD_IOFITS_DATA COREMOD_iofits_data;
 
-
 // set print to 0 if error message should not be printed to stderr
 // set print to 1 if error message should be printed to stderr
-int check_FITSIO_status(
-    const char *restrict cfile,
-    const char *restrict cfunc,
-    long cline,
-    int print)
+int check_FITSIO_status(const char *restrict cfile, const char *restrict cfunc, long cline, int print)
 {
     int Ferr = 0;
 
-    if(COREMOD_iofits_data.FITSIO_status != 0)
+    if (COREMOD_iofits_data.FITSIO_status != 0)
     {
-        if(print == 1)
+        if (print == 1)
         {
             char errstr[STRINGMAXLEN_FITSIOCHECK_ERRSTRING];
             fits_get_errstatus(COREMOD_iofits_data.FITSIO_status, errstr);
-            fprintf(stderr,
-                    "%c[%d;%dmFITSIO error %d [%s, %s, %ld]: %s%c[%d;m\n\a",
-                    (char) 27, 1, 31, COREMOD_iofits_data.FITSIO_status, cfile, cfunc, cline, errstr, (char) 27, 0);
+            fprintf(stderr, "%c[%d;%dmFITSIO error %d [%s, %s, %ld]: %s%c[%d;m\n\a", (char)27, 1, 31,
+                    COREMOD_iofits_data.FITSIO_status, cfile, cfunc, cline, errstr, (char)27, 0);
         }
         Ferr = COREMOD_iofits_data.FITSIO_status;
     }
     COREMOD_iofits_data.FITSIO_status = 0;
 
-    return(Ferr);
+    return (Ferr);
 }
diff --git a/src/COREMOD_iofits/check_fitsio_status.h b/src/COREMOD_iofits/check_fitsio_status.h
index af9194f2..ed26646b 100644
--- a/src/COREMOD_iofits/check_fitsio_status.h
+++ b/src/COREMOD_iofits/check_fitsio_status.h
@@ -2,9 +2,4 @@
  * @file    ckeck_fitsio_status.h
  */
 
-
-int check_FITSIO_status(
-    const char *restrict cfile,
-    const char *restrict cfunc,
-    long cline,
-    int print);
+int check_FITSIO_status(const char *restrict cfile, const char *restrict cfunc, long cline, int print);
diff --git a/src/COREMOD_iofits/data_type_code.c b/src/COREMOD_iofits/data_type_code.c
index 99500b79..ac607d86 100644
--- a/src/COREMOD_iofits/data_type_code.c
+++ b/src/COREMOD_iofits/data_type_code.c
@@ -2,12 +2,7 @@
  * @file    data_type_code.c
  */
 
-
-
-
-int data_type_code(
-    int bitpix
-)
+int data_type_code(int bitpix)
 {
     int code;
     /*
@@ -25,34 +20,33 @@ int data_type_code(
                   double complex, M      163        TDBLCOMPLEX
                   */
     code = 0;
-    if(bitpix == 1)
+    if (bitpix == 1)
     {
         code = 1;
     }
-    if(bitpix == 8)
+    if (bitpix == 8)
     {
         code = 11;
     }
-    if(bitpix == 16)
+    if (bitpix == 16)
     {
         code = 21;
     }
-    if(bitpix == 32)
+    if (bitpix == 32)
     {
         code = 41;
     }
-    if(bitpix == 64)
+    if (bitpix == 64)
     {
         code = 81;
     }
-    if(bitpix == -32)
+    if (bitpix == -32)
     {
         code = 42;
     }
-    if(bitpix == -64)
+    if (bitpix == -64)
     {
         code = 82;
     }
-    return(code);
+    return (code);
 }
-
diff --git a/src/COREMOD_iofits/data_type_code.h b/src/COREMOD_iofits/data_type_code.h
index 79ae9159..0db14889 100644
--- a/src/COREMOD_iofits/data_type_code.h
+++ b/src/COREMOD_iofits/data_type_code.h
@@ -2,8 +2,4 @@
  * @file    data_type_code.h
  */
 
-
-int data_type_code(
-    int bitpix
-);
-
+int data_type_code(int bitpix);
diff --git a/src/COREMOD_iofits/file_exists.c b/src/COREMOD_iofits/file_exists.c
index 755b426f..59506b0d 100644
--- a/src/COREMOD_iofits/file_exists.c
+++ b/src/COREMOD_iofits/file_exists.c
@@ -4,15 +4,12 @@
 
 #include <stdio.h>
 
-
-int file_exists(
-    const char *restrict file_name
-)
+int file_exists(const char *restrict file_name)
 {
     FILE *fp;
     int exists = 1;
 
-    if((fp = fopen(file_name, "r")) == NULL)
+    if ((fp = fopen(file_name, "r")) == NULL)
     {
         exists = 0;
         /*      printf("file %s does not exist\n",file_name);*/
@@ -22,5 +19,5 @@ int file_exists(
         fclose(fp);
     }
 
-    return(exists);
+    return (exists);
 }
diff --git a/src/COREMOD_iofits/file_exists.h b/src/COREMOD_iofits/file_exists.h
index ad61c9ab..37925820 100644
--- a/src/COREMOD_iofits/file_exists.h
+++ b/src/COREMOD_iofits/file_exists.h
@@ -2,6 +2,4 @@
  * @file    file_exists.h
  */
 
-int file_exists(
-    const char *restrict file_name
-);
+int file_exists(const char *restrict file_name);
diff --git a/src/COREMOD_iofits/images2cube.c b/src/COREMOD_iofits/images2cube.c
index 2796f446..f472b33a 100644
--- a/src/COREMOD_iofits/images2cube.c
+++ b/src/COREMOD_iofits/images2cube.c
@@ -2,26 +2,19 @@
  * @file    images2cube.c
  */
 
-#include "CommandLineInterface/CLIcore.h"
 #include "COREMOD_memory/COREMOD_memory.h"
+#include "CommandLineInterface/CLIcore.h"
 
 // ==========================================
 // Forward declaration(s)
 // ==========================================
 
-errno_t images_to_cube(
-    const char *restrict img_name,
-    long                 nbframes,
-    const char *restrict cube_name
-);
-
+errno_t images_to_cube(const char *restrict img_name, long nbframes, const char *restrict cube_name);
 
 // ==========================================
 // Command line interface wrapper function(s)
 // ==========================================
 
-
-
 errno_t images_to_cube_cli()
 {
     /*  if(data.cmdargtoken[1].type != 4)
@@ -30,21 +23,17 @@ errno_t images_to_cube_cli()
         return -1;
         }*/
 
-    if(data.cmdargtoken[2].type != 2)
+    if (data.cmdargtoken[2].type != 2)
     {
         printf("second argument has to be integer\n");
         return -1;
     }
 
-    images_to_cube(data.cmdargtoken[1].val.string, data.cmdargtoken[2].val.numl,
-                   data.cmdargtoken[3].val.string);
+    images_to_cube(data.cmdargtoken[1].val.string, data.cmdargtoken[2].val.numl, data.cmdargtoken[3].val.string);
 
     return CLICMD_SUCCESS;
 }
 
-
-
-
 // ==========================================
 // Register CLI command(s)
 // ==========================================
@@ -52,29 +41,15 @@ errno_t images_to_cube_cli()
 errno_t images2cube_addCLIcmd()
 {
 
-    RegisterCLIcommand(
-        "imgs2cube",
-        __FILE__,
-        images_to_cube_cli,
-        "combine individual images into cube, image name is prefix followed by 5 digits",
-        "<input image format> <max index> <output cube>", "imgs2cube im_ 100 imc",
-        "int images_to_cube(char *img_name, long nbframes, char *cube_name)"
-    );
+    RegisterCLIcommand("imgs2cube", __FILE__, images_to_cube_cli,
+                       "combine individual images into cube, image name is prefix followed by 5 digits",
+                       "<input image format> <max index> <output cube>", "imgs2cube im_ 100 imc",
+                       "int images_to_cube(char *img_name, long nbframes, char *cube_name)");
 
     return RETURN_SUCCESS;
 }
 
-
-
-
-
-
-
-errno_t images_to_cube(
-    const char *restrict img_name,
-    long                 nbframes,
-    const char *restrict cube_name
-)
+errno_t images_to_cube(const char *restrict img_name, long nbframes, const char *restrict cube_name)
 {
     DEBUG_TRACE_FSTART();
     imageID ID;
@@ -88,7 +63,7 @@ errno_t images_to_cube(
     CREATE_IMAGENAME(imname, "%s%05ld", img_name, frame);
 
     ID1 = image_ID(imname);
-    if(ID1 == -1)
+    if (ID1 == -1)
     {
         PRINT_ERROR("Image \"%s\" does not exist", imname);
         exit(0);
@@ -98,28 +73,26 @@ errno_t images_to_cube(
     xsize = naxes[0];
     ysize = naxes[1];
 
-    printf("SIZE = %ld %ld %ld\n", (long) naxes[0], (long) naxes[1],
-           (long) nbframes);
+    printf("SIZE = %ld %ld %ld\n", (long)naxes[0], (long)naxes[1], (long)nbframes);
     fflush(stdout);
 
-    FUNC_CHECK_RETURN(
-        create_3Dimage_ID(cube_name, naxes[0], naxes[1], nbframes, &ID));
+    FUNC_CHECK_RETURN(create_3Dimage_ID(cube_name, naxes[0], naxes[1], nbframes, &ID));
 
-    for(uint32_t ii = 0; ii < naxes[0]; ii++)
-        for(uint32_t jj = 0; jj < naxes[1]; jj++)
+    for (uint32_t ii = 0; ii < naxes[0]; ii++)
+        for (uint32_t jj = 0; jj < naxes[1]; jj++)
         {
-            data.image[ID].array.F[frame * naxes[0]*naxes[1] + (jj * naxes[0] + ii)] =
+            data.image[ID].array.F[frame * naxes[0] * naxes[1] + (jj * naxes[0] + ii)] =
                 data.image[ID1].array.F[jj * naxes[0] + ii];
         }
 
-    for(frame = 1; frame < nbframes; frame++)
+    for (frame = 1; frame < nbframes; frame++)
     {
         WRITE_IMAGENAME(imname, "%s%05ld", img_name, frame);
         printf("Adding image %s -> %ld/%ld ... ", img_name, frame, nbframes);
         fflush(stdout);
 
         ID1 = image_ID(imname);
-        if(ID1 == -1)
+        if (ID1 == -1)
         {
             PRINT_ERROR("Image \"%s\" does not exist - skipping", imname);
         }
@@ -127,15 +100,15 @@ errno_t images_to_cube(
         {
             naxes[0] = data.image[ID1].md[0].size[0];
             naxes[1] = data.image[ID1].md[0].size[1];
-            if((xsize != naxes[0]) || (ysize != naxes[1]))
+            if ((xsize != naxes[0]) || (ysize != naxes[1]))
             {
                 PRINT_ERROR("Image has wrong size");
                 exit(0);
             }
-            for(uint32_t ii = 0; ii < naxes[0]; ii++)
-                for(uint32_t jj = 0; jj < naxes[1]; jj++)
+            for (uint32_t ii = 0; ii < naxes[0]; ii++)
+                for (uint32_t jj = 0; jj < naxes[1]; jj++)
                 {
-                    data.image[ID].array.F[frame * naxes[0]*naxes[1] + (jj * naxes[0] + ii)] =
+                    data.image[ID].array.F[frame * naxes[0] * naxes[1] + (jj * naxes[0] + ii)] =
                         data.image[ID1].array.F[jj * naxes[0] + ii];
                 }
         }
@@ -146,5 +119,3 @@ errno_t images_to_cube(
     DEBUG_TRACE_FEXIT();
     return RETURN_SUCCESS;
 }
-
-
diff --git a/src/COREMOD_iofits/images2cube.h b/src/COREMOD_iofits/images2cube.h
index 702d6433..f83a635a 100644
--- a/src/COREMOD_iofits/images2cube.h
+++ b/src/COREMOD_iofits/images2cube.h
@@ -2,12 +2,6 @@
  * @file    images2cube.h
  */
 
-
 errno_t images2cube_addCLIcmd();
 
-
-errno_t images_to_cube(
-    const char *restrict img_name,
-    long                 nbframes,
-    const char *restrict cube_name
-);
+errno_t images_to_cube(const char *restrict img_name, long nbframes, const char *restrict cube_name);
diff --git a/src/COREMOD_iofits/is_fits_file.c b/src/COREMOD_iofits/is_fits_file.c
index 0bf2a6b7..2d4105ca 100644
--- a/src/COREMOD_iofits/is_fits_file.c
+++ b/src/COREMOD_iofits/is_fits_file.c
@@ -2,30 +2,26 @@
  * @file    is_fits_file.c
  */
 
-#include "CommandLineInterface/CLIcore.h"
 #include "COREMOD_iofits_common.h"
+#include "CommandLineInterface/CLIcore.h"
 #include "check_fitsio_status.h"
 
 extern COREMOD_IOFITS_DATA COREMOD_iofits_data;
 
-
-int is_fits_file(
-    const char *restrict file_name
-)
+int is_fits_file(const char *restrict file_name)
 {
     int value = 0;
     fitsfile *fptr;
 
-
-    if(!fits_open_file(&fptr, file_name, READONLY, &COREMOD_iofits_data.FITSIO_status))
+    if (!fits_open_file(&fptr, file_name, READONLY, &COREMOD_iofits_data.FITSIO_status))
     {
         fits_close_file(fptr, &COREMOD_iofits_data.FITSIO_status);
         value = 1;
     }
-    if(check_FITSIO_status(__FILE__, __func__, __LINE__, 1) == 1)
+    if (check_FITSIO_status(__FILE__, __func__, __LINE__, 1) == 1)
     {
         PRINT_ERROR("Error in function is_fits_file(%s)", file_name);
     }
 
-    return(value);
+    return (value);
 }
diff --git a/src/COREMOD_iofits/is_fits_file.h b/src/COREMOD_iofits/is_fits_file.h
index 4170f91d..9b4ed235 100644
--- a/src/COREMOD_iofits/is_fits_file.h
+++ b/src/COREMOD_iofits/is_fits_file.h
@@ -2,7 +2,4 @@
  * @file    is_fits_file.h
  */
 
-
-int is_fits_file(
-    const char *restrict file_name
-);
+int is_fits_file(const char *restrict file_name);
diff --git a/src/COREMOD_iofits/loadfits.c b/src/COREMOD_iofits/loadfits.c
index 4992d15d..e49fe397 100644
--- a/src/COREMOD_iofits/loadfits.c
+++ b/src/COREMOD_iofits/loadfits.c
@@ -3,64 +3,37 @@
  * @brief   load FITS format files
  */
 
-
 #include <stdlib.h>
 
 #include "CommandLineInterface/CLIcore.h"
 
-
-#include "COREMOD_memory/COREMOD_memory.h"
 #include "COREMOD_iofits_common.h"
+#include "COREMOD_memory/COREMOD_memory.h"
 
-#include "data_type_code.h"
 #include "check_fitsio_status.h"
+#include "data_type_code.h"
 
-#include "COREMOD_memory/image_keyword_addL.h"
 #include "COREMOD_memory/image_keyword_addD.h"
+#include "COREMOD_memory/image_keyword_addL.h"
 #include "COREMOD_memory/image_keyword_addS.h"
 
-
 extern COREMOD_IOFITS_DATA COREMOD_iofits_data;
 
-
-
 // CLI function arguments and parameters
 static char *infilename;
 static char *outimname;
 static long *FITSIOerrmode;
 
-
 // CLI function arguments and parameters
-static CLICMDARGDEF farg[] =
-{
-    {
-        CLIARG_STR, ".infname", "input file", "imfname",
-        CLIARG_VISIBLE_DEFAULT,
-        (void **) &infilename, NULL
-    },
-    {
-        CLIARG_STR_NOT_IMG, ".outimname", "output image name", "outimname",
-        CLIARG_VISIBLE_DEFAULT,
-        (void **) &outimname, NULL
-    },
-    {
-        CLIARG_LONG, ".errmode", "FITSIO errors mode \n(0:ignore) (1:warning) (2:error) (3:exit)", "1",
-        CLIARG_HIDDEN_DEFAULT,
-        (void **) &FITSIOerrmode, NULL
-    }
-};
-
-
+static CLICMDARGDEF farg[] = {
+    {CLIARG_STR, ".infname", "input file", "imfname", CLIARG_VISIBLE_DEFAULT, (void **)&infilename, NULL},
+    {CLIARG_STR_NOT_IMG, ".outimname", "output image name", "outimname", CLIARG_VISIBLE_DEFAULT, (void **)&outimname,
+     NULL},
+    {CLIARG_LONG, ".errmode", "FITSIO errors mode \n(0:ignore) (1:warning) (2:error) (3:exit)", "1",
+     CLIARG_HIDDEN_DEFAULT, (void **)&FITSIOerrmode, NULL}};
 
 // CLI function initialization data
-static CLICMDDATA CLIcmddata =
-{
-    "loadfits",
-    "load FITS format file",
-    CLICMD_FIELDS_DEFAULTS
-};
-
-
+static CLICMDDATA CLIcmddata = {"loadfits", "load FITS format file", CLICMD_FIELDS_DEFAULTS};
 
 // detailed help
 static errno_t help_function()
@@ -70,41 +43,31 @@ static errno_t help_function()
            "Uses fitsio library, supports extended fitsio file syntax\n"
            "File name should be in double quotes unless free of special chars\n"
            "Examples:\n"
-           "   loadfits \"im1.fits\" im\n"
-          );
+           "   loadfits \"im1.fits\" im\n");
 
     return RETURN_SUCCESS;
 }
 
-
-
-
-
 /// errmode values :
 /// LOADFITS_ERRMODE_IGNORE  (0) print warning, do not show error messages, continue
 /// LOADFITS_ERRMODE_WARNING (1) print error, continue
 /// LOADFITS_ERRMODE_ERROR   (2) return error
 /// LOADFITS_ERRMODE_EXIT    (3) exit program at error
 
-errno_t load_fits(
-    const char *restrict file_name,
-    const char *restrict ID_name,
-    int         errmode,
-    imageID    *IDout
-)
+errno_t load_fits(const char *restrict file_name, const char *restrict ID_name, int errmode, imageID *IDout)
 {
     DEBUG_TRACE_FSTART();
 
-    fitsfile *fptr = NULL;       /* pointer to the FITS file; defined in fitsio.h */
-    int       nulval, anynul;
-    long      bitpixl = 0;
+    fitsfile *fptr = NULL; /* pointer to the FITS file; defined in fitsio.h */
+    int nulval, anynul;
+    long bitpixl = 0;
 
-    uint32_t  naxes[3];
+    uint32_t naxes[3];
 
-    double    bscale;
-    double    bzero;
+    double bscale;
+    double bzero;
     unsigned char *barray = NULL;
-    long     *larray = NULL;
+    long *larray = NULL;
     //    unsigned short *sarray = NULL;
     //    long      NDR = 1; /* non-destructive reads */
 
@@ -119,8 +82,6 @@ errno_t load_fits(
     naxes[1] = 0;
     naxes[2] = 0;
 
-
-
     DEBUG_TRACEPOINT("FARG \"%s\" %s %d", file_name, ID_name, errmode);
 
     {
@@ -128,33 +89,32 @@ errno_t load_fits(
         // tyr 3 consecutive times and then give up if not successful
         int fileOK = 0;
         int NBtry = 3;
-        for(int tr = 0; tr < NBtry; tr++)
+        for (int tr = 0; tr < NBtry; tr++)
         {
-            if(fileOK == 0)
+            if (fileOK == 0)
             {
                 int status = 0;
                 fits_open_file(&fptr, file_name, READONLY, &status);
 
-                if(status != 0)
+                if (status != 0)
                 {
-                    if(errmode > 0)
+                    if (errmode > 0)
                     {
 
                         printf("attempt # %d failed\n", tr);
                     }
 
                     //void fits_get_errstatus(int status, char *err_text)
-                    if(status != 0)
+                    if (status != 0)
                     {
-                        if(errmode > 1)
+                        if (errmode > 1)
                         {
-                            if(tr == NBtry - 1)
+                            if (tr == NBtry - 1)
                             {
-                                FITSIO_CHECK_ERROR(status, errmode, "can't load %s (tried %d times)", file_name,
-                                                   NBtry);
+                                FITSIO_CHECK_ERROR(status, errmode, "can't load %s (tried %d times)", file_name, NBtry);
                             }
                         }
-                        if(tr != NBtry - 1) // don't wait on last try
+                        if (tr != NBtry - 1) // don't wait on last try
                         {
                             usleep(10000);
                         }
@@ -170,36 +130,33 @@ errno_t load_fits(
         }
         printf("fileOK = %d\n", fileOK);
 
-        if(fileOK == 0)
+        if (fileOK == 0)
         {
             // if image not loaded, set output identifier to -1
-            if(IDout != NULL)
+            if (IDout != NULL)
             {
                 *IDout = -1;
             }
 
-            if(errmode == 0)
+            if (errmode == 0)
             {
                 DEBUG_TRACE_FEXIT();
                 return RETURN_SUCCESS;
             }
 
-            if(errmode == 1)
+            if (errmode == 1)
             {
-                PRINT_WARNING("Image \"%s\" could not be loaded from file \"%s\"",
-                              ID_name,
-                              file_name);
+                PRINT_WARNING("Image \"%s\" could not be loaded from file \"%s\"", ID_name, file_name);
                 DEBUG_TRACE_FEXIT();
                 return RETURN_SUCCESS;
             }
 
-            if(errmode == 2)
+            if (errmode == 2)
             {
-                FUNC_RETURN_FAILURE("Image \"%s\" could not be loaded from file \"%s\"",
-                                    ID_name, file_name);
+                FUNC_RETURN_FAILURE("Image \"%s\" could not be loaded from file \"%s\"", ID_name, file_name);
             }
 
-            if(errmode == 3)
+            if (errmode == 3)
             {
                 abort();
             }
@@ -210,13 +167,11 @@ errno_t load_fits(
 
     DEBUG_TRACEPOINT("File %s open", file_name);
 
-
-    char  keyword[STRINGMAXLEN_FITSKEYWORDNAME];
-    long  fpixel = 1;
-    char  comment[STRINGMAXLEN_FITSKEYWCOMMENT];
-    long  nelements;
-    long  naxis = 0;
-
+    char keyword[STRINGMAXLEN_FITSKEYWORDNAME];
+    long fpixel = 1;
+    char comment[STRINGMAXLEN_FITSKEYWCOMMENT];
+    long nelements;
+    long naxis = 0;
 
     // Keywords
     int nbFITSkeys = 0;
@@ -224,22 +179,18 @@ errno_t load_fits(
     {
         int status = 0;
         fits_get_hdrspace(fptr, &nbFITSkeys, NULL, &status);
-        FITSIO_CHECK_ERROR(status, errmode, "fits_get_hdrspace error on %s",
-                           file_name);
+        FITSIO_CHECK_ERROR(status, errmode, "fits_get_hdrspace error on %s", file_name);
     }
 
-
     {
         int status = 0;
-        fits_read_key(fptr, TLONG, "NAXIS", &naxis, comment,
-                      &status);
+        fits_read_key(fptr, TLONG, "NAXIS", &naxis, comment, &status);
         FITSIO_CHECK_ERROR(status, errmode, "File %s has no NAXIS", file_name);
     }
     printf("naxis = %ld\n", naxis);
     DEBUG_TRACEPOINT("naxis = %ld", naxis);
 
-
-    for(long i = 0; i < naxis; i++)
+    for (long i = 0; i < naxis; i++)
     {
         WRITE_FITSKEYWNAME(keyword, "NAXIS%ld", i + 1);
 
@@ -256,12 +207,11 @@ errno_t load_fits(
         FITSIO_CHECK_ERROR(status, errmode, "File %s has no BITPIX", file_name);
     }
 
-
-    int bitpix = (int) bitpixl;
+    int bitpix = (int)bitpixl;
     {
         int status = 0;
         fits_read_key(fptr, TDOUBLE, "BSCALE", &bscale, comment, &status);
-        if(status != 0)
+        if (status != 0)
         {
             bscale = 1.0;
         }
@@ -270,119 +220,93 @@ errno_t load_fits(
     {
         int status = 0;
         fits_read_key(fptr, TDOUBLE, "BZERO", &bzero, comment, &status);
-        if(status != 0)
+        if (status != 0)
         {
             bzero = 0.0;
         }
     }
 
-
-
     {
         int status = 0;
         fits_set_bscale(fptr, bscale, bzero, &status);
         FITSIO_CHECK_ERROR(status, errmode, "bscake set errror");
     }
 
-
-    if(1)
+    if (1)
     {
-        printf("[%ld", (long) naxes[0]);
-        for(long i = 1; i < naxis; i++)
+        printf("[%ld", (long)naxes[0]);
+        for (long i = 1; i < naxis; i++)
         {
-            printf(",%ld", (long) naxes[i]);
+            printf(",%ld", (long)naxes[i]);
         }
         printf("] %d %f %f\n", bitpix, bscale, bzero);
         fflush(stdout);
     }
 
     nelements = 1;
-    for(long i = 0; i < naxis; i++)
+    for (long i = 0; i < naxis; i++)
     {
         nelements *= naxes[i];
     }
 
-
     /* bitpix = -32  TFLOAT */
-    if(bitpix == -32)
+    if (bitpix == -32)
     {
-        create_image_ID(
-            ID_name,
-            naxis,
-            naxes,
-            _DATATYPE_FLOAT,
-            data.SHARED_DFT,
-            data.NBKEYWORD_DFT,
-            0,
-            &ID);
+        create_image_ID(ID_name, naxis, naxes, _DATATYPE_FLOAT, data.SHARED_DFT, data.NBKEYWORD_DFT, 0, &ID);
 
         {
             int status = 0;
-            fits_read_img(fptr, data_type_code(bitpix), fpixel, nelements, &nulval,
-                          data.image[ID].array.F, &anynul, &status);
+            fits_read_img(fptr, data_type_code(bitpix), fpixel, nelements, &nulval, data.image[ID].array.F, &anynul,
+                          &status);
             FITSIO_CHECK_ERROR(status, errmode, "fits_read_img bitpix=%d", bitpix);
         }
     }
 
     /* bitpix = -64  TDOUBLE */
-    if(bitpix == -64)
+    if (bitpix == -64)
     {
-        create_image_ID(
-            ID_name,
-            naxis,
-            naxes,
-            _DATATYPE_DOUBLE,
-            data.SHARED_DFT,
-            data.NBKEYWORD_DFT,
-            0,
-            &ID);
+        create_image_ID(ID_name, naxis, naxes, _DATATYPE_DOUBLE, data.SHARED_DFT, data.NBKEYWORD_DFT, 0, &ID);
 
         {
             int status = 0;
-            fits_read_img(fptr, data_type_code(bitpix), fpixel, nelements, &nulval,
-                          data.image[ID].array.D, &anynul, &status);
+            fits_read_img(fptr, data_type_code(bitpix), fpixel, nelements, &nulval, data.image[ID].array.D, &anynul,
+                          &status);
             FITSIO_CHECK_ERROR(status, errmode, "fits_read_img bitpix=%d", bitpix);
         }
     }
 
-
     /* bitpix = 16   TSHORT */
-    if(bitpix == 16)
+    if (bitpix == 16)
     {
         // ID = create_image_ID(ID_name, naxis, naxes, Dtype, data.SHARED_DFT, data.NBKEWORD_DFT);
-        create_image_ID(ID_name, naxis, naxes, _DATATYPE_UINT16, data.SHARED_DFT,
-                        data.NBKEYWORD_DFT, 0, &ID);
+        create_image_ID(ID_name, naxis, naxes, _DATATYPE_UINT16, data.SHARED_DFT, data.NBKEYWORD_DFT, 0, &ID);
 
         //           fits_read_img(fptr, 20, fpixel, nelements, &nulval, sarray, &anynul, &FITSIO_status);
         {
             int status = 0;
-            fits_read_img(fptr, 20, fpixel, nelements, &nulval, data.image[ID].array.UI16,
-                          &anynul, &status);
+            fits_read_img(fptr, 20, fpixel, nelements, &nulval, data.image[ID].array.UI16, &anynul, &status);
             FITSIO_CHECK_ERROR(status, errmode, "fits_read_img bitpix=%d", bitpix);
         }
     }
 
-
     /* bitpix = 32   TLONG */
-    if(bitpix == 32)
+    if (bitpix == 32)
     {
-        create_image_ID(ID_name, naxis, naxes, _DATATYPE_INT32, data.SHARED_DFT,
-                        data.NBKEYWORD_DFT, 0, &ID);
-        larray = (long *) malloc(sizeof(long) * nelements);
-        if(larray == NULL)
+        create_image_ID(ID_name, naxis, naxes, _DATATYPE_INT32, data.SHARED_DFT, data.NBKEYWORD_DFT, 0, &ID);
+        larray = (long *)malloc(sizeof(long) * nelements);
+        if (larray == NULL)
         {
             PRINT_ERROR("malloc error");
             exit(0);
         }
         {
             int status = 0;
-            fits_read_img(fptr, data_type_code(bitpix), fpixel, nelements, &nulval, larray,
-                          &anynul, &status);
+            fits_read_img(fptr, data_type_code(bitpix), fpixel, nelements, &nulval, larray, &anynul, &status);
             FITSIO_CHECK_ERROR(status, errmode, "fits_read_img bitpix=%d", bitpix);
         }
 
         bzero = 0.0;
-        for(uint_fast64_t ii = 0; ii < (uint_fast64_t) nelements; ii++)
+        for (uint_fast64_t ii = 0; ii < (uint_fast64_t)nelements; ii++)
         {
             data.image[ID].array.SI32[ii] = larray[ii] * bscale + bzero;
         }
@@ -390,14 +314,12 @@ errno_t load_fits(
         larray = NULL;
     }
 
-
     /* bitpix = 64   TLONG  */
-    if(bitpix == 64)
+    if (bitpix == 64)
     {
-        create_image_ID(ID_name, naxis, naxes, _DATATYPE_INT64, data.SHARED_DFT,
-                        data.NBKEYWORD_DFT, 0, &ID);
-        larray = (long *) malloc(sizeof(long) * nelements);
-        if(larray == NULL)
+        create_image_ID(ID_name, naxis, naxes, _DATATYPE_INT64, data.SHARED_DFT, data.NBKEYWORD_DFT, 0, &ID);
+        larray = (long *)malloc(sizeof(long) * nelements);
+        if (larray == NULL)
         {
             PRINT_ERROR("malloc error");
             abort();
@@ -405,13 +327,12 @@ errno_t load_fits(
 
         {
             int status = 0;
-            fits_read_img(fptr, data_type_code(bitpix), fpixel, nelements, &nulval, larray,
-                          &anynul, &status);
+            fits_read_img(fptr, data_type_code(bitpix), fpixel, nelements, &nulval, larray, &anynul, &status);
             FITSIO_CHECK_ERROR(status, errmode, "fits_read_img bitpix=%d", bitpix);
         }
 
         bzero = 0.0;
-        for(uint_fast64_t ii = 0; ii < (uint_fast64_t) nelements; ii++)
+        for (uint_fast64_t ii = 0; ii < (uint_fast64_t)nelements; ii++)
         {
             data.image[ID].array.SI64[ii] = larray[ii] * bscale + bzero;
         }
@@ -419,16 +340,12 @@ errno_t load_fits(
         larray = NULL;
     }
 
-
-
-
     /* bitpix = 8   TBYTE */
-    if(bitpix == 8)
+    if (bitpix == 8)
     {
-        create_image_ID(ID_name, naxis, naxes, _DATATYPE_FLOAT, data.SHARED_DFT,
-                        data.NBKEYWORD_DFT, 0, &ID);
-        barray = (unsigned char *) malloc(sizeof(unsigned char) * naxes[1] * naxes[0]);
-        if(barray == NULL)
+        create_image_ID(ID_name, naxis, naxes, _DATATYPE_FLOAT, data.SHARED_DFT, data.NBKEYWORD_DFT, 0, &ID);
+        barray = (unsigned char *)malloc(sizeof(unsigned char) * naxes[1] * naxes[0]);
+        if (barray == NULL)
         {
             PRINT_ERROR("malloc error");
             exit(0);
@@ -436,12 +353,11 @@ errno_t load_fits(
 
         {
             int status = 0;
-            fits_read_img(fptr, data_type_code(bitpix), fpixel, nelements, &nulval, barray,
-                          &anynul, &status);
+            fits_read_img(fptr, data_type_code(bitpix), fpixel, nelements, &nulval, barray, &anynul, &status);
             FITSIO_CHECK_ERROR(status, errmode, "fits_read_img bitpix=%d", bitpix);
         }
 
-        for(uint_fast64_t ii = 0; ii < (uint_fast64_t) nelements; ii++)
+        for (uint_fast64_t ii = 0; ii < (uint_fast64_t)nelements; ii++)
         {
             data.image[ID].array.F[ii] = (1.0 * barray[ii] * bscale + bzero);
         }
@@ -449,13 +365,13 @@ errno_t load_fits(
         barray = NULL;
     }
 
-
     IMGID img = makesetIMGID(ID_name, ID);
 
     // keywords to ignore
-    char *keywordignore[] = {"BITPIX", "NAXIS", "SIMPLE", "EXTEND", "COMMENT", "DATE", "NAXIS1", "NAXIS2", "NAXIS3", "NAXIS4", "BSCALE", "BZERO", 0};
+    char *keywordignore[] = {"BITPIX", "NAXIS",  "SIMPLE", "EXTEND", "COMMENT", "DATE", "NAXIS1",
+                             "NAXIS2", "NAXIS3", "NAXIS4", "BSCALE", "BZERO",   0};
     printf("%d FITS keywords detected\n", nbFITSkeys);
-    for(int kwnum = 0; kwnum < nbFITSkeys; kwnum ++)
+    for (int kwnum = 0; kwnum < nbFITSkeys; kwnum++)
     {
         char keyname[9];
         char kwvaluestr[21];
@@ -467,12 +383,11 @@ errno_t load_fits(
 
         //printf("FITS KEYW %3d  %8s %20s / %s\n", kwnum, keyname, kwvaluestr, kwcomment);
 
-
         int kwignore = 0;
         int ki = 0;
-        while(keywordignore[ki])
+        while (keywordignore[ki])
         {
-            if(strcmp(keywordignore[ki], keyname) == 0)
+            if (strcmp(keywordignore[ki], keyname) == 0)
             {
                 //printf("%3d IGNORING %s\n", kwnum, keyname);
                 kwignore = 1;
@@ -481,62 +396,54 @@ errno_t load_fits(
             ki++;
         }
 
-        if((kwignore == 0) && (strlen(kwvaluestr) > 0))
+        if ((kwignore == 0) && (strlen(kwvaluestr) > 0))
         {
             int kwtypeOK = 0;
 
             // is this a long ?
             char *tailstr;
             long kwlongval = strtol(kwvaluestr, &tailstr, 10);
-            if(strlen(tailstr) == 0)
+            if (strlen(tailstr) == 0)
             {
                 kwtypeOK = 1;
-                printf("%3d FITS KEYW [L] %-8s= %20ld / %s\n", kwnum, keyname, kwlongval,
-                       kwcomment);
+                printf("%3d FITS KEYW [L] %-8s= %20ld / %s\n", kwnum, keyname, kwlongval, kwcomment);
                 image_keyword_addL(img, keyname, kwlongval, kwcomment);
             }
 
-            if(kwtypeOK == 0)
+            if (kwtypeOK == 0)
             {
                 // is this a float ?
                 double kwdoubleval = strtold(kwvaluestr, &tailstr);
-                if(strlen(tailstr) == 0)
+                if (strlen(tailstr) == 0)
                 {
                     kwtypeOK = 1;
-                    printf("%3d FITS KEYW [D] %-8s= %20g / %s\n", kwnum, keyname, kwdoubleval,
-                           kwcomment);
+                    printf("%3d FITS KEYW [D] %-8s= %20g / %s\n", kwnum, keyname, kwdoubleval, kwcomment);
                     image_keyword_addD(img, keyname, kwdoubleval, kwcomment);
                 }
 
-                if(kwtypeOK == 0)
+                if (kwtypeOK == 0)
                 {
                     // default to string
-                    printf("%3d FITS KEYW [S] %-8s= %-20s / %s\n", kwnum, keyname, kwvaluestr,
-                           kwcomment);
+                    printf("%3d FITS KEYW [S] %-8s= %-20s / %s\n", kwnum, keyname, kwvaluestr, kwcomment);
                     // remove leading and trailing '
                     kwvaluestr[strlen(kwvaluestr) - 1] = '\0';
                     char *kwvaluestr1;
                     kwvaluestr1 = kwvaluestr + 1;
                     image_keyword_addS(img, keyname, kwvaluestr1, kwcomment);
                 }
-
             }
         }
     }
 
-
-
     {
         int status = 0;
         fits_close_file(fptr, &status);
-        FITSIO_CHECK_ERROR(status, errmode, "fits_close_file error in image %s",
-                           file_name);
+        FITSIO_CHECK_ERROR(status, errmode, "fits_close_file error in image %s", file_name);
     }
 
     list_image_ID();
 
-
-    if(IDout != NULL)
+    if (IDout != NULL)
     {
         *IDout = ID;
     }
@@ -547,22 +454,13 @@ errno_t load_fits(
     return RETURN_SUCCESS;
 }
 
-
-
-
 static errno_t compute_function()
 {
     DEBUG_TRACE_FSTART();
 
     INSERT_STD_PROCINFO_COMPUTEFUNC_START
 
-    FUNC_CHECK_RETURN(load_fits(
-                          infilename,
-                          outimname,
-                          *FITSIOerrmode,
-                          NULL
-                      )
-                     );
+    FUNC_CHECK_RETURN(load_fits(infilename, outimname, *FITSIOerrmode, NULL));
 
     INSERT_STD_PROCINFO_COMPUTEFUNC_END
 
@@ -570,14 +468,11 @@ static errno_t compute_function()
     return RETURN_SUCCESS;
 }
 
-
-
-
 INSERT_STD_FPSCLIfunctions
 
-
-// Register function in CLI
-errno_t CLIADDCMD_COREMOD_iofits__loadfits()
+    // Register function in CLI
+    errno_t
+    CLIADDCMD_COREMOD_iofits__loadfits()
 {
     //INSERT_STD_FPSCLIREGISTERFUNC
 
@@ -586,5 +481,3 @@ errno_t CLIADDCMD_COREMOD_iofits__loadfits()
 
     return RETURN_SUCCESS;
 }
-
-
diff --git a/src/COREMOD_iofits/loadfits.h b/src/COREMOD_iofits/loadfits.h
index 3d0c524f..155bd891 100644
--- a/src/COREMOD_iofits/loadfits.h
+++ b/src/COREMOD_iofits/loadfits.h
@@ -2,22 +2,16 @@
  * @file    loadfits.h
  */
 
-
 #ifndef MILK_COREMOD_IOFIT_LOADFITS_H
 #define MILK_COREMOD_IOFIT_LOADFITS_H
 
-#define LOADFITS_ERRMODE_IGNORE  0
+#define LOADFITS_ERRMODE_IGNORE 0
 #define LOADFITS_ERRMODE_WARNING 1
-#define LOADFITS_ERRMODE_ERROR   2
-#define LOADFITS_ERRMODE_EXIT    3
+#define LOADFITS_ERRMODE_ERROR 2
+#define LOADFITS_ERRMODE_EXIT 3
 
 errno_t CLIADDCMD_COREMOD_iofits__loadfits();
 
-errno_t load_fits(
-    const char *restrict file_name,
-    const char *restrict ID_name,
-    int         errmode,
-    imageID    *ID
-);
+errno_t load_fits(const char *restrict file_name, const char *restrict ID_name, int errmode, imageID *ID);
 
 #endif
diff --git a/src/COREMOD_iofits/loadmemstream.c b/src/COREMOD_iofits/loadmemstream.c
index 4c7d560b..737886f9 100644
--- a/src/COREMOD_iofits/loadmemstream.c
+++ b/src/COREMOD_iofits/loadmemstream.c
@@ -5,8 +5,8 @@
  * Scan for source location, load stream of FITS file
  */
 
-#include "CommandLineInterface/CLIcore.h"
 #include "COREMOD_memory/COREMOD_memory.h"
+#include "CommandLineInterface/CLIcore.h"
 
 #include "COREMOD_iofits_common.h"
 #include "loadfits.h"
@@ -14,87 +14,67 @@
 
 extern COREMOD_IOFITS_DATA COREMOD_iofits_data;
 
-
-
 // High-level load to stream
 
-
-imageID COREMOD_IOFITS_LoadMemStream(
-    const char *sname,
-    uint64_t   *streamflag,
-    uint32_t   *imLOC
-)
+imageID COREMOD_IOFITS_LoadMemStream(const char *sname, uint64_t *streamflag, uint32_t *imLOC)
 {
     imageID ID = -1;
 
-
     // toggles to 1 if updating shared mem
     __attribute__((unused)) int updateSHAREMEM = 0;
 
-
     int updateCONFFITS = 0; // toggles to 1 if updating CONF FITS
 
-
     int MEMLOADREPORT = 0;
-    if(FPFLAG_STREAM_MEMLOADREPORT & *streamflag)   // write report to disk
+    if (FPFLAG_STREAM_MEMLOADREPORT & *streamflag) // write report to disk
     {
         MEMLOADREPORT = 1;
     }
-    MEMLOADREPORT = 1;// TMP
-
+    MEMLOADREPORT = 1; // TMP
 
     *imLOC = STREAM_LOAD_SOURCE_NOTFOUND;
 
-
-
-
-    if(strcmp(sname, "NULL") == 0)   // don't bother looking for it
+    if (strcmp(sname, "NULL") == 0) // don't bother looking for it
     {
         *imLOC = STREAM_LOAD_SOURCE_NULL;
         ID = -1;
     }
 
-
-
     int imLOCALMEM;
-    if(*imLOC == STREAM_LOAD_SOURCE_NOTFOUND)   // still searching
+    if (*imLOC == STREAM_LOAD_SOURCE_NOTFOUND) // still searching
     {
         // Does image exist in memory ?
         ID = image_ID(sname);
-        if(ID == -1)
+        if (ID == -1)
         {
             imLOCALMEM = 0;
-            if(MEMLOADREPORT == 1)
+            if (MEMLOADREPORT == 1)
             {
                 char msg[STRINGMAXLEN_FPS_LOGMSG];
-                SNPRINTF_CHECK(msg, STRINGMAXLEN_FPS_LOGMSG,
-                               "%s stream not in local memory", sname);
+                SNPRINTF_CHECK(msg, STRINGMAXLEN_FPS_LOGMSG, "%s stream not in local memory", sname);
                 functionparameter_outlog("LOADMEMSTREAM", msg);
             }
         }
         else
         {
             imLOCALMEM = 1;
-            if(MEMLOADREPORT == 1)
+            if (MEMLOADREPORT == 1)
             {
                 char msg[STRINGMAXLEN_FPS_LOGMSG];
-                SNPRINTF_CHECK(msg, STRINGMAXLEN_FPS_LOGMSG,
-                               "%s stream in local memory", sname);
+                SNPRINTF_CHECK(msg, STRINGMAXLEN_FPS_LOGMSG, "%s stream in local memory", sname);
                 functionparameter_outlog("LOADMEMSTREAM", msg);
             }
         }
 
-
         //    printf("imLOC = %d\n", *imLOC);
 
-
         // FORCE_LOCALMEM
-        if(FPFLAG_STREAM_LOAD_FORCE_LOCALMEM & *streamflag)
+        if (FPFLAG_STREAM_LOAD_FORCE_LOCALMEM & *streamflag)
         {
-            if(imLOCALMEM == 0)
+            if (imLOCALMEM == 0)
             {
                 *imLOC = STREAM_LOAD_SOURCE_EXITFAILURE; // fail
-                if(MEMLOADREPORT)
+                if (MEMLOADREPORT)
                 {
                     char msg[STRINGMAXLEN_FPS_LOGMSG];
                     SNPRINTF_CHECK(msg, STRINGMAXLEN_FPS_LOGMSG,
@@ -106,11 +86,10 @@ imageID COREMOD_IOFITS_LoadMemStream(
             else
             {
                 *imLOC = STREAM_LOAD_SOURCE_LOCALMEM;
-                if(MEMLOADREPORT == 1)
+                if (MEMLOADREPORT == 1)
                 {
                     char msg[STRINGMAXLEN_FPS_LOGMSG];
-                    SNPRINTF_CHECK(msg, STRINGMAXLEN_FPS_LOGMSG,
-                                   "%s SUCCESS STREAM_LOAD_FORCE_LOCALMEM", sname);
+                    SNPRINTF_CHECK(msg, STRINGMAXLEN_FPS_LOGMSG, "%s SUCCESS STREAM_LOAD_FORCE_LOCALMEM", sname);
                     functionparameter_outlog("LOADMEMSTREAM", msg);
                     sprintf(msg, "%s imLOC %u", sname, *imLOC);
                     functionparameter_outlog("LOADMEMSTREAM", msg);
@@ -119,19 +98,17 @@ imageID COREMOD_IOFITS_LoadMemStream(
         }
     }
 
-
-
     // FORCE_SHAREMEM
-    if(*imLOC == STREAM_LOAD_SOURCE_NOTFOUND)   // still searching
+    if (*imLOC == STREAM_LOAD_SOURCE_NOTFOUND) // still searching
     {
-        if(FPFLAG_STREAM_LOAD_FORCE_SHAREMEM & *streamflag)
+        if (FPFLAG_STREAM_LOAD_FORCE_SHAREMEM & *streamflag)
         {
             // search SHAREMEM
             ID = read_sharedmem_image(sname);
-            if(ID == -1)
+            if (ID == -1)
             {
                 *imLOC = STREAM_LOAD_SOURCE_EXITFAILURE; // fail
-                if(MEMLOADREPORT == 1)
+                if (MEMLOADREPORT == 1)
                 {
                     char msg[STRINGMAXLEN_FPS_LOGMSG];
                     SNPRINTF_CHECK(msg, STRINGMAXLEN_FPS_LOGMSG,
@@ -143,64 +120,57 @@ imageID COREMOD_IOFITS_LoadMemStream(
             else
             {
                 *imLOC = STREAM_LOAD_SOURCE_SHAREMEM;
-                if(MEMLOADREPORT == 1)
+                if (MEMLOADREPORT == 1)
                 {
                     char msg[STRINGMAXLEN_FPS_LOGMSG];
-                    SNPRINTF_CHECK(msg, STRINGMAXLEN_FPS_LOGMSG,
-                                   "%s SUCCESS STREAM_LOAD_FORCE_SHAREDMEM", sname);
+                    SNPRINTF_CHECK(msg, STRINGMAXLEN_FPS_LOGMSG, "%s SUCCESS STREAM_LOAD_FORCE_SHAREDMEM", sname);
                     functionparameter_outlog("LOADMEMSTREAM", msg);
-                    SNPRINTF_CHECK(msg, STRINGMAXLEN_FPS_LOGMSG,
-                                   "%s imLOC %u", sname, *imLOC);
+                    SNPRINTF_CHECK(msg, STRINGMAXLEN_FPS_LOGMSG, "%s imLOC %u", sname, *imLOC);
                     functionparameter_outlog("LOADMEMSTREAM", msg);
                 }
             }
         }
     }
 
-
     // FORCE_CONFFITS
-    if(*imLOC == STREAM_LOAD_SOURCE_NOTFOUND)   // still searching
+    if (*imLOC == STREAM_LOAD_SOURCE_NOTFOUND) // still searching
     {
-        if(FPFLAG_STREAM_LOAD_FORCE_CONFFITS & *streamflag)
+        if (FPFLAG_STREAM_LOAD_FORCE_CONFFITS & *streamflag)
         {
             // search CONFFITS
             char fname[STRINGMAXLEN_FULLFILENAME];
             WRITE_FULLFILENAME(fname, "./conf/shmim.%s.fits", sname);
             load_fits(fname, sname, 0, &ID);
-            if(ID == -1)
+            if (ID == -1)
             {
                 *imLOC = STREAM_LOAD_SOURCE_EXITFAILURE; // fail
-                if(MEMLOADREPORT == 1)
+                if (MEMLOADREPORT == 1)
                 {
                     char msg[STRINGMAXLEN_FPS_LOGMSG];
                     SNPRINTF_CHECK(msg, STRINGMAXLEN_FPS_LOGMSG,
-                                   "%s EXITFAIL STREAM_LOAD_FORCE_CONFFITS: Image does not exist as conf FITS",
-                                   sname);
+                                   "%s EXITFAIL STREAM_LOAD_FORCE_CONFFITS: Image does not exist as conf FITS", sname);
                     functionparameter_outlog("LOADMEMSTREAM", msg);
                 }
             }
             else
             {
                 *imLOC = STREAM_LOAD_SOURCE_CONFFITS;
-                if(MEMLOADREPORT == 1)
+                if (MEMLOADREPORT == 1)
                 {
                     char msg[STRINGMAXLEN_FPS_LOGMSG];
-                    SNPRINTF_CHECK(msg, STRINGMAXLEN_FPS_LOGMSG,
-                                   "%s SUCCESS STREAM_LOAD_FORCE_CONFFITS", sname);
+                    SNPRINTF_CHECK(msg, STRINGMAXLEN_FPS_LOGMSG, "%s SUCCESS STREAM_LOAD_FORCE_CONFFITS", sname);
                     functionparameter_outlog("LOADMEMSTREAM", msg);
-                    SNPRINTF_CHECK(msg, STRINGMAXLEN_FPS_LOGMSG,
-                                   "%s imLOC %u", sname, *imLOC);
+                    SNPRINTF_CHECK(msg, STRINGMAXLEN_FPS_LOGMSG, "%s imLOC %u", sname, *imLOC);
                     functionparameter_outlog("LOADMEMSTREAM", msg);
                 }
             }
         }
     }
 
-
     // FORCE_CONFNAME
-    if(*imLOC == STREAM_LOAD_SOURCE_NOTFOUND)   // still searching
+    if (*imLOC == STREAM_LOAD_SOURCE_NOTFOUND) // still searching
     {
-        if(FPFLAG_STREAM_LOAD_FORCE_CONFNAME & *streamflag)
+        if (FPFLAG_STREAM_LOAD_FORCE_CONFNAME & *streamflag)
         {
             // search CONFNAME
             FILE *fp;
@@ -211,31 +181,30 @@ imageID COREMOD_IOFITS_LoadMemStream(
             WRITE_FULLFILENAME(fname, "./conf/shmim.%s.fname.txt", sname);
 
             fp = fopen(fname, "r");
-            if(fp == NULL)
+            if (fp == NULL)
             {
                 printf("ERROR: stream %s could not be loaded from CONF\n", sname);
                 *imLOC = STREAM_LOAD_SOURCE_EXITFAILURE; // fail
-                if(MEMLOADREPORT == 1)
+                if (MEMLOADREPORT == 1)
                 {
                     char msg[STRINGMAXLEN_FPS_LOGMSG];
                     SNPRINTF_CHECK(msg, STRINGMAXLEN_FPS_LOGMSG,
                                    "%s EXITFAIL STREAM_LOAD_FORCE_CONFNAME: File %s does not exist", sname, fname);
                     functionparameter_outlog("LOADMEMSTREAM", msg);
-                    SNPRINTF_CHECK(msg, STRINGMAXLEN_FPS_LOGMSG,
-                                   "%s imLOC %u", sname, *imLOC);
+                    SNPRINTF_CHECK(msg, STRINGMAXLEN_FPS_LOGMSG, "%s imLOC %u", sname, *imLOC);
                     functionparameter_outlog("LOADMEMSTREAM", msg);
                 }
             }
             else
             {
                 fscanfcnt = fscanf(fp, "%s", streamfname);
-                if(fscanfcnt == EOF)
+                if (fscanfcnt == EOF)
                 {
-                    if(ferror(fp))
+                    if (ferror(fp))
                     {
                         perror("fscanf");
                         *imLOC = STREAM_LOAD_SOURCE_EXITFAILURE; // fail
-                        if(MEMLOADREPORT == 1)
+                        if (MEMLOADREPORT == 1)
                         {
                             char msg[STRINGMAXLEN_FPS_LOGMSG];
                             SNPRINTF_CHECK(msg, STRINGMAXLEN_FPS_LOGMSG,
@@ -249,15 +218,15 @@ imageID COREMOD_IOFITS_LoadMemStream(
                         fprintf(stderr,
                                 "Error: fscanf reached end of file, no matching characters, no matching failure\n");
                         *imLOC = STREAM_LOAD_SOURCE_EXITFAILURE; // fail
-                        if(MEMLOADREPORT == 1)
+                        if (MEMLOADREPORT == 1)
                         {
                             char msg[STRINGMAXLEN_FPS_LOGMSG];
                             SNPRINTF_CHECK(msg, STRINGMAXLEN_FPS_LOGMSG,
-                                           "%s EXITFAIL STREAM_LOAD_FORCE_CONFNAME: fscanf reached end of file, no matching characters",
+                                           "%s EXITFAIL STREAM_LOAD_FORCE_CONFNAME: fscanf reached end of file, no "
+                                           "matching characters",
                                            sname);
                             functionparameter_outlog("LOADMEMSTREAM", msg);
-                            SNPRINTF_CHECK(msg, STRINGMAXLEN_FPS_LOGMSG,
-                                           "%s imLOC %u", sname, *imLOC);
+                            SNPRINTF_CHECK(msg, STRINGMAXLEN_FPS_LOGMSG, "%s imLOC %u", sname, *imLOC);
                             functionparameter_outlog("LOADMEMSTREAM", msg);
                         }
                     }
@@ -265,38 +234,36 @@ imageID COREMOD_IOFITS_LoadMemStream(
                 fclose(fp);
             }
 
-
-            if(*imLOC == STREAM_LOAD_SOURCE_NOTFOUND)
+            if (*imLOC == STREAM_LOAD_SOURCE_NOTFOUND)
             {
-                if(fscanfcnt > 0)
+                if (fscanfcnt > 0)
                 {
                     {
                         load_fits(streamfname, sname, 0, &ID);
-                        if(ID == -1)
+                        if (ID == -1)
                         {
                             *imLOC = STREAM_LOAD_SOURCE_EXITFAILURE; // fail
-                            if(MEMLOADREPORT == 1)
+                            if (MEMLOADREPORT == 1)
                             {
                                 char msg[STRINGMAXLEN_FPS_LOGMSG];
                                 SNPRINTF_CHECK(msg, STRINGMAXLEN_FPS_LOGMSG,
-                                               "%s EXITFAIL STREAM_LOAD_FORCE_CONFNAME: cannot load stream fname", sname);
+                                               "%s EXITFAIL STREAM_LOAD_FORCE_CONFNAME: cannot load stream fname",
+                                               sname);
                                 functionparameter_outlog("LOADMEMSTREAM", msg);
-                                SNPRINTF_CHECK(msg, STRINGMAXLEN_FPS_LOGMSG,
-                                               "%s imLOC %u", sname, *imLOC);
+                                SNPRINTF_CHECK(msg, STRINGMAXLEN_FPS_LOGMSG, "%s imLOC %u", sname, *imLOC);
                                 functionparameter_outlog("LOADMEMSTREAM", msg);
                             }
                         }
                         else
                         {
                             *imLOC = STREAM_LOAD_SOURCE_CONFNAME;
-                            if(MEMLOADREPORT == 1)
+                            if (MEMLOADREPORT == 1)
                             {
                                 char msg[STRINGMAXLEN_FPS_LOGMSG];
-                                SNPRINTF_CHECK(msg, STRINGMAXLEN_FPS_LOGMSG,
-                                               "%s SUCCESS STREAM_LOAD_FORCE_CONFFITS", sname);
+                                SNPRINTF_CHECK(msg, STRINGMAXLEN_FPS_LOGMSG, "%s SUCCESS STREAM_LOAD_FORCE_CONFFITS",
+                                               sname);
                                 functionparameter_outlog("LOADMEMSTREAM", msg);
-                                SNPRINTF_CHECK(msg, STRINGMAXLEN_FPS_LOGMSG,
-                                               "%s imLOC %u", sname, *imLOC);
+                                SNPRINTF_CHECK(msg, STRINGMAXLEN_FPS_LOGMSG, "%s imLOC %u", sname, *imLOC);
                                 functionparameter_outlog("LOADMEMSTREAM", msg);
                             }
                         }
@@ -306,29 +273,25 @@ imageID COREMOD_IOFITS_LoadMemStream(
         }
     }
 
-
-
     // SEARCH LOCALMEM
-    if(*imLOC == STREAM_LOAD_SOURCE_NOTFOUND)   // still searching
+    if (*imLOC == STREAM_LOAD_SOURCE_NOTFOUND) // still searching
     {
         //printf("imLOC = %d\n", *imLOC);
-        if(!(FPFLAG_STREAM_LOAD_SKIPSEARCH_LOCALMEM & *streamflag))
+        if (!(FPFLAG_STREAM_LOAD_SKIPSEARCH_LOCALMEM & *streamflag))
         {
-            if(MEMLOADREPORT == 1)
+            if (MEMLOADREPORT == 1)
             {
                 char msg[STRINGMAXLEN_FPS_LOGMSG];
-                SNPRINTF_CHECK(msg, STRINGMAXLEN_FPS_LOGMSG,
-                               "%s Search LOCALMEM", sname);
+                SNPRINTF_CHECK(msg, STRINGMAXLEN_FPS_LOGMSG, "%s Search LOCALMEM", sname);
                 functionparameter_outlog("LOADMEMSTREAM", msg);
             }
-            if(imLOCALMEM == 1)
+            if (imLOCALMEM == 1)
             {
                 *imLOC = STREAM_LOAD_SOURCE_LOCALMEM;
-                if(MEMLOADREPORT == 1)
+                if (MEMLOADREPORT == 1)
                 {
                     char msg[STRINGMAXLEN_FPS_LOGMSG];
-                    SNPRINTF_CHECK(msg, STRINGMAXLEN_FPS_LOGMSG,
-                                   "%s SUCCESS found image in LOCALMEM", sname);
+                    SNPRINTF_CHECK(msg, STRINGMAXLEN_FPS_LOGMSG, "%s SUCCESS found image in LOCALMEM", sname);
                     functionparameter_outlog("LOADMEMSTREAM", msg);
                     SNPRINTF_CHECK(msg, STRINGMAXLEN_FPS_LOGMSG, "%s imLOC %u", sname, *imLOC);
                     functionparameter_outlog("LOADMEMSTREAM", msg);
@@ -337,109 +300,93 @@ imageID COREMOD_IOFITS_LoadMemStream(
             else
             {
                 char msg[STRINGMAXLEN_FPS_LOGMSG];
-                SNPRINTF_CHECK(msg, STRINGMAXLEN_FPS_LOGMSG, "%s localmem stream not found",
-                               sname);
+                SNPRINTF_CHECK(msg, STRINGMAXLEN_FPS_LOGMSG, "%s localmem stream not found", sname);
                 functionparameter_outlog("LOADMEMSTREAM", msg);
             }
         }
         //printf("imLOC = %d\n", *imLOC);
     }
 
-
-
     // SEARCH SHAREMEM
-    if(*imLOC == STREAM_LOAD_SOURCE_NOTFOUND)   // still searching
+    if (*imLOC == STREAM_LOAD_SOURCE_NOTFOUND) // still searching
     {
-        if(!(FPFLAG_STREAM_LOAD_SKIPSEARCH_SHAREMEM & *streamflag))
+        if (!(FPFLAG_STREAM_LOAD_SKIPSEARCH_SHAREMEM & *streamflag))
         {
-            if(MEMLOADREPORT == 1)
+            if (MEMLOADREPORT == 1)
             {
                 char msg[STRINGMAXLEN_FPS_LOGMSG];
-                SNPRINTF_CHECK(msg, STRINGMAXLEN_FPS_LOGMSG,
-                               "%s Search SHAREMEM", sname);
+                SNPRINTF_CHECK(msg, STRINGMAXLEN_FPS_LOGMSG, "%s Search SHAREMEM", sname);
                 functionparameter_outlog("LOADMEMSTREAM", msg);
             }
             ID = read_sharedmem_image(sname);
-            if(ID != -1)
+            if (ID != -1)
             {
                 *imLOC = STREAM_LOAD_SOURCE_SHAREMEM;
-                if(MEMLOADREPORT == 1)
+                if (MEMLOADREPORT == 1)
                 {
                     char msg[STRINGMAXLEN_FPS_LOGMSG];
-                    SNPRINTF_CHECK(msg, STRINGMAXLEN_FPS_LOGMSG,
-                                   "%s SUCCESS found image in SHAREMEM", sname);
+                    SNPRINTF_CHECK(msg, STRINGMAXLEN_FPS_LOGMSG, "%s SUCCESS found image in SHAREMEM", sname);
                     functionparameter_outlog("LOADMEMSTREAM", msg);
-                    SNPRINTF_CHECK(msg, STRINGMAXLEN_FPS_LOGMSG,
-                                   "%s imLOC %u", sname, *imLOC);
+                    SNPRINTF_CHECK(msg, STRINGMAXLEN_FPS_LOGMSG, "%s imLOC %u", sname, *imLOC);
                     functionparameter_outlog("LOADMEMSTREAM", msg);
                 }
             }
             else
             {
                 char msg[STRINGMAXLEN_FPS_LOGMSG];
-                SNPRINTF_CHECK(msg, STRINGMAXLEN_FPS_LOGMSG,
-                               "%s sharedmem stream not found", sname);
+                SNPRINTF_CHECK(msg, STRINGMAXLEN_FPS_LOGMSG, "%s sharedmem stream not found", sname);
                 functionparameter_outlog("LOADMEMSTREAM", msg);
             }
         }
         //printf("imLOC = %d\n", *imLOC);
     }
 
-
-
     // SEARCH CONFFITS
-    if(*imLOC == STREAM_LOAD_SOURCE_NOTFOUND)   // still searching
+    if (*imLOC == STREAM_LOAD_SOURCE_NOTFOUND) // still searching
     {
-        if(!(FPFLAG_STREAM_LOAD_SKIPSEARCH_CONFFITS & *streamflag))
+        if (!(FPFLAG_STREAM_LOAD_SKIPSEARCH_CONFFITS & *streamflag))
         {
-            if(MEMLOADREPORT == 1)
+            if (MEMLOADREPORT == 1)
             {
                 char msg[STRINGMAXLEN_FPS_LOGMSG];
-                SNPRINTF_CHECK(msg, STRINGMAXLEN_FPS_LOGMSG,
-                               "%s Search CONFFITS", sname);
+                SNPRINTF_CHECK(msg, STRINGMAXLEN_FPS_LOGMSG, "%s Search CONFFITS", sname);
                 functionparameter_outlog("LOADMEMSTREAM", msg);
             }
             //printf("imLOC = %d\n", *imLOC);
             char fname[STRINGMAXLEN_FULLFILENAME];
             WRITE_FULLFILENAME(fname, "./conf/shmim.%s.fits", sname);
             load_fits(fname, sname, 0, &ID);
-            if(ID != -1)
+            if (ID != -1)
             {
                 *imLOC = STREAM_LOAD_SOURCE_CONFFITS;
-                if(MEMLOADREPORT == 1)
+                if (MEMLOADREPORT == 1)
                 {
                     char msg[STRINGMAXLEN_FPS_LOGMSG];
-                    SNPRINTF_CHECK(msg, STRINGMAXLEN_FPS_LOGMSG,
-                                   "%s SUCCESS found image in CONFFITS", sname);
+                    SNPRINTF_CHECK(msg, STRINGMAXLEN_FPS_LOGMSG, "%s SUCCESS found image in CONFFITS", sname);
                     functionparameter_outlog("LOADMEMSTREAM", msg);
-                    SNPRINTF_CHECK(msg, STRINGMAXLEN_FPS_LOGMSG,
-                                   "%s imLOC %u", sname, *imLOC);
+                    SNPRINTF_CHECK(msg, STRINGMAXLEN_FPS_LOGMSG, "%s imLOC %u", sname, *imLOC);
                     functionparameter_outlog("LOADMEMSTREAM", msg);
                 }
             }
             else
             {
                 char msg[STRINGMAXLEN_FPS_LOGMSG];
-                SNPRINTF_CHECK(msg, STRINGMAXLEN_FPS_LOGMSG,
-                               "%s File %s not found", sname, fname);
+                SNPRINTF_CHECK(msg, STRINGMAXLEN_FPS_LOGMSG, "%s File %s not found", sname, fname);
                 functionparameter_outlog("LOADMEMSTREAM", msg);
             }
             // printf("imLOC = %d\n", *imLOC);
         }
     }
 
-
-
     // SEARCH CONFNAME
-    if(*imLOC == STREAM_LOAD_SOURCE_NOTFOUND)   // still searching
+    if (*imLOC == STREAM_LOAD_SOURCE_NOTFOUND) // still searching
     {
-        if(!(FPFLAG_STREAM_LOAD_SKIPSEARCH_CONFNAME & *streamflag))
+        if (!(FPFLAG_STREAM_LOAD_SKIPSEARCH_CONFNAME & *streamflag))
         {
-            if(MEMLOADREPORT == 1)
+            if (MEMLOADREPORT == 1)
             {
                 char msg[STRINGMAXLEN_FPS_LOGMSG];
-                SNPRINTF_CHECK(msg, STRINGMAXLEN_FPS_LOGMSG,
-                               "%s Search CONFNAME", sname);
+                SNPRINTF_CHECK(msg, STRINGMAXLEN_FPS_LOGMSG, "%s Search CONFNAME", sname);
                 functionparameter_outlog("LOADMEMSTREAM", msg);
             }
 
@@ -452,14 +399,13 @@ imageID COREMOD_IOFITS_LoadMemStream(
             sprintf(fname, "./conf/shmim.%s.fname.txt", sname);
 
             fp = fopen(fname, "r");
-            if(fp == NULL)
+            if (fp == NULL)
             {
                 printf("ERROR: stream %s could not be loaded from CONF\n", sname);
-                if(MEMLOADREPORT == 1)
+                if (MEMLOADREPORT == 1)
                 {
                     char msg[STRINGMAXLEN_FPS_LOGMSG];
-                    SNPRINTF_CHECK(msg, STRINGMAXLEN_FPS_LOGMSG,
-                                   "%s Cannot find CONFNAME file %s", sname, fname);
+                    SNPRINTF_CHECK(msg, STRINGMAXLEN_FPS_LOGMSG, "%s Cannot find CONFNAME file %s", sname, fname);
                     functionparameter_outlog("LOADMEMSTREAM", msg);
                     // don't fail... keep going
                 }
@@ -467,20 +413,19 @@ imageID COREMOD_IOFITS_LoadMemStream(
             else
             {
                 fscanfcnt = fscanf(fp, "%s", streamfname);
-                if(fscanfcnt == EOF)
+                if (fscanfcnt == EOF)
                 {
-                    if(ferror(fp))
+                    if (ferror(fp))
                     {
                         perror("fscanf");
                         *imLOC = STREAM_LOAD_SOURCE_EXITFAILURE; // fail
-                        if(MEMLOADREPORT == 1)
+                        if (MEMLOADREPORT == 1)
                         {
                             char msg[STRINGMAXLEN_FPS_LOGMSG];
-                            SNPRINTF_CHECK(msg, STRINGMAXLEN_FPS_LOGMSG,
-                                           "%s EXITFAILURE fscanf error reading %s", sname,  fname);
+                            SNPRINTF_CHECK(msg, STRINGMAXLEN_FPS_LOGMSG, "%s EXITFAILURE fscanf error reading %s",
+                                           sname, fname);
                             functionparameter_outlog("LOADMEMSTREAM", msg);
-                            SNPRINTF_CHECK(msg, STRINGMAXLEN_FPS_LOGMSG,
-                                           "%s imLOC %u", sname, *imLOC);
+                            SNPRINTF_CHECK(msg, STRINGMAXLEN_FPS_LOGMSG, "%s imLOC %u", sname, *imLOC);
                             functionparameter_outlog("LOADMEMSTREAM", msg);
                         }
                     }
@@ -489,15 +434,15 @@ imageID COREMOD_IOFITS_LoadMemStream(
                         fprintf(stderr,
                                 "Error: fscanf reached end of file, no matching characters, no matching failure\n");
                         *imLOC = STREAM_LOAD_SOURCE_EXITFAILURE; // fail
-                        if(MEMLOADREPORT == 1)
+                        if (MEMLOADREPORT == 1)
                         {
                             char msg[STRINGMAXLEN_FPS_LOGMSG];
                             SNPRINTF_CHECK(msg, STRINGMAXLEN_FPS_LOGMSG,
-                                           "%s EXITFAILURE fscanf error reading %s. fscanf reached end of file, no matching characters",
+                                           "%s EXITFAILURE fscanf error reading %s. fscanf reached end of file, no "
+                                           "matching characters",
                                            sname, fname);
                             functionparameter_outlog("LOADMEMSTREAM", msg);
-                            SNPRINTF_CHECK(msg, STRINGMAXLEN_FPS_LOGMSG,
-                                           "%s imLOC %u", sname, *imLOC);
+                            SNPRINTF_CHECK(msg, STRINGMAXLEN_FPS_LOGMSG, "%s imLOC %u", sname, *imLOC);
                             functionparameter_outlog("LOADMEMSTREAM", msg);
                         }
                     }
@@ -505,27 +450,24 @@ imageID COREMOD_IOFITS_LoadMemStream(
                 fclose(fp);
             }
 
-            if(*imLOC == STREAM_LOAD_SOURCE_NOTFOUND)
+            if (*imLOC == STREAM_LOAD_SOURCE_NOTFOUND)
             {
-                if(fscanfcnt > 0)
+                if (fscanfcnt > 0)
                 {
                     {
                         char msg[STRINGMAXLEN_FPS_LOGMSG];
-                        SNPRINTF_CHECK(msg, STRINGMAXLEN_FPS_LOGMSG,
-                                       "%s LOADING %s", sname, streamfname);
+                        SNPRINTF_CHECK(msg, STRINGMAXLEN_FPS_LOGMSG, "%s LOADING %s", sname, streamfname);
                         functionparameter_outlog("LOADMEMSTREAM", msg);
                         load_fits(streamfname, sname, 0, &ID);
-                        if(ID != -1)
+                        if (ID != -1)
                         {
                             *imLOC = STREAM_LOAD_SOURCE_CONFNAME;
                             updateCONFFITS = 1;
-                            if(MEMLOADREPORT == 1)
+                            if (MEMLOADREPORT == 1)
                             {
                                 SNPRINTF_CHECK(msg, STRINGMAXLEN_FPS_LOGMSG, "%s SUCCESS CONFNAME", sname);
-                                functionparameter_outlog("LOADMEMSTREAM", msg)
-                                ;
-                                SNPRINTF_CHECK(msg, STRINGMAXLEN_FPS_LOGMSG,
-                                               "%s imLOC %u", sname, *imLOC);
+                                functionparameter_outlog("LOADMEMSTREAM", msg);
+                                SNPRINTF_CHECK(msg, STRINGMAXLEN_FPS_LOGMSG, "%s imLOC %u", sname, *imLOC);
                                 functionparameter_outlog("LOADMEMSTREAM", msg);
                             }
                         }
@@ -536,102 +478,88 @@ imageID COREMOD_IOFITS_LoadMemStream(
         }
     }
 
-
     // copy to shared memory
-    if(*imLOC == STREAM_LOAD_SOURCE_LOCALMEM)
-        if(FPFLAG_STREAM_LOAD_UPDATE_SHAREMEM & *streamflag)
+    if (*imLOC == STREAM_LOAD_SOURCE_LOCALMEM)
+        if (FPFLAG_STREAM_LOAD_UPDATE_SHAREMEM & *streamflag)
         {
-            if(MEMLOADREPORT == 1)
+            if (MEMLOADREPORT == 1)
             {
                 char msg[STRINGMAXLEN_FPS_LOGMSG];
-                SNPRINTF_CHECK(msg, STRINGMAXLEN_FPS_LOGMSG,
-                               "%s copy to SHAREMEM", sname);
+                SNPRINTF_CHECK(msg, STRINGMAXLEN_FPS_LOGMSG, "%s copy to SHAREMEM", sname);
                 functionparameter_outlog("LOADMEMSTREAM", msg);
             }
             copy_image_ID(sname, sname, 1);
         }
 
-
-
     // copy to conf FITS
-    if((*imLOC != STREAM_LOAD_SOURCE_NOTFOUND)
-            && (*imLOC != STREAM_LOAD_SOURCE_CONFFITS))
-        if(FPFLAG_STREAM_LOAD_UPDATE_CONFFITS & *streamflag)
+    if ((*imLOC != STREAM_LOAD_SOURCE_NOTFOUND) && (*imLOC != STREAM_LOAD_SOURCE_CONFFITS))
+        if (FPFLAG_STREAM_LOAD_UPDATE_CONFFITS & *streamflag)
         {
             updateCONFFITS = 1;
         }
-    if(updateCONFFITS == 1)
+    if (updateCONFFITS == 1)
     {
         char fname[STRINGMAXLEN_FULLFILENAME];
-        if(MEMLOADREPORT == 1)
+        if (MEMLOADREPORT == 1)
         {
             char msg[STRINGMAXLEN_FPS_LOGMSG];
-            SNPRINTF_CHECK(msg, STRINGMAXLEN_FPS_LOGMSG,
-                           "%s copy to CONFFITS", sname);
+            SNPRINTF_CHECK(msg, STRINGMAXLEN_FPS_LOGMSG, "%s copy to CONFFITS", sname);
             functionparameter_outlog("LOADMEMSTREAM", msg);
         }
         WRITE_FULLFILENAME(fname, "./conf/shmim.%s.fits", sname);
         save_fits(sname, fname);
     }
 
-
-
-    if((int) *imLOC == STREAM_LOAD_SOURCE_EXITFAILURE)
+    if ((int)*imLOC == STREAM_LOAD_SOURCE_EXITFAILURE)
     {
         *imLOC = STREAM_LOAD_SOURCE_NOTFOUND;
     }
 
-
-    if(MEMLOADREPORT == 1)
+    if (MEMLOADREPORT == 1)
     {
         char msg[STRINGMAXLEN_FPS_LOGMSG];
         char locstring[100];
 
-        switch(*imLOC)
+        switch (*imLOC)
         {
 
-            case STREAM_LOAD_SOURCE_NOTFOUND :
-                strcpy(locstring, STREAM_LOAD_SOURCE_NOTFOUND_STRING);
-                break;
+        case STREAM_LOAD_SOURCE_NOTFOUND:
+            strcpy(locstring, STREAM_LOAD_SOURCE_NOTFOUND_STRING);
+            break;
 
-            case STREAM_LOAD_SOURCE_LOCALMEM :
-                strcpy(locstring, STREAM_LOAD_SOURCE_LOCALMEM_STRING);
-                break;
+        case STREAM_LOAD_SOURCE_LOCALMEM:
+            strcpy(locstring, STREAM_LOAD_SOURCE_LOCALMEM_STRING);
+            break;
 
-            case STREAM_LOAD_SOURCE_SHAREMEM :
-                strcpy(locstring, STREAM_LOAD_SOURCE_SHAREMEM_STRING);
-                break;
+        case STREAM_LOAD_SOURCE_SHAREMEM:
+            strcpy(locstring, STREAM_LOAD_SOURCE_SHAREMEM_STRING);
+            break;
 
-            case STREAM_LOAD_SOURCE_CONFFITS :
-                strcpy(locstring, STREAM_LOAD_SOURCE_CONFFITS_STRING);
-                break;
+        case STREAM_LOAD_SOURCE_CONFFITS:
+            strcpy(locstring, STREAM_LOAD_SOURCE_CONFFITS_STRING);
+            break;
 
-            case STREAM_LOAD_SOURCE_CONFNAME :
-                strcpy(locstring, STREAM_LOAD_SOURCE_CONFNAME_STRING);
-                break;
+        case STREAM_LOAD_SOURCE_CONFNAME:
+            strcpy(locstring, STREAM_LOAD_SOURCE_CONFNAME_STRING);
+            break;
 
-            case STREAM_LOAD_SOURCE_NULL :
-                strcpy(locstring, STREAM_LOAD_SOURCE_NULL_STRING);
-                break;
+        case STREAM_LOAD_SOURCE_NULL:
+            strcpy(locstring, STREAM_LOAD_SOURCE_NULL_STRING);
+            break;
 
-            case STREAM_LOAD_SOURCE_EXITFAILURE :
-                strcpy(locstring, STREAM_LOAD_SOURCE_EXITFAILURE_STRING);
-                break;
+        case STREAM_LOAD_SOURCE_EXITFAILURE:
+            strcpy(locstring, STREAM_LOAD_SOURCE_EXITFAILURE_STRING);
+            break;
 
-            default :
-                strcpy(locstring, "unknown");
-                break;
+        default:
+            strcpy(locstring, "unknown");
+            break;
         }
 
-
-        SNPRINTF_CHECK(msg, STRINGMAXLEN_FPS_LOGMSG, "%s FINAL imLOC %u %s", sname,
-                       *imLOC, locstring);
+        SNPRINTF_CHECK(msg, STRINGMAXLEN_FPS_LOGMSG, "%s FINAL imLOC %u %s", sname, *imLOC, locstring);
 
         functionparameter_outlog("LOADMEMSTREAM", msg);
     }
 
     return ID;
 }
-
-
-
diff --git a/src/COREMOD_iofits/loadmemstream.h b/src/COREMOD_iofits/loadmemstream.h
index 5a019723..19999f03 100644
--- a/src/COREMOD_iofits/loadmemstream.h
+++ b/src/COREMOD_iofits/loadmemstream.h
@@ -2,9 +2,4 @@
  * @file    loadmemstream.h
  */
 
-
-imageID COREMOD_IOFITS_LoadMemStream(
-    const char *sname,
-    uint64_t   *streamflag,
-    uint32_t   *imLOC
-);
+imageID COREMOD_IOFITS_LoadMemStream(const char *sname, uint64_t *streamflag, uint32_t *imLOC);
diff --git a/src/COREMOD_iofits/read_keyword.c b/src/COREMOD_iofits/read_keyword.c
index d60f4eef..3d6977d8 100644
--- a/src/COREMOD_iofits/read_keyword.c
+++ b/src/COREMOD_iofits/read_keyword.c
@@ -2,33 +2,25 @@
  * @file    read_keyword.c
  */
 
-
 #include "CommandLineInterface/CLIcore.h"
 
 #include "COREMOD_iofits_common.h"
 #include "check_fitsio_status.h"
 
-
 extern COREMOD_IOFITS_DATA COREMOD_iofits_data;
 
-
-
-int read_keyword(
-    const char *restrict file_name,
-    const char *restrict KEYWORD,
-    char *restrict content
-)
+int read_keyword(const char *restrict file_name, const char *restrict KEYWORD, char *restrict content)
 {
-    fitsfile *fptr;         /* FITS file pointer, defined in fitsio.h */
+    fitsfile *fptr; /* FITS file pointer, defined in fitsio.h */
     int exists = 0;
     int n;
 
-    if(!fits_open_file(&fptr, file_name, READONLY, &COREMOD_iofits_data.FITSIO_status))
+    if (!fits_open_file(&fptr, file_name, READONLY, &COREMOD_iofits_data.FITSIO_status))
     {
         char comment[STRINGMAXLEN_FITSKEYWCOMMENT];
         char str1[STRINGMAXLEN_FITSKEYWORDVALUE];
 
-        if(fits_read_keyword(fptr, KEYWORD, str1, comment, &COREMOD_iofits_data.FITSIO_status))
+        if (fits_read_keyword(fptr, KEYWORD, str1, comment, &COREMOD_iofits_data.FITSIO_status))
         {
             PRINT_ERROR("Keyword \"%s\" does not exist in file \"%s\"", KEYWORD, file_name);
             exists = 1;
@@ -36,32 +28,26 @@ int read_keyword(
         else
         {
             n = snprintf(content, STRINGMAXLEN_FITSKEYWORDVALUE, "%s\n", str1);
-            if(n >= STRINGMAXLEN_FITSKEYWORDVALUE)
+            if (n >= STRINGMAXLEN_FITSKEYWORDVALUE)
             {
                 PRINT_ERROR("Attempted to write string buffer with too many characters");
             }
         }
         fits_close_file(fptr, &COREMOD_iofits_data.FITSIO_status);
     }
-    if(check_FITSIO_status(__FILE__, __func__, __LINE__, 0) == 1)
+    if (check_FITSIO_status(__FILE__, __func__, __LINE__, 0) == 1)
     {
-        PRINT_ERROR("Error reading keyword \"%s\" in file \"%s\"", KEYWORD, file_name);       
+        PRINT_ERROR("Error reading keyword \"%s\" in file \"%s\"", KEYWORD, file_name);
     }
 
-    return(exists);
+    return (exists);
 }
 
-
-
-
-errno_t read_keyword_alone(
-    const char *restrict file_name,
-    const char *restrict KEYWORD
-)
+errno_t read_keyword_alone(const char *restrict file_name, const char *restrict KEYWORD)
 {
-    char *content = (char *) malloc(sizeof(char) * STRINGMAXLEN_FITSKEYWORDVALUE);
+    char *content = (char *)malloc(sizeof(char) * STRINGMAXLEN_FITSKEYWORDVALUE);
 
-    if(content == NULL)
+    if (content == NULL)
     {
         PRINT_ERROR("malloc error");
         exit(0);
@@ -75,4 +61,3 @@ errno_t read_keyword_alone(
 
     return RETURN_SUCCESS;
 }
-
diff --git a/src/COREMOD_iofits/read_keyword.h b/src/COREMOD_iofits/read_keyword.h
index 6bea1cce..0a3c8d50 100644
--- a/src/COREMOD_iofits/read_keyword.h
+++ b/src/COREMOD_iofits/read_keyword.h
@@ -2,15 +2,6 @@
  * @file    read_keyword.h
  */
 
+int read_keyword(const char *restrict file_name, const char *restrict KEYWORD, char *restrict content);
 
-
-int read_keyword(
-    const char *restrict file_name,
-    const char *restrict KEYWORD,
-    char *restrict content
-);
-
-errno_t read_keyword_alone(
-    const char *restrict file_name,
-    const char *restrict KEYWORD
-);
+errno_t read_keyword_alone(const char *restrict file_name, const char *restrict KEYWORD);
diff --git a/src/COREMOD_iofits/savefits.c b/src/COREMOD_iofits/savefits.c
index f1750fc7..6a0de606 100644
--- a/src/COREMOD_iofits/savefits.c
+++ b/src/COREMOD_iofits/savefits.c
@@ -3,10 +3,8 @@
  * @brief   save FITS format files
  */
 
-
 #include "CommandLineInterface/CLIcore.h"
 
-
 #include <pthread.h>
 
 // Handle old fitsios
@@ -14,18 +12,14 @@
 #define ULONGLONG_IMG (80)
 #endif
 
-#include "COREMOD_memory/COREMOD_memory.h"
 #include "COREMOD_iofits_common.h"
+#include "COREMOD_memory/COREMOD_memory.h"
 #include "check_fitsio_status.h"
 #include "file_exists.h"
 #include "is_fits_file.h"
 
 extern COREMOD_IOFITS_DATA COREMOD_iofits_data;
 
-
-
-
-
 // variables local to this translation unit
 static char *inimname;
 static char *outfname;
@@ -33,58 +27,24 @@ static int *outbitpix;
 static char *inheader; // import header from this file
 
 // CLI function arguments and parameters
-static CLICMDARGDEF farg[] =
-{
-    {
-        CLIARG_IMG, ".in_name", "input image", "im1",
-        CLIARG_VISIBLE_DEFAULT,
-        (void **) &inimname, NULL
-    },
-    {
-        CLIARG_STR, ".out_fname", "output FITS file name", "out.fits",
-        CLIARG_VISIBLE_DEFAULT,
-        (void **) &outfname, NULL
-    },
-    {
-        // non-CLI parameter
-        CLIARG_LONG, ".bitpix",
-        "0: auto\n"
-        "8 /(10) : (un)sig   8-b int\n"
-        "16/(20) 32/(40) 64/(80) : (un)sig int\n"
-        "-32/-64 : 32/64-b flt\n"
-        , "0",
-        CLIARG_HIDDEN_DEFAULT,
-        (void **) &outbitpix, NULL
-    },
-    {
-        CLIARG_STR, ".in_header", "header import from this FITS file", "",
-        CLIARG_HIDDEN_DEFAULT,
-        (void **) &inheader, NULL
-    }
-};
-
+static CLICMDARGDEF farg[] = {
+    {CLIARG_IMG, ".in_name", "input image", "im1", CLIARG_VISIBLE_DEFAULT, (void **)&inimname, NULL},
+    {CLIARG_STR, ".out_fname", "output FITS file name", "out.fits", CLIARG_VISIBLE_DEFAULT, (void **)&outfname, NULL},
+    {// non-CLI parameter
+     CLIARG_LONG, ".bitpix",
+     "0: auto\n"
+     "8 /(10) : (un)sig   8-b int\n"
+     "16/(20) 32/(40) 64/(80) : (un)sig int\n"
+     "-32/-64 : 32/64-b flt\n",
+     "0", CLIARG_HIDDEN_DEFAULT, (void **)&outbitpix, NULL},
+    {CLIARG_STR, ".in_header", "header import from this FITS file", "", CLIARG_HIDDEN_DEFAULT, (void **)&inheader,
+     NULL}};
 
 // CLI function initialization data
-static CLICMDDATA CLIcmddata =
-{
-    "saveFITS",
-    "save image as FITS",
-    CLICMD_FIELDS_DEFAULTS
-};
-
-
+static CLICMDDATA CLIcmddata = {"saveFITS", "save image as FITS", CLICMD_FIELDS_DEFAULTS};
 
 // detailed help
-static errno_t help_function()
-{
-    return RETURN_SUCCESS;
-}
-
-
-
-
-
-
+static errno_t help_function() { return RETURN_SUCCESS; }
 
 /**
  * @brief Write FITS file
@@ -97,21 +57,11 @@ static errno_t help_function()
  * @param kwarraysize       number of keywords in optional keyword array. Set to 0 if unused.
  * @return errno_t
  */
-errno_t saveFITS(
-    const char *__restrict inputimname,
-    const char *__restrict outputFITSname,
-    int outputbitpix,
-    const char *__restrict importheaderfile,
-    IMAGE_KEYWORD *kwarray,
-    int kwarraysize
-)
+errno_t saveFITS(const char *__restrict inputimname, const char *__restrict outputFITSname, int outputbitpix,
+                 const char *__restrict importheaderfile, IMAGE_KEYWORD *kwarray, int kwarraysize)
 {
     DEBUG_TRACE_FSTART();
-    DEBUG_TRACEPOINT("Saving image %s to file %s, bitpix = %d",
-                     inputimname,
-                     outputFITSname,
-                     outputbitpix);
-
+    DEBUG_TRACEPOINT("Saving image %s to file %s, bitpix = %d", inputimname, outputFITSname, outputbitpix);
 
     COREMOD_iofits_data.FITSIO_status = 0;
 
@@ -128,25 +78,18 @@ errno_t saveFITS(
                        (int) getpid(),
                        (long) self_id);
     */
-    WRITE_FILENAME(fnametmp,
-                   "%s.%d.%ld.tmp",
-                   outputFITSname,
-                   (int) getpid(),
-                   (long) self_id);
+    WRITE_FILENAME(fnametmp, "%s.%d.%ld.tmp", outputFITSname, (int)getpid(), (long)self_id);
     printf("temp name : %s\n", fnametmp);
 
-
     IMGID imgin = makeIMGID(inputimname);
     resolveIMGID(&imgin, ERRMODE_WARN);
-    if(imgin.ID == -1)
+    if (imgin.ID == -1)
     {
-        PRINT_WARNING("Image %s does not exist in memory - cannot save to FITS",
-                      inputimname);
+        PRINT_WARNING("Image %s does not exist in memory - cannot save to FITS", inputimname);
         DEBUG_TRACE_FEXIT();
         return RETURN_SUCCESS;
     }
 
-
     // data types
     uint8_t datatype = imgin.md->datatype;
     int FITSIOdatatype = TFLOAT;
@@ -154,166 +97,155 @@ errno_t saveFITS(
 
     char *datainptr;
 
-    DEBUG_TRACEPOINT("datatype = %d", (int) datatype);
-    switch(datatype)
+    DEBUG_TRACEPOINT("datatype = %d", (int)datatype);
+    switch (datatype)
     {
-        case _DATATYPE_UINT8:
-            FITSIOdatatype = TBYTE;
-            bitpix = BYTE_IMG;
-            datainptr = (char *) imgin.im->array.UI8;
-            break;
-
-        case _DATATYPE_INT8:
-            FITSIOdatatype = TSBYTE;
-            bitpix = SBYTE_IMG;
-            datainptr = (char *) imgin.im->array.SI8;
-            break;
-
-
-        case _DATATYPE_UINT16:
-            FITSIOdatatype = TUSHORT;
-            bitpix = SHORT_IMG;
-            datainptr = (char *) imgin.im->array.UI16;
-            break;
-
-        case _DATATYPE_INT16:
-            FITSIOdatatype = TUSHORT;
-            bitpix = SHORT_IMG;
-            datainptr = (char *) imgin.im->array.SI16;
-            break;
-
-
-        case _DATATYPE_UINT32:
-            FITSIOdatatype = TUINT;
-            bitpix = ULONG_IMG;
-            datainptr = (char *) imgin.im->array.UI32;
-            break;
-
-        case _DATATYPE_INT32:
-            FITSIOdatatype = TINT;
-            bitpix = LONG_IMG;
-            datainptr = (char *) imgin.im->array.SI32;
-            break;
-
-
-        case _DATATYPE_UINT64:
-            FITSIOdatatype = TULONG;
-            bitpix = ULONGLONG_IMG;
-            datainptr = (char *) imgin.im->array.UI64;
-            break;
-
-        case _DATATYPE_INT64:
-            FITSIOdatatype = TLONG;
-            bitpix = LONGLONG_IMG;
-            datainptr = (char *) imgin.im->array.SI64;
-            break;
-
-
-        case _DATATYPE_FLOAT:
-            FITSIOdatatype = TFLOAT;
-            bitpix = FLOAT_IMG;
-            datainptr = (char *) imgin.im->array.F;
-            break;
-
-        case _DATATYPE_DOUBLE:
-            FITSIOdatatype = TDOUBLE;
-            bitpix = DOUBLE_IMG;
-            datainptr = (char *) imgin.im->array.D;
-            break;
+    case _DATATYPE_UINT8:
+        FITSIOdatatype = TBYTE;
+        bitpix = BYTE_IMG;
+        datainptr = (char *)imgin.im->array.UI8;
+        break;
+
+    case _DATATYPE_INT8:
+        FITSIOdatatype = TSBYTE;
+        bitpix = SBYTE_IMG;
+        datainptr = (char *)imgin.im->array.SI8;
+        break;
+
+    case _DATATYPE_UINT16:
+        FITSIOdatatype = TUSHORT;
+        bitpix = SHORT_IMG;
+        datainptr = (char *)imgin.im->array.UI16;
+        break;
+
+    case _DATATYPE_INT16:
+        FITSIOdatatype = TUSHORT;
+        bitpix = SHORT_IMG;
+        datainptr = (char *)imgin.im->array.SI16;
+        break;
+
+    case _DATATYPE_UINT32:
+        FITSIOdatatype = TUINT;
+        bitpix = ULONG_IMG;
+        datainptr = (char *)imgin.im->array.UI32;
+        break;
+
+    case _DATATYPE_INT32:
+        FITSIOdatatype = TINT;
+        bitpix = LONG_IMG;
+        datainptr = (char *)imgin.im->array.SI32;
+        break;
+
+    case _DATATYPE_UINT64:
+        FITSIOdatatype = TULONG;
+        bitpix = ULONGLONG_IMG;
+        datainptr = (char *)imgin.im->array.UI64;
+        break;
+
+    case _DATATYPE_INT64:
+        FITSIOdatatype = TLONG;
+        bitpix = LONGLONG_IMG;
+        datainptr = (char *)imgin.im->array.SI64;
+        break;
+
+    case _DATATYPE_FLOAT:
+        FITSIOdatatype = TFLOAT;
+        bitpix = FLOAT_IMG;
+        datainptr = (char *)imgin.im->array.F;
+        break;
+
+    case _DATATYPE_DOUBLE:
+        FITSIOdatatype = TDOUBLE;
+        bitpix = DOUBLE_IMG;
+        datainptr = (char *)imgin.im->array.D;
+        break;
     }
 
     DEBUG_TRACEPOINT("bitpix = %d", bitpix);
 
-    switch(outputbitpix)
+    switch (outputbitpix)
     {
-        case 8:
-            bitpix = BYTE_IMG;
-            printf("    output data type: BYTE_IMG\n");
-            break;
-        case 10:
-            bitpix = SBYTE_IMG;
-            printf("    output data type: SBYTE_IMG\n");
-            break;
-
-        case 16:
-            bitpix = SHORT_IMG;
-            printf("    output data type: SHORT_IMG\n");
-            break;
-        case 20:
-            bitpix = USHORT_IMG;
-            printf("    output data type: USHORT_IMG\n");
-            break;
-
-        case 32:
-            bitpix = LONG_IMG;
-            printf("    output data type: LONG_IMG\n");
-            break;
-        case 40:
-            bitpix = ULONG_IMG;
-            printf("    output data type: ULONG_IMG\n");
-            break;
-
-        case 64:
-            bitpix = LONGLONG_IMG;
-            printf("    output data type: LONGLONG_IMG\n");
-            break;
-        case 80:
-            bitpix = ULONGLONG_IMG;
-            printf("    output data type: ULONGLONG_IMG\n");
-            break;
-
-        case -32:
-            bitpix = FLOAT_IMG;
-            printf("    output data type: FLOAT_IMG\n");
-            break;
-        case -64:
-            bitpix = DOUBLE_IMG;
-            printf("    output data type: DOUBLE_IMG\n");
-            break;
+    case 8:
+        bitpix = BYTE_IMG;
+        printf("    output data type: BYTE_IMG\n");
+        break;
+    case 10:
+        bitpix = SBYTE_IMG;
+        printf("    output data type: SBYTE_IMG\n");
+        break;
+
+    case 16:
+        bitpix = SHORT_IMG;
+        printf("    output data type: SHORT_IMG\n");
+        break;
+    case 20:
+        bitpix = USHORT_IMG;
+        printf("    output data type: USHORT_IMG\n");
+        break;
+
+    case 32:
+        bitpix = LONG_IMG;
+        printf("    output data type: LONG_IMG\n");
+        break;
+    case 40:
+        bitpix = ULONG_IMG;
+        printf("    output data type: ULONG_IMG\n");
+        break;
+
+    case 64:
+        bitpix = LONGLONG_IMG;
+        printf("    output data type: LONGLONG_IMG\n");
+        break;
+    case 80:
+        bitpix = ULONGLONG_IMG;
+        printf("    output data type: ULONGLONG_IMG\n");
+        break;
+
+    case -32:
+        bitpix = FLOAT_IMG;
+        printf("    output data type: FLOAT_IMG\n");
+        break;
+    case -64:
+        bitpix = DOUBLE_IMG;
+        printf("    output data type: DOUBLE_IMG\n");
+        break;
     }
 
     DEBUG_TRACEPOINT("bitpix = %d", bitpix);
 
-
     fitsfile *fptr;
     COREMOD_iofits_data.FITSIO_status = 0;
     DEBUG_TRACEPOINT("creating FITS file %s", fnametmp);
     fits_create_file(&fptr, fnametmp, &COREMOD_iofits_data.FITSIO_status);
     DEBUG_TRACEPOINT(" ");
 
-    if(check_FITSIO_status(__FILE__, __func__, __LINE__, 1) != 0)
+    if (check_FITSIO_status(__FILE__, __func__, __LINE__, 1) != 0)
     {
         char errstring[200];
-        if(access(fnametmp, F_OK) == 0)
+        if (access(fnametmp, F_OK) == 0)
         {
             sprintf(errstring, "File already exists");
         }
-        PRINT_ERROR("fits_create_file error %d on file %s %s",
-                    COREMOD_iofits_data.FITSIO_status, fnametmp, errstring);
+        PRINT_ERROR("fits_create_file error %d on file %s %s", COREMOD_iofits_data.FITSIO_status, fnametmp, errstring);
         abort();
     }
 
-
-
-
-
     int naxis = imgin.md->naxis;
     long naxesl[3];
-    for(int i = 0; i < naxis; i++)
+    for (int i = 0; i < naxis; i++)
     {
-        naxesl[i] = (long) imgin.md->size[i];
+        naxesl[i] = (long)imgin.md->size[i];
     }
 
     long nelements = 1;
-    for(int i = 0; i < naxis; i++)
+    for (int i = 0; i < naxis; i++)
     {
         nelements *= naxesl[i];
     }
 
     COREMOD_iofits_data.FITSIO_status = 0;
-    fits_create_img(fptr, bitpix, naxis, naxesl,
-                    &COREMOD_iofits_data.FITSIO_status);
-    if(check_FITSIO_status(__FILE__, __func__, __LINE__, 1) != 0)
+    fits_create_img(fptr, bitpix, naxis, naxesl, &COREMOD_iofits_data.FITSIO_status);
+    if (check_FITSIO_status(__FILE__, __func__, __LINE__, 1) != 0)
     {
         PRINT_ERROR("fits_create_img error on file %s", fnametmp);
         EXECUTE_SYSTEM_COMMAND("rm %s", fnametmp);
@@ -322,16 +254,13 @@ errno_t saveFITS(
 
     DEBUG_TRACEPOINT(" ");
 
-
-
     DEBUG_TRACEPOINT("Adding optional header");
     // HEADER
 
-
     // Add FITS keywords from importheaderfile (optional)
-    if(strlen(importheaderfile) > 0)
+    if (strlen(importheaderfile) > 0)
     {
-        if(is_fits_file(importheaderfile) == 1)
+        if (is_fits_file(importheaderfile) == 1)
         {
             printf("Importing FITS header entries from : %s\n", importheaderfile);
 
@@ -341,19 +270,16 @@ errno_t saveFITS(
             char *header;
 
             COREMOD_iofits_data.FITSIO_status = 0;
-            fits_open_file(&fptr_header, importheaderfile, READONLY,
-                           &COREMOD_iofits_data.FITSIO_status);
-            if(check_FITSIO_status(__FILE__, __func__, __LINE__, 1) != 0)
+            fits_open_file(&fptr_header, importheaderfile, READONLY, &COREMOD_iofits_data.FITSIO_status);
+            if (check_FITSIO_status(__FILE__, __func__, __LINE__, 1) != 0)
             {
                 PRINT_ERROR("fits_open_file error on file %s", importheaderfile);
                 abort();
             }
 
-
             COREMOD_iofits_data.FITSIO_status = 0;
-            fits_hdr2str(fptr_header, 1, NULL, 0, &header, &nkeys,
-                         &COREMOD_iofits_data.FITSIO_status);
-            if(check_FITSIO_status(__FILE__, __func__, __LINE__, 1) != 0)
+            fits_hdr2str(fptr_header, 1, NULL, 0, &header, &nkeys, &COREMOD_iofits_data.FITSIO_status);
+            if (check_FITSIO_status(__FILE__, __func__, __LINE__, 1) != 0)
             {
                 PRINT_ERROR("fits_hdr2str erroron file %s", importheaderfile);
                 abort();
@@ -362,7 +288,7 @@ errno_t saveFITS(
 
             char *hptr; // pointer to header
             hptr = header;
-            while(*hptr)
+            while (*hptr)
             {
                 char fitscard[81];
                 sprintf(fitscard, "%.80s", hptr);
@@ -371,9 +297,9 @@ errno_t saveFITS(
                 int writecard = 1;
                 char *keyexcl[] = {"BITPIX", "NAXIS", "SIMPLE", "EXTEND", 0};
                 int ki = 0;
-                while(keyexcl[ki])
+                while (keyexcl[ki])
                 {
-                    if(strncmp(keyexcl[ki], fitscard, strlen(keyexcl[ki])) == 0)
+                    if (strncmp(keyexcl[ki], fitscard, strlen(keyexcl[ki])) == 0)
                     {
                         printf("EXCLUDING %s\n", fitscard);
                         writecard = 0;
@@ -382,11 +308,11 @@ errno_t saveFITS(
                     ki++;
                 }
 
-                if(writecard == 1)
+                if (writecard == 1)
                 {
                     COREMOD_iofits_data.FITSIO_status = 0;
                     fits_write_record(fptr, fitscard, &COREMOD_iofits_data.FITSIO_status);
-                    if(check_FITSIO_status(__FILE__, __func__, __LINE__, 1) != 0)
+                    if (check_FITSIO_status(__FILE__, __func__, __LINE__, 1) != 0)
                     {
                         PRINT_ERROR("fits_write_record error on file %s", importheaderfile);
                         abort();
@@ -397,7 +323,7 @@ errno_t saveFITS(
 
             COREMOD_iofits_data.FITSIO_status = 0;
             fits_free_memory(header, &COREMOD_iofits_data.FITSIO_status);
-            if(check_FITSIO_status(__FILE__, __func__, __LINE__, 1) != 0)
+            if (check_FITSIO_status(__FILE__, __func__, __LINE__, 1) != 0)
             {
                 PRINT_ERROR("fits_free_memory error on file %s", importheaderfile);
                 abort();
@@ -405,7 +331,7 @@ errno_t saveFITS(
 
             COREMOD_iofits_data.FITSIO_status = 0;
             fits_close_file(fptr_header, &COREMOD_iofits_data.FITSIO_status);
-            if(check_FITSIO_status(__FILE__, __func__, __LINE__, 1) != 0)
+            if (check_FITSIO_status(__FILE__, __func__, __LINE__, 1) != 0)
             {
                 PRINT_ERROR("fits_close_file error on file %s", importheaderfile);
                 abort();
@@ -413,55 +339,50 @@ errno_t saveFITS(
         }
     }
 
-
-
     // Add FITS keywords from image keywords
 
     {
         int NBkw = imgin.md->NBkw;
         int kwcnt = 0;
         printf("----------- NUMBER KW = %d ---------------\n", NBkw);
-        for(int kw = 0; kw < NBkw; kw++)
+        for (int kw = 0; kw < NBkw; kw++)
         {
             char tmpkwvalstr[81];
-            switch(imgin.im->kw[kw].type)
+            switch (imgin.im->kw[kw].type)
             {
-                case 'L':
-                    printf("writing keyword [L] %-8s= %20ld / %s\n", imgin.im->kw[kw].name,
-                           imgin.im->kw[kw].value.numl, imgin.im->kw[kw].comment);
-                    COREMOD_iofits_data.FITSIO_status = 0;
-                    fits_update_key(fptr, TLONG, imgin.im->kw[kw].name,
-                                    &imgin.im->kw[kw].value.numl, imgin.im->kw[kw].comment,
-                                    &COREMOD_iofits_data.FITSIO_status);
-                    kwcnt++;
-                    break;
-
-                case 'D':
-                    printf("writing keyword [D] %-8s= %20g / %s\n", imgin.im->kw[kw].name,
-                           imgin.im->kw[kw].value.numf, imgin.im->kw[kw].comment);
-                    COREMOD_iofits_data.FITSIO_status = 0;
-                    fits_update_key(fptr, TDOUBLE, imgin.im->kw[kw].name,
-                                    &imgin.im->kw[kw].value.numf, imgin.im->kw[kw].comment,
-                                    &COREMOD_iofits_data.FITSIO_status);
-                    kwcnt++;
-                    break;
-
-                case 'S':
-                    sprintf(tmpkwvalstr, "'%s'", imgin.im->kw[kw].value.valstr);
-                    printf("writing keyword [S] %-8s= %20s / %s\n", imgin.im->kw[kw].name,
-                           tmpkwvalstr, imgin.im->kw[kw].comment);
-                    COREMOD_iofits_data.FITSIO_status = 0;
-                    fits_update_key(fptr, TSTRING, imgin.im->kw[kw].name,
-                                    imgin.im->kw[kw].value.valstr, imgin.im->kw[kw].comment,
-                                    &COREMOD_iofits_data.FITSIO_status);
-                    kwcnt++;
-                    break;
-
-                default:
-                    break;
+            case 'L':
+                printf("writing keyword [L] %-8s= %20ld / %s\n", imgin.im->kw[kw].name, imgin.im->kw[kw].value.numl,
+                       imgin.im->kw[kw].comment);
+                COREMOD_iofits_data.FITSIO_status = 0;
+                fits_update_key(fptr, TLONG, imgin.im->kw[kw].name, &imgin.im->kw[kw].value.numl,
+                                imgin.im->kw[kw].comment, &COREMOD_iofits_data.FITSIO_status);
+                kwcnt++;
+                break;
+
+            case 'D':
+                printf("writing keyword [D] %-8s= %20g / %s\n", imgin.im->kw[kw].name, imgin.im->kw[kw].value.numf,
+                       imgin.im->kw[kw].comment);
+                COREMOD_iofits_data.FITSIO_status = 0;
+                fits_update_key(fptr, TDOUBLE, imgin.im->kw[kw].name, &imgin.im->kw[kw].value.numf,
+                                imgin.im->kw[kw].comment, &COREMOD_iofits_data.FITSIO_status);
+                kwcnt++;
+                break;
+
+            case 'S':
+                sprintf(tmpkwvalstr, "'%s'", imgin.im->kw[kw].value.valstr);
+                printf("writing keyword [S] %-8s= %20s / %s\n", imgin.im->kw[kw].name, tmpkwvalstr,
+                       imgin.im->kw[kw].comment);
+                COREMOD_iofits_data.FITSIO_status = 0;
+                fits_update_key(fptr, TSTRING, imgin.im->kw[kw].name, imgin.im->kw[kw].value.valstr,
+                                imgin.im->kw[kw].comment, &COREMOD_iofits_data.FITSIO_status);
+                kwcnt++;
+                break;
+
+            default:
+                break;
             }
 
-            if(check_FITSIO_status(__FILE__, __func__, __LINE__, 1) != 0)
+            if (check_FITSIO_status(__FILE__, __func__, __LINE__, 1) != 0)
             {
                 PRINT_ERROR("fits_write_record error on keyword %s", imgin.im->kw[kw].name);
                 abort();
@@ -469,48 +390,43 @@ errno_t saveFITS(
         }
     }
 
-
     // add custom keywords
 
-    if((kwarraysize > 0) && (kwarray != NULL))
+    if ((kwarraysize > 0) && (kwarray != NULL))
     {
         printf("----------- NUMBER CUSTOM KW = %d ---------------\n", kwarraysize);
-        for(int kwi = 0; kwi < kwarraysize; kwi++)
+        for (int kwi = 0; kwi < kwarraysize; kwi++)
         {
             char tmpkwvalstr[81];
-            switch(kwarray[kwi].type)
+            switch (kwarray[kwi].type)
             {
-                case 'L':
-                    COREMOD_iofits_data.FITSIO_status = 0;
-                    fits_update_key(fptr, TLONG, kwarray[kwi].name,
-                                    &kwarray[kwi].value.numl, kwarray[kwi].comment,
-                                    &COREMOD_iofits_data.FITSIO_status);
-                    break;
-
-                case 'D':
-                    COREMOD_iofits_data.FITSIO_status = 0;
-                    printf("writing keyword [D] %-8s= %20g / %s\n", kwarray[kwi].name,
-                           kwarray[kwi].value.numf, kwarray[kwi].comment);
-                    fits_update_key(fptr, TDOUBLE, kwarray[kwi].name,
-                                    &kwarray[kwi].value.numf, kwarray[kwi].comment,
-                                    &COREMOD_iofits_data.FITSIO_status);
-                    break;
-
-                case 'S':
-                    sprintf(tmpkwvalstr, "'%s'", kwarray[kwi].value.valstr);
-                    printf("writing keyword [S] %-8s= %20s / %s\n", kwarray[kwi].name,
-                           tmpkwvalstr, kwarray[kwi].comment);
-                    COREMOD_iofits_data.FITSIO_status = 0;
-                    fits_update_key(fptr, TSTRING, kwarray[kwi].name,
-                                    kwarray[kwi].value.valstr, kwarray[kwi].comment,
-                                    &COREMOD_iofits_data.FITSIO_status);
-                    break;
-
-                default:
-                    break;
+            case 'L':
+                COREMOD_iofits_data.FITSIO_status = 0;
+                fits_update_key(fptr, TLONG, kwarray[kwi].name, &kwarray[kwi].value.numl, kwarray[kwi].comment,
+                                &COREMOD_iofits_data.FITSIO_status);
+                break;
+
+            case 'D':
+                COREMOD_iofits_data.FITSIO_status = 0;
+                printf("writing keyword [D] %-8s= %20g / %s\n", kwarray[kwi].name, kwarray[kwi].value.numf,
+                       kwarray[kwi].comment);
+                fits_update_key(fptr, TDOUBLE, kwarray[kwi].name, &kwarray[kwi].value.numf, kwarray[kwi].comment,
+                                &COREMOD_iofits_data.FITSIO_status);
+                break;
+
+            case 'S':
+                sprintf(tmpkwvalstr, "'%s'", kwarray[kwi].value.valstr);
+                printf("writing keyword [S] %-8s= %20s / %s\n", kwarray[kwi].name, tmpkwvalstr, kwarray[kwi].comment);
+                COREMOD_iofits_data.FITSIO_status = 0;
+                fits_update_key(fptr, TSTRING, kwarray[kwi].name, kwarray[kwi].value.valstr, kwarray[kwi].comment,
+                                &COREMOD_iofits_data.FITSIO_status);
+                break;
+
+            default:
+                break;
             }
 
-            if(check_FITSIO_status(__FILE__, __func__, __LINE__, 1) != 0)
+            if (check_FITSIO_status(__FILE__, __func__, __LINE__, 1) != 0)
             {
                 PRINT_ERROR("fits_write_record error on keyword %s", kwarray[kwi].name);
                 abort();
@@ -518,16 +434,13 @@ errno_t saveFITS(
         }
     }
 
-
-
     long fpixel = 1;
     COREMOD_iofits_data.FITSIO_status = 0;
-    fits_write_img(fptr, FITSIOdatatype, fpixel, nelements, datainptr,
-                   &COREMOD_iofits_data.FITSIO_status);
+    fits_write_img(fptr, FITSIOdatatype, fpixel, nelements, datainptr, &COREMOD_iofits_data.FITSIO_status);
     int errcode = check_FITSIO_status(__FILE__, __func__, __LINE__, 1);
-    if(errcode != 0)
+    if (errcode != 0)
     {
-        if(errcode == 412)
+        if (errcode == 412)
         {
             PRINT_WARNING("data trucated");
         }
@@ -542,36 +455,30 @@ errno_t saveFITS(
     COREMOD_iofits_data.FITSIO_status = 0;
     fits_write_date(fptr, &COREMOD_iofits_data.FITSIO_status);
 
-
     COREMOD_iofits_data.FITSIO_status = 0;
     fits_close_file(fptr, &COREMOD_iofits_data.FITSIO_status);
-    if(check_FITSIO_status(__FILE__, __func__, __LINE__, 1) != 0)
+    if (check_FITSIO_status(__FILE__, __func__, __LINE__, 1) != 0)
     {
         PRINT_ERROR("fits_close_file error on file %s", fnametmp);
         EXECUTE_SYSTEM_COMMAND("rm %s", fnametmp);
         FUNC_RETURN_FAILURE(" ");
     }
 
-
     EXECUTE_SYSTEM_COMMAND_ERRCHECK("mv %s %s", fnametmp, outputFITSname);
 
     DEBUG_TRACE_FEXIT();
     return RETURN_SUCCESS;
 }
 
-
-
-errno_t saveall_fits(
-    const char *__restrict savedirname
-)
+errno_t saveall_fits(const char *__restrict savedirname)
 {
     DEBUG_TRACE_FSTART();
     char fname[STRINGMAXLEN_FULLFILENAME];
 
     EXECUTE_SYSTEM_COMMAND("mkdir -p %s", savedirname);
 
-    for(long i = 0; i < data.NB_MAX_IMAGE; i++)
-        if(data.image[i].used == 1)
+    for (long i = 0; i < data.NB_MAX_IMAGE; i++)
+        if (data.image[i].used == 1)
         {
 
             WRITE_FULLFILENAME(fname, "./%s/%s.fits", savedirname, data.image[i].name);
@@ -582,73 +489,43 @@ errno_t saveall_fits(
     return RETURN_SUCCESS;
 }
 
-
-
-
-errno_t save_fits(
-    const char *__restrict savedirname,
-    const char *__restrict outputFITSname
-)
+errno_t save_fits(const char *__restrict savedirname, const char *__restrict outputFITSname)
 {
     DEBUG_TRACE_FSTART();
 
-    FUNC_CHECK_RETURN(
-        saveFITS(savedirname, outputFITSname, 0, "", NULL, 0)
-    );
+    FUNC_CHECK_RETURN(saveFITS(savedirname, outputFITSname, 0, "", NULL, 0));
 
     DEBUG_TRACE_FEXIT();
     return RETURN_SUCCESS;
 }
 
-
-errno_t save_fl_fits(
-    const char *__restrict savedirname,
-    const char *__restrict outputFITSname
-)
+errno_t save_fl_fits(const char *__restrict savedirname, const char *__restrict outputFITSname)
 {
     DEBUG_TRACE_FSTART();
 
-    FUNC_CHECK_RETURN(
-        saveFITS(savedirname, outputFITSname, -32, "", NULL, 0));
+    FUNC_CHECK_RETURN(saveFITS(savedirname, outputFITSname, -32, "", NULL, 0));
 
     DEBUG_TRACE_FEXIT();
     return RETURN_SUCCESS;
 }
 
-
-errno_t save_db_fits(
-    const char *__restrict savedirname,
-    const char *__restrict outputFITSname
-)
+errno_t save_db_fits(const char *__restrict savedirname, const char *__restrict outputFITSname)
 {
     DEBUG_TRACE_FSTART();
 
-    FUNC_CHECK_RETURN(
-        saveFITS(savedirname, outputFITSname, -64, "", NULL, 0));
+    FUNC_CHECK_RETURN(saveFITS(savedirname, outputFITSname, -64, "", NULL, 0));
 
     DEBUG_TRACE_FEXIT();
     return RETURN_SUCCESS;
 }
 
-
-
-
-
-
 static errno_t compute_function()
 {
     DEBUG_TRACE_FSTART();
 
     INSERT_STD_PROCINFO_COMPUTEFUNC_START
 
-    saveFITS(
-        inimname,
-        outfname,
-        *outbitpix,
-        inheader,
-        NULL,
-        0
-    );
+    saveFITS(inimname, outfname, *outbitpix, inheader, NULL, 0);
 
     INSERT_STD_PROCINFO_COMPUTEFUNC_END
 
@@ -656,12 +533,11 @@ static errno_t compute_function()
     return RETURN_SUCCESS;
 }
 
-
-
 INSERT_STD_FPSCLIfunctions
 
-// Register function in CLI
-errno_t CLIADDCMD_COREMOD_iofits__saveFITS()
+    // Register function in CLI
+    errno_t
+    CLIADDCMD_COREMOD_iofits__saveFITS()
 {
     INSERT_STD_CLIREGISTERFUNC
 
diff --git a/src/COREMOD_iofits/savefits.h b/src/COREMOD_iofits/savefits.h
index 8ccc8f47..34552608 100644
--- a/src/COREMOD_iofits/savefits.h
+++ b/src/COREMOD_iofits/savefits.h
@@ -2,7 +2,6 @@
  * @file    savefits.h
  */
 
-
 #ifndef MILK_COREMOD_IOFITS_SAVEFITS_H
 #define MILK_COREMOD_IOFITS_SAVEFITS_H
 
@@ -10,29 +9,13 @@
 
 errno_t CLIADDCMD_COREMOD_iofits__saveFITS();
 
+errno_t saveFITS(const char *__restrict inputimname, const char *__restrict outputFITSname, int outputbitpix,
+                 const char *__restrict importheaderfile, IMAGE_KEYWORD *kwarray, int kwarraysize);
+
+errno_t save_fits(const char *__restrict inputimname, const char *__restrict outputFITSname);
+
+errno_t save_fl_fits(const char *__restrict inputimname, const char *__restrict outputFITSname);
 
-errno_t saveFITS(
-    const char *__restrict inputimname,
-    const char *__restrict outputFITSname,
-    int outputbitpix,
-    const char *__restrict importheaderfile,
-    IMAGE_KEYWORD *kwarray,
-    int kwarraysize
-);
-
-errno_t save_fits(
-    const char *__restrict inputimname,
-    const char *__restrict outputFITSname
-);
-
-errno_t save_fl_fits(
-    const char *__restrict inputimname,
-    const char *__restrict outputFITSname
-);
-
-errno_t save_db_fits(
-    const char *__restrict inputimname,
-    const char *__restrict outputFITSname
-);
+errno_t save_db_fits(const char *__restrict inputimname, const char *__restrict outputFITSname);
 
 #endif
diff --git a/src/COREMOD_memory/COREMOD_memory.c b/src/COREMOD_memory/COREMOD_memory.c
index bdf7d91d..81604b90 100644
--- a/src/COREMOD_memory/COREMOD_memory.c
+++ b/src/COREMOD_memory/COREMOD_memory.c
@@ -6,7 +6,6 @@
  *
  */
 
-
 /* ================================================================== */
 /* ================================================================== */
 /*            MODULE INFO                                             */
@@ -19,10 +18,7 @@
 #define MODULE_SHORTNAME_DEFAULT ""
 
 // Module short description
-#define MODULE_DESCRIPTION       "Memory management for images and variables"
-
-
-
+#define MODULE_DESCRIPTION "Memory management for images and variables"
 
 /* =============================================================================================== */
 /* =============================================================================================== */
@@ -34,7 +30,6 @@
 
 #include "CommandLineInterface/timeutils.h"
 
-
 #include "clearall.h"
 #include "create_image.h"
 #include "create_variable.h"
@@ -51,19 +46,18 @@
 #include "image_copy.h"
 #include "image_copy_shm.h"
 #include "image_keyword.h"
-#include "image_keyword_list.h"
 #include "image_keyword_addD.h"
 #include "image_keyword_addL.h"
 #include "image_keyword_addS.h"
+#include "image_keyword_list.h"
 #include "image_make2D.h"
 #include "image_make3D.h"
+#include "image_mk_amph_from_complex.h"
 #include "image_mk_complex_from_amph.h"
 #include "image_mk_complex_from_reim.h"
-#include "image_mk_amph_from_complex.h"
 #include "image_mk_reim_from_complex.h"
 #include "image_set_counters.h"
 
-
 #include "list_image.h"
 #include "list_variable.h"
 #include "logshmim.h"
@@ -78,6 +72,7 @@
 #include "saveall.h"
 #include "shmim_purge.h"
 #include "shmim_setowner.h"
+#include "stream_TCP.h"
 #include "stream_ave.h"
 #include "stream_delay.h"
 #include "stream_diff.h"
@@ -87,19 +82,10 @@
 #include "stream_pixmapdecode.h"
 #include "stream_poke.h"
 #include "stream_sem.h"
-#include "stream_TCP.h"
 #include "stream_updateloop.h"
 
-
 #include "variable_ID.h"
 
-
-
-
-
-
-
-
 /* ================================================================== */
 /* ================================================================== */
 /*            INITIALIZE LIBRARY                                      */
@@ -111,17 +97,11 @@
 //
 INIT_MODULE_LIB(COREMOD_memory)
 
-
-
-
-
-
 static errno_t init_module_CLI()
 {
 
     data.MEM_MONITOR = 0; // 1 if memory monitor is on
 
-
     clearall_addCLIcmd();
     list_image_addCLIcmd();
 
@@ -150,15 +130,12 @@ static errno_t init_module_CLI()
     CLIADDCMD_COREMOD_memory__delete_image();
     CLIADDCMD_COREMOD_memory__delete_sharedmem_image();
 
-
     list_variable_addCLIcmd();
 
     // FPS
     fps_list_addCLIcmd();
     fps_create_addCLIcmd();
 
-
-
     // TYPE CONVERSIONS TO AND FROM COMPLEX
     CLIADDCMD_COREMOD__mk_complex_from_reim();
     CLIADDCMD_COREMOD__mk_complex_from_amph();
@@ -195,9 +172,7 @@ static errno_t init_module_CLI()
     CLIADDCMD_COREMOD_memory__shmimlog();
     CLIADDCMD_COREMOD_memory__shmimlogcmd();
 
-
     // add atexit functions here
 
     return RETURN_SUCCESS;
 }
-
diff --git a/src/COREMOD_memory/COREMOD_memory.h b/src/COREMOD_memory/COREMOD_memory.h
index 9ca59774..e8cbd5de 100644
--- a/src/COREMOD_memory/COREMOD_memory.h
+++ b/src/COREMOD_memory/COREMOD_memory.h
@@ -7,7 +7,6 @@
  *
  */
 
-
 #ifndef _COREMODMEMORY_H
 #define _COREMODMEMORY_H
 
@@ -20,7 +19,6 @@
 // it is increased by  NB_IMAGES_BUFFER
 #define NB_IMAGES_BUFFER_REALLOC 600
 
-
 // The number of variables in the data structure is kept NB_VARIABLES_BUFFER
 // above the number of used variables prior to the execution of any function.
 // It means that no function should create more than 100 variables.
@@ -30,8 +28,6 @@
 // it is increased by  NB_VARIABLES_BUFFER
 #define NB_VARIABLES_BUFFER_REALLOC 150
 
-
-
 #include "COREMOD_memory/shmimlog_types.h"
 
 #include "COREMOD_memory/clearall.h"
@@ -43,25 +39,26 @@
 #include "COREMOD_memory/delete_image.h"
 #include "COREMOD_memory/delete_variable.h"
 
-#include "COREMOD_memory/fps_create.h"
 #include "COREMOD_memory/fps_ID.h"
+#include "COREMOD_memory/fps_create.h"
 #include "COREMOD_memory/fps_list.h"
 
+#include "COREMOD_memory/image_ID.h"
 #include "COREMOD_memory/image_checksize.h"
 #include "COREMOD_memory/image_complex.h"
 #include "COREMOD_memory/image_copy.h"
-#include "COREMOD_memory/image_ID.h"
 #include "COREMOD_memory/image_keyword.h"
 #include "COREMOD_memory/image_mk_amph_from_complex.h"
-#include "COREMOD_memory/image_mk_reim_from_complex.h"
 #include "COREMOD_memory/image_mk_complex_from_amph.h"
 #include "COREMOD_memory/image_mk_complex_from_reim.h"
+#include "COREMOD_memory/image_mk_reim_from_complex.h"
 #include "COREMOD_memory/image_set_counters.h"
 #include "COREMOD_memory/list_image.h"
 #include "COREMOD_memory/list_variable.h"
 #include "COREMOD_memory/logshmim.h"
 #include "COREMOD_memory/read_shmim.h"
 #include "COREMOD_memory/saveall.h"
+#include "COREMOD_memory/stream_TCP.h"
 #include "COREMOD_memory/stream_ave.h"
 #include "COREMOD_memory/stream_delay.h"
 #include "COREMOD_memory/stream_diff.h"
@@ -70,15 +67,10 @@
 #include "COREMOD_memory/stream_pixmapdecode.h"
 #include "COREMOD_memory/stream_poke.h"
 #include "COREMOD_memory/stream_sem.h"
-#include "COREMOD_memory/stream_TCP.h"
 #include "COREMOD_memory/stream_updateloop.h"
 #include "COREMOD_memory/variable_ID.h"
 
-
-
-
 //errno_t rotate_cube(const char *ID_name, const char *ID_out_name,
 //                    int orientation);
 
-
 #endif
diff --git a/src/COREMOD_memory/OBSOLETE_stream_delay.c b/src/COREMOD_memory/OBSOLETE_stream_delay.c
index fca71fc2..559b6695 100644
--- a/src/COREMOD_memory/OBSOLETE_stream_delay.c
+++ b/src/COREMOD_memory/OBSOLETE_stream_delay.c
@@ -4,44 +4,28 @@
 #include <math.h>
 
 #include "CommandLineInterface/CLIcore.h"
-#include "image_ID.h"
-#include "stream_sem.h"
 #include "create_image.h"
 #include "delete_image.h"
+#include "image_ID.h"
+#include "stream_sem.h"
 
 #include "COREMOD_tools/COREMOD_tools.h"
 #include "CommandLineInterface/timeutils.h"
 
-
-
-
-
-
 // ==========================================
 // Forward declaration(s)
 // ==========================================
 
-
-
 errno_t COREMOD_MEMORY_streamDelay_FPCONF();
 
 errno_t COREMOD_MEMORY_streamDelay_RUN();
 
-
-errno_t COREMOD_MEMORY_streamDelay(
-    const char *IDin_name,
-    const char *IDout_name,
-    long        delayus,
-    long        dtus
-);
-
-
+errno_t COREMOD_MEMORY_streamDelay(const char *IDin_name, const char *IDout_name, long delayus, long dtus);
 
 // ==========================================
 // Command line interface wrapper function(s)
 // ==========================================
 
-
 static errno_t COREMOD_MEMORY_streamDelay__cli()
 {
     // Try FPS implementation
@@ -52,41 +36,30 @@ static errno_t COREMOD_MEMORY_streamDelay__cli()
 
     function_parameter_getFPSargs_from_CLIfunc("streamDelay");
 
-    if(data.FPS_CMDCODE != 0)   // use FPS implementation
+    if (data.FPS_CMDCODE != 0) // use FPS implementation
     {
         // set pointers to CONF and RUN functions
         data.FPS_CONFfunc = COREMOD_MEMORY_streamDelay_FPCONF;
-        data.FPS_RUNfunc  = COREMOD_MEMORY_streamDelay_RUN;
+        data.FPS_RUNfunc = COREMOD_MEMORY_streamDelay_RUN;
         function_parameter_execFPScmd();
         return RETURN_SUCCESS;
     }
 
-
     // non FPS implementation - all parameters specified at function launch
-    if(0
-            + CLI_checkarg(1, CLIARG_IMG)
-            + CLI_checkarg(2, 5)
-            + CLI_checkarg(3, CLIARG_LONG)
-            + CLI_checkarg(4, CLIARG_LONG)
-            == 0)
+    if (0 + CLI_checkarg(1, CLIARG_IMG) + CLI_checkarg(2, 5) + CLI_checkarg(3, CLIARG_LONG) +
+            CLI_checkarg(4, CLIARG_LONG) ==
+        0)
     {
-        COREMOD_MEMORY_streamDelay(
-            data.cmdargtoken[1].val.string,
-            data.cmdargtoken[2].val.string,
-            data.cmdargtoken[3].val.numl,
-            data.cmdargtoken[4].val.numl
-        );
+        COREMOD_MEMORY_streamDelay(data.cmdargtoken[1].val.string, data.cmdargtoken[2].val.string,
+                                   data.cmdargtoken[3].val.numl, data.cmdargtoken[4].val.numl);
         return CLICMD_SUCCESS;
     }
     else
     {
         return CLICMD_INVALID_ARG;
     }
-
 }
 
-
-
 // ==========================================
 // Register CLI command(s)
 // ==========================================
@@ -95,26 +68,13 @@ errno_t stream_delay_addCLIcmd()
 {
 
     RegisterCLIcommand(
-        "streamdelay",
-        __FILE__,
-        COREMOD_MEMORY_streamDelay__cli,
-        "delay 2D image stream",
-        "<image2d in> <image2d out> <delay [us]> <resolution [us]>",
-        "streamdelay instream outstream 1000 10",
+        "streamdelay", __FILE__, COREMOD_MEMORY_streamDelay__cli, "delay 2D image stream",
+        "<image2d in> <image2d out> <delay [us]> <resolution [us]>", "streamdelay instream outstream 1000 10",
         "long COREMOD_MEMORY_streamDelay(const char *IDin_name, const char *IDout_name, long delayus, long dtus)");
 
     return RETURN_SUCCESS;
 }
 
-
-
-
-
-
-
-
-
-
 /**
  * @brief Manages configuration parameters for streamDelay
  *
@@ -145,50 +105,36 @@ errno_t COREMOD_MEMORY_streamDelay_FPCONF()
     FPFLAG = FPFLAG_DEFAULT_INPUT | FPFLAG_MINLIMIT;
     FPFLAG &= ~FPFLAG_WRITERUN;
 
-    long delayus_default[4] = { 1000, 1, 10000, 1000 };
+    long delayus_default[4] = {1000, 1, 10000, 1000};
     long fp_delayus = 0;
-    function_parameter_add_entry(&fps, ".delayus", "Delay [us]",
-                                 FPTYPE_INT64, FPFLAG, &delayus_default, &fp_delayus);
-    (void) fp_delayus; // suppresses unused parameter compiler warning
-
-    long dtus_default[4] = { 50, 1, 200, 50 };
-    long fp_dtus    = 0;
-    function_parameter_add_entry(&fps, ".dtus",
-                                 "Loop period [us]", FPTYPE_INT64, FPFLAG, &dtus_default, &fp_dtus);
-    (void) fp_dtus; // suppresses unused parameter compiler warning
+    function_parameter_add_entry(&fps, ".delayus", "Delay [us]", FPTYPE_INT64, FPFLAG, &delayus_default, &fp_delayus);
+    (void)fp_delayus; // suppresses unused parameter compiler warning
 
+    long dtus_default[4] = {50, 1, 200, 50};
+    long fp_dtus = 0;
+    function_parameter_add_entry(&fps, ".dtus", "Loop period [us]", FPTYPE_INT64, FPFLAG, &dtus_default, &fp_dtus);
+    (void)fp_dtus; // suppresses unused parameter compiler warning
 
-    FPS_ADDPARAM_STREAM_IN(stream_inname,   ".in_name",  "input stream", NULL);
+    FPS_ADDPARAM_STREAM_IN(stream_inname, ".in_name", "input stream", NULL);
     FPS_ADDPARAM_STREAM_OUT(stream_outname, ".out_name", "output stream");
 
-    long timeavemode_default[4] = { 0, 0, 3, 0 };
-    FPS_ADDPARAM_INT64_IN(
-        option_timeavemode,
-        ".option.timeavemode",
-        "Enable time window averaging (>0)",
-        &timeavemode_default);
+    long timeavemode_default[4] = {0, 0, 3, 0};
+    FPS_ADDPARAM_INT64_IN(option_timeavemode, ".option.timeavemode", "Enable time window averaging (>0)",
+                          &timeavemode_default);
 
-    double avedt_default[4] = { 0.001, 0.0001, 1.0, 0.001};
-    FPS_ADDPARAM_FLT64_IN(
-        option_avedt,
-        ".option.avedt",
-        "Averaging time window width",
-        &avedt_default);
+    double avedt_default[4] = {0.001, 0.0001, 1.0, 0.001};
+    FPS_ADDPARAM_FLT64_IN(option_avedt, ".option.avedt", "Averaging time window width", &avedt_default);
 
     // status
-    FPS_ADDPARAM_INT64_OUT(zsize, ".status.zsize",  "cube size");
+    FPS_ADDPARAM_INT64_OUT(zsize, ".status.zsize", "cube size");
     FPS_ADDPARAM_INT64_OUT(framelog, ".status.framelag", "lag in frame unit");
     FPS_ADDPARAM_INT64_OUT(kkin, ".status.kkin", "input cube slice index");
     FPS_ADDPARAM_INT64_OUT(kkout, ".status.kkout", "output cube slice index");
 
-
-
-
     // start function parameter conf loop, defined in function_parameter.h
     FPS_CONFLOOP_START
 
-
-    if(fps.parray[fp_option_timeavemode].val.i64[0] != 0)
+    if (fps.parray[fp_option_timeavemode].val.i64[0] != 0)
     {
         // time averaging enabled
         fps.parray[fp_option_avedt].fpflag |= FPFLAG_WRITERUN;
@@ -202,27 +148,12 @@ errno_t COREMOD_MEMORY_streamDelay_FPCONF()
         fps.parray[fp_option_avedt].fpflag &= ~FPFLAG_VISIBLE;
     }
 
-
     // stop function parameter conf loop, defined in function_parameter.h
     FPS_CONFLOOP_END
 
-
     return RETURN_SUCCESS;
 }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
 /**
  * @brief Delay image stream by time offset
  *
@@ -232,26 +163,24 @@ errno_t COREMOD_MEMORY_streamDelay_FPCONF()
 
 errno_t COREMOD_MEMORY_streamDelay_RUN()
 {
-    imageID             IDimc;
-    imageID             IDin, IDout;
-    uint32_t            xsize, ysize, xysize;
+    imageID IDimc;
+    imageID IDin, IDout;
+    uint32_t xsize, ysize, xysize;
     //    long                cnt0old;
-    long                ii;
-    struct timespec    *t0array;
-    struct timespec     tnow;
-    double              tdiffv;
-    struct timespec     tdiff;
-    uint32_t           *arraytmp;
-    long                cntskip = 0;
-    long                kk;
-
+    long ii;
+    struct timespec *t0array;
+    struct timespec tnow;
+    double tdiffv;
+    struct timespec tdiff;
+    uint32_t *arraytmp;
+    long cntskip = 0;
+    long kk;
 
     // ===========================
     /// ### CONNECT TO FPS
     // ===========================
     FPS_CONNECT(data.FPS_name, FPSCONNECT_RUN);
 
-
     // ===============================
     /// ### GET FUNCTION PARAMETER VALUES
     // ===============================
@@ -259,25 +188,22 @@ errno_t COREMOD_MEMORY_streamDelay_RUN()
     // These parameters are read once, before running the loop
     //
     char IDin_name[FUNCTION_PARAMETER_STRMAXLEN];
-    strncpy(IDin_name,  functionparameter_GetParamPtr_STRING(&fps, ".in_name"),
-            FUNCTION_PARAMETER_STRMAXLEN - 1);
+    strncpy(IDin_name, functionparameter_GetParamPtr_STRING(&fps, ".in_name"), FUNCTION_PARAMETER_STRMAXLEN - 1);
 
     char IDout_name[FUNCTION_PARAMETER_STRMAXLEN];
-    strncpy(IDout_name, functionparameter_GetParamPtr_STRING(&fps, ".out_name"),
-            FUNCTION_PARAMETER_STRMAXLEN - 1);
+    strncpy(IDout_name, functionparameter_GetParamPtr_STRING(&fps, ".out_name"), FUNCTION_PARAMETER_STRMAXLEN - 1);
 
     long delayus = functionparameter_GetParamValue_INT64(&fps, ".delayus");
 
-    long dtus    = functionparameter_GetParamValue_INT64(&fps, ".dtus");
+    long dtus = functionparameter_GetParamValue_INT64(&fps, ".dtus");
 
-    int timeavemode = functionparameter_GetParamValue_INT64(&fps,
-                      ".option.timeavemode");
-    double *avedt   = functionparameter_GetParamPtr_FLOAT64(&fps, ".option.avedt");
+    int timeavemode = functionparameter_GetParamValue_INT64(&fps, ".option.timeavemode");
+    double *avedt = functionparameter_GetParamPtr_FLOAT64(&fps, ".option.avedt");
 
-    long *zsize    = functionparameter_GetParamPtr_INT64(&fps, ".status.zsize");
+    long *zsize = functionparameter_GetParamPtr_INT64(&fps, ".status.zsize");
     long *framelag = functionparameter_GetParamPtr_INT64(&fps, ".status.framelag");
-    long *kkin     = functionparameter_GetParamPtr_INT64(&fps, ".status.kkin");
-    long *kkout    = functionparameter_GetParamPtr_INT64(&fps, ".status.kkout");
+    long *kkin = functionparameter_GetParamPtr_INT64(&fps, ".status.kkin");
+    long *kkout = functionparameter_GetParamPtr_INT64(&fps, ".status.kkout");
 
     DEBUG_TRACEPOINT(" ");
 
@@ -288,12 +214,10 @@ errno_t COREMOD_MEMORY_streamDelay_RUN()
 
     char pinfodescr[200];
     sprintf(pinfodescr, "streamdelay %.10s %.10s", IDin_name, IDout_name);
-    processinfo = processinfo_setup(
-                      data.FPS_name,                 // re-use fpsname as processinfo name
-                      pinfodescr,    // description
-                      "startup",  // message on startup
-                      __FUNCTION__, __FILE__, __LINE__
-                  );
+    processinfo = processinfo_setup(data.FPS_name, // re-use fpsname as processinfo name
+                                    pinfodescr,    // description
+                                    "startup",     // message on startup
+                                    __FUNCTION__, __FILE__, __LINE__);
 
     // OPTIONAL SETTINGS
     // Measure timing
@@ -301,24 +225,18 @@ errno_t COREMOD_MEMORY_streamDelay_RUN()
     // RT_priority, 0-99. Larger number = higher priority. If <0, ignore
     processinfo->RT_priority = 20;
 
-
     fps_to_processinfo(&fps, processinfo);
 
-
-
     // =============================================
     /// ### OPTIONAL: TESTING CONDITION FOR LOOP ENTRY
     // =============================================
     // Pre-loop testing, anything that would prevent loop from starting should issue message
     int loopOK = 1;
 
-
     IDin = image_ID(IDin_name);
 
-
-
     // ERROR HANDLING
-    if(IDin == -1)
+    if (IDin == -1)
     {
         struct timespec errtime;
         struct tm *errtm;
@@ -326,15 +244,8 @@ errno_t COREMOD_MEMORY_streamDelay_RUN()
         clock_gettime(CLOCK_REALTIME, &errtime);
         errtm = gmtime(&errtime.tv_sec);
 
-        fprintf(stderr,
-                "%02d:%02d:%02d.%09ld  ERROR [%s %s %d] Input stream %s does not exist, cannot proceed\n",
-                errtm->tm_hour,
-                errtm->tm_min,
-                errtm->tm_sec,
-                errtime.tv_nsec,
-                __FILE__,
-                __FUNCTION__,
-                __LINE__,
+        fprintf(stderr, "%02d:%02d:%02d.%09ld  ERROR [%s %s %d] Input stream %s does not exist, cannot proceed\n",
+                errtm->tm_hour, errtm->tm_min, errtm->tm_sec, errtime.tv_nsec, __FILE__, __FUNCTION__, __LINE__,
                 IDin_name);
 
         char msgstring[200];
@@ -343,26 +254,23 @@ errno_t COREMOD_MEMORY_streamDelay_RUN()
         loopOK = 0;
     }
 
-
     xsize = data.image[IDin].md[0].size[0];
     ysize = data.image[IDin].md[0].size[1];
     *zsize = (long)(2 * delayus / dtus);
-    if(*zsize < 1)
+    if (*zsize < 1)
     {
         *zsize = 1;
     }
     xysize = xsize * ysize;
 
-    t0array = (struct timespec *) malloc(sizeof(struct timespec) * *zsize);
+    t0array = (struct timespec *)malloc(sizeof(struct timespec) * *zsize);
 
     create_3Dimage_ID("_tmpc", xsize, ysize, *zsize, &IDimc);
 
-
-
     IDout = image_ID(IDout_name);
-    if(IDout == -1)   // CREATE IT
+    if (IDout == -1) // CREATE IT
     {
-        arraytmp = (uint32_t *) malloc(sizeof(uint32_t) * 2);
+        arraytmp = (uint32_t *)malloc(sizeof(uint32_t) * 2);
         arraytmp[0] = xsize;
         arraytmp[1] = ysize;
         create_image_ID(IDout_name, 2, arraytmp, _DATATYPE_FLOAT, 1, 0, 0, &IDout);
@@ -370,47 +278,41 @@ errno_t COREMOD_MEMORY_streamDelay_RUN()
         free(arraytmp);
     }
 
-
     *kkin = 0;
     *kkout = 0;
-//    cnt0old = data.image[IDin].md[0].cnt0;
+    //    cnt0old = data.image[IDin].md[0].cnt0;
 
     float *arraytmpf;
-    arraytmpf = (float *) malloc(sizeof(float) * xsize * ysize);
+    arraytmpf = (float *)malloc(sizeof(float) * xsize * ysize);
 
     clock_gettime(CLOCK_REALTIME, &tnow);
-    for(kk = 0; kk < *zsize; kk++)
+    for (kk = 0; kk < *zsize; kk++)
     {
         t0array[kk] = tnow;
     }
 
-
     DEBUG_TRACEPOINT(" ");
 
-
     // Specify input stream trigger
 
-    processinfo_waitoninputstream_init(processinfo, IDin,
-                                       PROCESSINFO_TRIGGERMODE_DELAY, -1);
+    processinfo_waitoninputstream_init(processinfo, IDin, PROCESSINFO_TRIGGERMODE_DELAY, -1);
     processinfo->triggerdelay.tv_sec = 0;
     processinfo->triggerdelay.tv_nsec = (long)(dtus * 1000);
-    while(processinfo->triggerdelay.tv_nsec > 1000000000)
+    while (processinfo->triggerdelay.tv_nsec > 1000000000)
     {
         processinfo->triggerdelay.tv_nsec -= 1000000000;
         processinfo->triggerdelay.tv_sec += 1;
     }
 
-
     // ===========================
     /// ### START LOOP
     // ===========================
 
-    processinfo_loopstart(
-        processinfo); // Notify processinfo that we are entering loop
+    processinfo_loopstart(processinfo); // Notify processinfo that we are entering loop
 
     DEBUG_TRACEPOINT(" ");
 
-    while(loopOK == 1)
+    while (loopOK == 1)
     {
         int kkinscan;
         float normframes = 0.0;
@@ -418,53 +320,48 @@ errno_t COREMOD_MEMORY_streamDelay_RUN()
         DEBUG_TRACEPOINT(" ");
         loopOK = processinfo_loopstep(processinfo);
 
-
         processinfo_waitoninputstream(processinfo);
         //usleep(dtus); // main loop wait
 
         processinfo_exec_start(processinfo);
 
-        if(processinfo_compute_status(processinfo) == 1)
+        if (processinfo_compute_status(processinfo) == 1)
         {
             DEBUG_TRACEPOINT(" ");
 
             // has new frame arrived ?
-//            cnt0 = data.image[IDin].md[0].cnt0;
+            //            cnt0 = data.image[IDin].md[0].cnt0;
 
-//            if(cnt0 != cnt0old) { // new frame
-            clock_gettime(CLOCK_REALTIME, &t0array[*kkin]);  // record time of input frame
+            //            if(cnt0 != cnt0old) { // new frame
+            clock_gettime(CLOCK_REALTIME, &t0array[*kkin]); // record time of input frame
 
             DEBUG_TRACEPOINT(" ");
-            for(ii = 0; ii < xysize; ii++)
+            for (ii = 0; ii < xysize; ii++)
             {
                 data.image[IDimc].array.F[(*kkin) * xysize + ii] = data.image[IDin].array.F[ii];
             }
-            (*kkin) ++;
+            (*kkin)++;
             DEBUG_TRACEPOINT(" ");
 
-            if((*kkin) == (*zsize))
+            if ((*kkin) == (*zsize))
             {
                 (*kkin) = 0;
             }
 
-
-
             clock_gettime(CLOCK_REALTIME, &tnow);
             DEBUG_TRACEPOINT(" ");
 
-
             cntskip = 0;
             tdiff = timespec_diff(t0array[*kkout], tnow);
             tdiffv = 1.0 * tdiff.tv_sec + 1.0e-9 * tdiff.tv_nsec;
 
             DEBUG_TRACEPOINT(" ");
 
-
-            while((tdiffv > 1.0e-6 * delayus) && (cntskip < *zsize))
+            while ((tdiffv > 1.0e-6 * delayus) && (cntskip < *zsize))
             {
-                cntskip++;  // advance index until time condition is satisfied
-                (*kkout) ++;
-                if(*kkout == *zsize)
+                cntskip++; // advance index until time condition is satisfied
+                (*kkout)++;
+                if (*kkout == *zsize)
                 {
                     *kkout = 0;
                 }
@@ -475,85 +372,80 @@ errno_t COREMOD_MEMORY_streamDelay_RUN()
             DEBUG_TRACEPOINT(" ");
 
             *framelag = *kkin - *kkout;
-            if(*framelag < 0)
+            if (*framelag < 0)
             {
                 *framelag += *zsize;
             }
 
-
             DEBUG_TRACEPOINT(" ");
 
-
-            switch(timeavemode)
+            switch (timeavemode)
             {
 
-                case 0: // no time averaging - pick more recent frame that matches requirement
-                    DEBUG_TRACEPOINT(" ");
-                    if(cntskip > 0)
-                    {
-                        char *ptr; // pointer address
+            case 0: // no time averaging - pick more recent frame that matches requirement
+                DEBUG_TRACEPOINT(" ");
+                if (cntskip > 0)
+                {
+                    char *ptr; // pointer address
 
-                        data.image[IDout].md[0].write = 1;
+                    data.image[IDout].md[0].write = 1;
 
-                        ptr = (char *) data.image[IDimc].array.F;
-                        ptr += SIZEOF_DATATYPE_FLOAT * xysize * *kkout;
+                    ptr = (char *)data.image[IDimc].array.F;
+                    ptr += SIZEOF_DATATYPE_FLOAT * xysize * *kkout;
 
-                        memcpy(data.image[IDout].array.F, ptr,
-                               SIZEOF_DATATYPE_FLOAT * xysize);  // copy time-delayed input to output
+                    memcpy(data.image[IDout].array.F, ptr,
+                           SIZEOF_DATATYPE_FLOAT * xysize); // copy time-delayed input to output
 
-                        COREMOD_MEMORY_image_set_sempost_byID(IDout, -1);
-                        data.image[IDout].md[0].cnt0++;
-                        data.image[IDout].md[0].write = 0;
-                    }
-                    break;
+                    COREMOD_MEMORY_image_set_sempost_byID(IDout, -1);
+                    data.image[IDout].md[0].cnt0++;
+                    data.image[IDout].md[0].write = 0;
+                }
+                break;
 
-                default : // strict time window (note: other modes will be coded in the future)
-                    normframes = 0.0;
-                    DEBUG_TRACEPOINT(" ");
+            default: // strict time window (note: other modes will be coded in the future)
+                normframes = 0.0;
+                DEBUG_TRACEPOINT(" ");
 
-                    for(ii = 0; ii < xysize; ii++)
-                    {
-                        arraytmpf[ii] = 0.0;
-                    }
+                for (ii = 0; ii < xysize; ii++)
+                {
+                    arraytmpf[ii] = 0.0;
+                }
 
-                    for(kkinscan = 0; kkinscan < *zsize; kkinscan++)
-                    {
-                        tdiff = timespec_diff(t0array[kkinscan], tnow);
-                        tdiffv = 1.0 * tdiff.tv_sec + 1.0e-9 * tdiff.tv_nsec;
+                for (kkinscan = 0; kkinscan < *zsize; kkinscan++)
+                {
+                    tdiff = timespec_diff(t0array[kkinscan], tnow);
+                    tdiffv = 1.0 * tdiff.tv_sec + 1.0e-9 * tdiff.tv_nsec;
 
-                        if((tdiffv > 0) && (fabs(tdiffv - 1.0e-6 * delayus) < *avedt))
+                    if ((tdiffv > 0) && (fabs(tdiffv - 1.0e-6 * delayus) < *avedt))
+                    {
+                        float coeff = 1.0;
+                        for (ii = 0; ii < xysize; ii++)
                         {
-                            float coeff = 1.0;
-                            for(ii = 0; ii < xysize; ii++)
-                            {
-                                arraytmpf[ii] += coeff * data.image[IDimc].array.F[kkinscan * xysize + ii];
-                            }
-                            normframes += coeff;
+                            arraytmpf[ii] += coeff * data.image[IDimc].array.F[kkinscan * xysize + ii];
                         }
+                        normframes += coeff;
                     }
-                    if(normframes < 0.0001)
-                    {
-                        normframes = 0.0001;    // avoid division by zero
-                    }
+                }
+                if (normframes < 0.0001)
+                {
+                    normframes = 0.0001; // avoid division by zero
+                }
 
-                    data.image[IDout].md[0].write = 1;
-                    for(ii = 0; ii < xysize; ii++)
-                    {
-                        data.image[IDout].array.F[ii] = arraytmpf[ii] / normframes;
-                    }
+                data.image[IDout].md[0].write = 1;
+                for (ii = 0; ii < xysize; ii++)
+                {
+                    data.image[IDout].array.F[ii] = arraytmpf[ii] / normframes;
+                }
 
-                    processinfo_update_output_stream(processinfo, IDout);
-                    /*
+                processinfo_update_output_stream(processinfo, IDout);
+                /*
                     COREMOD_MEMORY_image_set_sempost_byID(IDout, -1);
                     data.image[IDout].md[0].cnt0++;
                     data.image[IDout].md[0].write = 0;
                     */
-                    break;
+                break;
             }
             DEBUG_TRACEPOINT(" ");
-
-
-
         }
         // process signals, increment loop counter
         processinfo_exec_end(processinfo);
@@ -579,23 +471,7 @@ errno_t COREMOD_MEMORY_streamDelay_RUN()
     return IDout;
 }
 
-
-
-
-
-
-
-
-
-
-
-
-errno_t COREMOD_MEMORY_streamDelay(
-    const char *IDin_name,
-    const char *IDout_name,
-    long        delayus,
-    long        dtus
-)
+errno_t COREMOD_MEMORY_streamDelay(const char *IDin_name, const char *IDout_name, long delayus, long dtus)
 {
     char fpsname[200];
     unsigned int pindex = 0;
@@ -621,9 +497,3 @@ errno_t COREMOD_MEMORY_streamDelay(
 
     return RETURN_SUCCESS;
 }
-
-
-
-
-
-
diff --git a/src/COREMOD_memory/OBSOLETE_stream_delay.h b/src/COREMOD_memory/OBSOLETE_stream_delay.h
index 245fd031..d04d806e 100644
--- a/src/COREMOD_memory/OBSOLETE_stream_delay.h
+++ b/src/COREMOD_memory/OBSOLETE_stream_delay.h
@@ -1,17 +1,6 @@
 /** @file stream_delay,h
  */
 
-
-
-
 errno_t stream_delay_addCLIcmd();
 
-
-
-
-errno_t COREMOD_MEMORY_streamDelay(
-    const char *IDin_name,
-    const char *IDout_name,
-    long        delayus,
-    long        dtus
-);
+errno_t COREMOD_MEMORY_streamDelay(const char *IDin_name, const char *IDout_name, long delayus, long dtus);
diff --git a/src/COREMOD_memory/README.md b/src/COREMOD_memory/README.md
index c2aa0ba4..ac89fd3b 100644
--- a/src/COREMOD_memory/README.md
+++ b/src/COREMOD_memory/README.md
@@ -3,4 +3,3 @@
 # Module COREMOD_memory {#page_module_COREMOD_memory}
 
 Memory management for images
-
diff --git a/src/COREMOD_memory/clearall.c b/src/COREMOD_memory/clearall.c
index aedce040..9dd9c158 100644
--- a/src/COREMOD_memory/clearall.c
+++ b/src/COREMOD_memory/clearall.c
@@ -1,12 +1,10 @@
 /** @file clearall.c
  */
 
-
 #include "CommandLineInterface/CLIcore.h"
-#include "image_ID.h"
 #include "delete_image.h"
 #include "delete_variable.h"
-
+#include "image_ID.h"
 
 // ==========================================
 // Forward declaration(s)
@@ -14,15 +12,10 @@
 
 errno_t clearall();
 
-
 // ==========================================
 // Command line interface wrapper function(s)
 // ==========================================
 
-
-
-
-
 // ==========================================
 // Register CLI command(s)
 // ==========================================
@@ -30,41 +23,28 @@ errno_t clearall();
 errno_t clearall_addCLIcmd()
 {
 
-    RegisterCLIcommand(
-        "rmall",
-        __FILE__,
-        clearall,
-        "remove all images",
-        "no argument",
-        "rmall",
-        "int clearall()");
-
+    RegisterCLIcommand("rmall", __FILE__, clearall, "remove all images", "no argument", "rmall", "int clearall()");
 
     return RETURN_SUCCESS;
 }
 
-
-
-
-
-
 errno_t clearall()
 {
     imageID ID;
 
     // clear images
-    for(ID = 0; ID < data.NB_MAX_IMAGE; ID++)
+    for (ID = 0; ID < data.NB_MAX_IMAGE; ID++)
     {
-        if(data.image[ID].used == 1)
+        if (data.image[ID].used == 1)
         {
             delete_image_ID(data.image[ID].name, DELETE_IMAGE_ERRMODE_WARNING);
         }
     }
 
     // clear variables
-    for(ID = 0; ID < data.NB_MAX_VARIABLE; ID++)
+    for (ID = 0; ID < data.NB_MAX_VARIABLE; ID++)
     {
-        if(data.variable[ID].used == 1)
+        if (data.variable[ID].used == 1)
         {
             delete_variable_ID(data.variable[ID].name);
         }
@@ -72,23 +52,19 @@ errno_t clearall()
 
     // clear FPS
 
-    for(int fpsindex = 0; fpsindex < data.NB_MAX_FPS; fpsindex++)
+    for (int fpsindex = 0; fpsindex < data.NB_MAX_FPS; fpsindex++)
     {
         DEBUG_TRACEPOINT("clear FPS %d", fpsindex);
         data.fpsarray[fpsindex].SMfd = -1;
-        if(data.fpsarray[fpsindex].parray != NULL)
+        if (data.fpsarray[fpsindex].parray != NULL)
         {
             data.fpsarray[fpsindex].parray = NULL;
         }
-        if(data.fpsarray[fpsindex].md != NULL)
+        if (data.fpsarray[fpsindex].md != NULL)
         {
             data.fpsarray[fpsindex].md = NULL;
         }
     }
 
-
     return RETURN_SUCCESS;
 }
-
-
-
diff --git a/src/COREMOD_memory/clearall.h b/src/COREMOD_memory/clearall.h
index f393d6f8..61652b80 100644
--- a/src/COREMOD_memory/clearall.h
+++ b/src/COREMOD_memory/clearall.h
@@ -1,8 +1,6 @@
 /** @file clearall.h
  */
 
-
 errno_t clearall_addCLIcmd();
 
-
-errno_t    clearall();
+errno_t clearall();
diff --git a/src/COREMOD_memory/compute_image_memory.c b/src/COREMOD_memory/compute_image_memory.c
index a9a33595..b6f6190d 100644
--- a/src/COREMOD_memory/compute_image_memory.c
+++ b/src/COREMOD_memory/compute_image_memory.c
@@ -2,25 +2,20 @@
  * @file    compute_image_memory.c
  */
 
-
-
 #include "CommandLineInterface/CLIcore.h"
 
-
-
 uint64_t compute_image_memory()
 {
     uint64_t totalmem = 0;
 
-    for(imageID i = 0; i < data.NB_MAX_IMAGE; i++)
+    for (imageID i = 0; i < data.NB_MAX_IMAGE; i++)
     {
         //printf("%5ld / %5ld  %d\n", i, data.NB_MAX_IMAGE, data.image[i].used);
         //	fflush(stdout);
 
-        if(data.image[i].used == 1)
+        if (data.image[i].used == 1)
         {
-            totalmem += data.image[i].md[0].nelement *
-                        ImageStreamIO_typesize(data.image[i].md[0].datatype);
+            totalmem += data.image[i].md[0].nelement * ImageStreamIO_typesize(data.image[i].md[0].datatype);
         }
     }
 
diff --git a/src/COREMOD_memory/compute_image_memory.h b/src/COREMOD_memory/compute_image_memory.h
index a04ff71d..322c2aef 100644
--- a/src/COREMOD_memory/compute_image_memory.h
+++ b/src/COREMOD_memory/compute_image_memory.h
@@ -2,5 +2,4 @@
  * @file    compute_image_memory.h
  */
 
-
 uint64_t compute_image_memory();
diff --git a/src/COREMOD_memory/compute_nb_image.c b/src/COREMOD_memory/compute_nb_image.c
index 8ba04197..7c5fc119 100644
--- a/src/COREMOD_memory/compute_nb_image.c
+++ b/src/COREMOD_memory/compute_nb_image.c
@@ -2,20 +2,18 @@
  * @file    compute_nb_image.c
  */
 
-
 #include "CommandLineInterface/CLIcore.h"
 
-
 long compute_nb_image()
 {
     long NBimage = 0;
 
-	//printf("NB_MAX_IMAGE = %d\n", data.NB_MAX_IMAGE);
-	//fflush(stdout);
+    //printf("NB_MAX_IMAGE = %d\n", data.NB_MAX_IMAGE);
+    //fflush(stdout);
 
-    for(imageID i = 0; i < data.NB_MAX_IMAGE; i++)
+    for (imageID i = 0; i < data.NB_MAX_IMAGE; i++)
     {
-        if(data.image[i].used == 1)
+        if (data.image[i].used == 1)
         {
             NBimage += 1;
         }
diff --git a/src/COREMOD_memory/compute_nb_image.h b/src/COREMOD_memory/compute_nb_image.h
index df051f89..d6b15bc8 100644
--- a/src/COREMOD_memory/compute_nb_image.h
+++ b/src/COREMOD_memory/compute_nb_image.h
@@ -2,4 +2,4 @@
  * @file    compute_nb_image.h
  */
 
-long       compute_nb_image();
+long compute_nb_image();
diff --git a/src/COREMOD_memory/compute_nb_variable.c b/src/COREMOD_memory/compute_nb_variable.c
index 54c4a8a1..96aab9b7 100644
--- a/src/COREMOD_memory/compute_nb_variable.c
+++ b/src/COREMOD_memory/compute_nb_variable.c
@@ -2,18 +2,15 @@
  * @file    compute_nb_variable.c
  */
 
-
 #include "CommandLineInterface/CLIcore.h"
 
-
-
 long compute_nb_variable()
 {
     long NBvar = 0;
 
-    for(variableID i = 0; i < data.NB_MAX_VARIABLE; i++)
+    for (variableID i = 0; i < data.NB_MAX_VARIABLE; i++)
     {
-        if(data.variable[i].used == 1)
+        if (data.variable[i].used == 1)
         {
             NBvar += 1;
         }
diff --git a/src/COREMOD_memory/compute_nb_variable.h b/src/COREMOD_memory/compute_nb_variable.h
index cdd1df06..f0289d6f 100644
--- a/src/COREMOD_memory/compute_nb_variable.h
+++ b/src/COREMOD_memory/compute_nb_variable.h
@@ -2,4 +2,4 @@
  * @file    compute_nb_variable.h
  */
 
-long       compute_nb_variable();
+long compute_nb_variable();
diff --git a/src/COREMOD_memory/create_image.c b/src/COREMOD_memory/create_image.c
index b39fb63d..91d011fe 100644
--- a/src/COREMOD_memory/create_image.c
+++ b/src/COREMOD_memory/create_image.c
@@ -3,36 +3,22 @@
  * @brief   create images and streams
  */
 
-
 #include "CommandLineInterface/CLIcore.h"
 #include "image_ID.h"
 #include "list_image.h"
 #include "stream_sem.h"
 
-
-
 // ==========================================
 // forward declarations
 // ==========================================
 
-errno_t create_image_ID(
-    const char *name,
-    long        naxis,
-    uint32_t   *size,
-    uint8_t     datatype,
-    int         shared,
-    int         nbkw,
-    int         CBsize,
-    imageID    *outID
-);
-
-
+errno_t create_image_ID(const char *name, long naxis, uint32_t *size, uint8_t datatype, int shared, int nbkw,
+                        int CBsize, imageID *outID);
 
 // ==========================================
 // command line interface wrapper functions
 // ==========================================
 
-
 static errno_t create_image__cli()
 {
     uint32_t *imsize;
@@ -40,93 +26,86 @@ static errno_t create_image__cli()
     long i;
     uint8_t datatype;
 
-
-
-    if(0
-            + CLI_checkarg(1, CLIARG_STR_NOT_IMG)
-            + CLI_checkarg_noerrmsg(2, CLIARG_LONG)
-            == 0)
+    if (0 + CLI_checkarg(1, CLIARG_STR_NOT_IMG) + CLI_checkarg_noerrmsg(2, CLIARG_LONG) == 0)
     {
         naxis = 0;
-        imsize = (uint32_t *) malloc(sizeof(uint32_t) * 5);
+        imsize = (uint32_t *)malloc(sizeof(uint32_t) * 5);
         i = 2;
-        while(data.cmdargtoken[i].type == 2)
+        while (data.cmdargtoken[i].type == 2)
         {
             imsize[naxis] = data.cmdargtoken[i].val.numl;
             naxis++;
             i++;
         }
-        switch(data.precision)
+        switch (data.precision)
         {
         case 0:
-            create_image_ID(data.cmdargtoken[1].val.string, naxis, imsize, _DATATYPE_FLOAT,
-                            data.SHARED_DFT, data.NBKEYWORD_DFT, 0, NULL);
+            create_image_ID(data.cmdargtoken[1].val.string, naxis, imsize, _DATATYPE_FLOAT, data.SHARED_DFT,
+                            data.NBKEYWORD_DFT, 0, NULL);
             break;
         case 1:
-            create_image_ID(data.cmdargtoken[1].val.string, naxis, imsize, _DATATYPE_DOUBLE,
-                            data.SHARED_DFT, data.NBKEYWORD_DFT, 0, NULL);
+            create_image_ID(data.cmdargtoken[1].val.string, naxis, imsize, _DATATYPE_DOUBLE, data.SHARED_DFT,
+                            data.NBKEYWORD_DFT, 0, NULL);
             break;
         }
         free(imsize);
         return CLICMD_SUCCESS;
     }
-    else if(0
-            + CLI_checkarg(1, CLIARG_STR_NOT_IMG)
-            + CLI_checkarg(2, CLIARG_STR_NOT_IMG)
-            + CLI_checkarg(3, CLIARG_LONG)
-            == 0)  // type option exists
+    else if (0 + CLI_checkarg(1, CLIARG_STR_NOT_IMG) + CLI_checkarg(2, CLIARG_STR_NOT_IMG) +
+                 CLI_checkarg(3, CLIARG_LONG) ==
+             0) // type option exists
     {
         datatype = 0;
 
-        if(strcmp(data.cmdargtoken[2].val.string, "c") == 0)
+        if (strcmp(data.cmdargtoken[2].val.string, "c") == 0)
         {
             printf("type = CHAR\n");
             datatype = _DATATYPE_UINT8;
         }
 
-        if(strcmp(data.cmdargtoken[2].val.string, "i") == 0)
+        if (strcmp(data.cmdargtoken[2].val.string, "i") == 0)
         {
             printf("type = INT\n");
             datatype = _DATATYPE_INT32;
         }
 
-        if(strcmp(data.cmdargtoken[2].val.string, "f") == 0)
+        if (strcmp(data.cmdargtoken[2].val.string, "f") == 0)
         {
             printf("type = FLOAT\n");
             datatype = _DATATYPE_FLOAT;
         }
 
-        if(strcmp(data.cmdargtoken[2].val.string, "d") == 0)
+        if (strcmp(data.cmdargtoken[2].val.string, "d") == 0)
         {
             printf("type = DOUBLE\n");
             datatype = _DATATYPE_DOUBLE;
         }
 
-        if(strcmp(data.cmdargtoken[2].val.string, "cf") == 0)
+        if (strcmp(data.cmdargtoken[2].val.string, "cf") == 0)
         {
             printf("type = COMPLEX_FLOAT\n");
             datatype = _DATATYPE_COMPLEX_FLOAT;
         }
 
-        if(strcmp(data.cmdargtoken[2].val.string, "cd") == 0)
+        if (strcmp(data.cmdargtoken[2].val.string, "cd") == 0)
         {
             printf("type = COMPLEX_DOUBLE\n");
             datatype = _DATATYPE_COMPLEX_DOUBLE;
         }
 
-        if(strcmp(data.cmdargtoken[2].val.string, "u") == 0)
+        if (strcmp(data.cmdargtoken[2].val.string, "u") == 0)
         {
             printf("type = USHORT\n");
             datatype = _DATATYPE_UINT16;
         }
 
-        if(strcmp(data.cmdargtoken[2].val.string, "l") == 0)
+        if (strcmp(data.cmdargtoken[2].val.string, "l") == 0)
         {
             printf("type = LONG\n");
             datatype = _DATATYPE_INT64;
         }
 
-        if(datatype == 0)
+        if (datatype == 0)
         {
             printf("Data type \"%s\" not recognized\n", data.cmdargtoken[2].val.string);
             printf("must be : \n");
@@ -141,17 +120,17 @@ static errno_t create_image__cli()
             return CLICMD_INVALID_ARG;
         }
         naxis = 0;
-        imsize = (uint32_t *) malloc(sizeof(uint32_t) * 5);
+        imsize = (uint32_t *)malloc(sizeof(uint32_t) * 5);
         i = 3;
-        while(data.cmdargtoken[i].type == 2)
+        while (data.cmdargtoken[i].type == 2)
         {
             imsize[naxis] = data.cmdargtoken[i].val.numl;
             naxis++;
             i++;
         }
 
-        create_image_ID(data.cmdargtoken[1].val.string, naxis, imsize, datatype,
-                        data.SHARED_DFT, data.NBKEYWORD_DFT, 0, NULL);
+        create_image_ID(data.cmdargtoken[1].val.string, naxis, imsize, datatype, data.SHARED_DFT, data.NBKEYWORD_DFT, 0,
+                        NULL);
 
         free(imsize);
         return CLICMD_SUCCESS;
@@ -162,45 +141,37 @@ static errno_t create_image__cli()
     }
 }
 
-
-
-
 static errno_t create_image_shared__cli() // default precision
 {
     uint32_t *imsize;
     long naxis = 0;
     long i;
 
-
-    if(0
-            + CLI_checkarg(1, CLIARG_STR_NOT_IMG)
-            + CLI_checkarg(2, CLIARG_LONG)
-            == 0)
+    if (0 + CLI_checkarg(1, CLIARG_STR_NOT_IMG) + CLI_checkarg(2, CLIARG_LONG) == 0)
     {
         naxis = 0;
-        imsize = (uint32_t *) malloc(sizeof(uint32_t) * 5);
+        imsize = (uint32_t *)malloc(sizeof(uint32_t) * 5);
         i = 2;
-        while(data.cmdargtoken[i].type == 2)
+        while (data.cmdargtoken[i].type == 2)
         {
             imsize[naxis] = data.cmdargtoken[i].val.numl;
             naxis++;
             i++;
         }
-        switch(data.precision)
+        switch (data.precision)
         {
         case 0:
-            create_image_ID(data.cmdargtoken[1].val.string, naxis, imsize, _DATATYPE_FLOAT,
-                            1, data.NBKEYWORD_DFT, 0, NULL);
+            create_image_ID(data.cmdargtoken[1].val.string, naxis, imsize, _DATATYPE_FLOAT, 1, data.NBKEYWORD_DFT, 0,
+                            NULL);
             break;
         case 1:
-            create_image_ID(data.cmdargtoken[1].val.string, naxis, imsize, _DATATYPE_DOUBLE,
-                            1, data.NBKEYWORD_DFT, 0, NULL);
+            create_image_ID(data.cmdargtoken[1].val.string, naxis, imsize, _DATATYPE_DOUBLE, 1, data.NBKEYWORD_DFT, 0,
+                            NULL);
             break;
         }
         free(imsize);
         printf("Creating 10 semaphores\n");
-        COREMOD_MEMORY_image_set_createsem(data.cmdargtoken[1].val.string,
-                                           IMAGE_NB_SEMAPHORE);
+        COREMOD_MEMORY_image_set_createsem(data.cmdargtoken[1].val.string, IMAGE_NB_SEMAPHORE);
         return CLICMD_SUCCESS;
     }
     else
@@ -209,32 +180,25 @@ static errno_t create_image_shared__cli() // default precision
     }
 }
 
-
-
-
 static errno_t create_ushort_image_shared__cli() // default precision
 {
     uint32_t *imsize;
     long naxis = 0;
     long i;
 
-
-    if(0
-            + CLI_checkarg(1, CLIARG_STR_NOT_IMG)
-            + CLI_checkarg(2, CLIARG_LONG)
-            == 0)
+    if (0 + CLI_checkarg(1, CLIARG_STR_NOT_IMG) + CLI_checkarg(2, CLIARG_LONG) == 0)
     {
         naxis = 0;
-        imsize = (uint32_t *) malloc(sizeof(uint32_t) * 5);
+        imsize = (uint32_t *)malloc(sizeof(uint32_t) * 5);
         i = 2;
-        while(data.cmdargtoken[i].type == 2)
+        while (data.cmdargtoken[i].type == 2)
         {
             imsize[naxis] = data.cmdargtoken[i].val.numl;
             naxis++;
             i++;
         }
-        create_image_ID(data.cmdargtoken[1].val.string, naxis, imsize, _DATATYPE_UINT16,
-                        1, data.NBKEYWORD_DFT, 0, NULL);
+        create_image_ID(data.cmdargtoken[1].val.string, naxis, imsize, _DATATYPE_UINT16, 1, data.NBKEYWORD_DFT, 0,
+                        NULL);
 
         free(imsize);
         return CLICMD_SUCCESS;
@@ -251,23 +215,18 @@ static errno_t create_sshort_image_shared__cli() // default precision
     long naxis = 0;
     long i;
 
-
-    if(0
-            + CLI_checkarg(1, CLIARG_STR_NOT_IMG)
-            + CLI_checkarg(2, CLIARG_LONG)
-            == 0)
+    if (0 + CLI_checkarg(1, CLIARG_STR_NOT_IMG) + CLI_checkarg(2, CLIARG_LONG) == 0)
     {
         naxis = 0;
-        imsize = (uint32_t *) malloc(sizeof(uint32_t) * 5);
+        imsize = (uint32_t *)malloc(sizeof(uint32_t) * 5);
         i = 2;
-        while(data.cmdargtoken[i].type == 2)
+        while (data.cmdargtoken[i].type == 2)
         {
             imsize[naxis] = data.cmdargtoken[i].val.numl;
             naxis++;
             i++;
         }
-        create_image_ID(data.cmdargtoken[1].val.string, naxis, imsize, _DATATYPE_INT16,
-                        1, data.NBKEYWORD_DFT, 0, NULL);
+        create_image_ID(data.cmdargtoken[1].val.string, naxis, imsize, _DATATYPE_INT16, 1, data.NBKEYWORD_DFT, 0, NULL);
 
         free(imsize);
         return CLICMD_SUCCESS;
@@ -278,9 +237,6 @@ static errno_t create_sshort_image_shared__cli() // default precision
     }
 }
 
-
-
-
 static errno_t create_3Dimage_float()
 {
     DEBUG_TRACE_FSTART();
@@ -289,14 +245,14 @@ static errno_t create_3Dimage_float()
 
     // CHECK ARGS
     //  printf("CREATING 3D IMAGE\n");
-    imsize = (uint32_t *) malloc(sizeof(uint32_t) * 3);
+    imsize = (uint32_t *)malloc(sizeof(uint32_t) * 3);
 
     imsize[0] = data.cmdargtoken[2].val.numl;
     imsize[1] = data.cmdargtoken[3].val.numl;
     imsize[2] = data.cmdargtoken[4].val.numl;
 
-    create_image_ID(data.cmdargtoken[1].val.string, 3, imsize, _DATATYPE_FLOAT,
-                    data.SHARED_DFT, data.NBKEYWORD_DFT, 0, NULL);
+    create_image_ID(data.cmdargtoken[1].val.string, 3, imsize, _DATATYPE_FLOAT, data.SHARED_DFT, data.NBKEYWORD_DFT, 0,
+                    NULL);
 
     free(imsize);
 
@@ -304,14 +260,6 @@ static errno_t create_3Dimage_float()
     return RETURN_SUCCESS;
 }
 
-
-
-
-
-
-
-
-
 // ==========================================
 // Register CLI commands
 // ==========================================
@@ -320,133 +268,77 @@ errno_t create_image_addCLIcmd()
 {
 
     RegisterCLIcommand(
-        "creaim",
-        __FILE__,
-        create_image__cli,
-        "create image, default precision",
-        "<name> <xsize> <ysize> <opt: zsize>",
+        "creaim", __FILE__, create_image__cli, "create image, default precision", "<name> <xsize> <ysize> <opt: zsize>",
         "creaim imname 512 512",
         "long create_image_ID(const char *name, long naxis, uint32_t *size, uint8_t datatype, 0, 10, NULL)");
 
     RegisterCLIcommand(
-        "creaimshm",
-        __FILE__, create_image_shared__cli,
-        "create image in shared mem, default precision",
-        "<name> <xsize> <ysize> <opt: zsize>",
-        "creaimshm imname 512 512",
+        "creaimshm", __FILE__, create_image_shared__cli, "create image in shared mem, default precision",
+        "<name> <xsize> <ysize> <opt: zsize>", "creaimshm imname 512 512",
         "long create_image_ID(const char *name, long naxis, uint32_t *size, uint8_t datatype, 0, 10, NULL)");
 
-    RegisterCLIcommand(
-        "creaushortimshm",
-        __FILE__,
-        create_ushort_image_shared__cli,
-        "create unsigned short image in shared mem",
-        "<name> <xsize> <ysize> <opt: zsize>",
-        "creaushortimshm imname 512 512",
-        "long create_image_ID(const char *name, long naxis, long *size, _DATATYPE_UINT16, 0, 10, NULL)");
-
-    RegisterCLIcommand(
-        "creasshortimshm",
-        __FILE__,
-        create_sshort_image_shared__cli,
-        "create signed short image in shared mem",
-        "<name> <xsize> <ysize> <opt: zsize>",
-        "creasshortimshm imname 512 512",
-        "long create_image_ID(const char *name, long naxis, long *size, _DATATYPE_INT16, 0, 10, NULL)");
-
-    RegisterCLIcommand(
-        "crea3dim",
-        __FILE__,
-        create_3Dimage_float,
-        "creates 3D image, single precision",
-        "<name> <xsize> <ysize> <zsize>",
-        "crea3dim imname 512 512 100",
-        "long create_image_ID(const char *name, long naxis, long *size, _DATATYPE_FLOAT, 0, 10, NULL)");
+    RegisterCLIcommand("creaushortimshm", __FILE__, create_ushort_image_shared__cli,
+                       "create unsigned short image in shared mem", "<name> <xsize> <ysize> <opt: zsize>",
+                       "creaushortimshm imname 512 512",
+                       "long create_image_ID(const char *name, long naxis, long *size, _DATATYPE_UINT16, 0, 10, NULL)");
 
+    RegisterCLIcommand("creasshortimshm", __FILE__, create_sshort_image_shared__cli,
+                       "create signed short image in shared mem", "<name> <xsize> <ysize> <opt: zsize>",
+                       "creasshortimshm imname 512 512",
+                       "long create_image_ID(const char *name, long naxis, long *size, _DATATYPE_INT16, 0, 10, NULL)");
 
+    RegisterCLIcommand("crea3dim", __FILE__, create_3Dimage_float, "creates 3D image, single precision",
+                       "<name> <xsize> <ysize> <zsize>", "crea3dim imname 512 512 100",
+                       "long create_image_ID(const char *name, long naxis, long *size, _DATATYPE_FLOAT, 0, 10, NULL)");
 
     return RETURN_SUCCESS;
 }
 
-
-
-
-
-
-
-
 /* creates an image ID */
 /* all images should be created by this function */
-errno_t create_image_ID(
-    const char *name,
-    long        naxis,
-    uint32_t   *size,
-    uint8_t     datatype,
-    int         shared,
-    int         NBkw,
-    int         CBsize,
-    imageID    *outID
-)
+errno_t create_image_ID(const char *name, long naxis, uint32_t *size, uint8_t datatype, int shared, int NBkw,
+                        int CBsize, imageID *outID)
 {
     DEBUG_TRACE_FSTART();
-    DEBUG_TRACEPOINT(
-        "FARG %s %ld %d %d %d %d",
-        name,
-        naxis,
-        (int) datatype,
-        shared,
-        NBkw,
-        CBsize
-    );
+    DEBUG_TRACEPOINT("FARG %s %ld %d %d %d %d", name, naxis, (int)datatype, shared, NBkw, CBsize);
 
     imageID ID;
 
-
     ID = -1;
-    if(image_ID(name) == -1)
+    if (image_ID(name) == -1)
     {
         ID = next_avail_image_ID();
 
-        ImageStreamIO_createIm(
-            &data.image[ID],
-            name,
-            naxis,
-            size,
-            datatype,
-            shared,
-            NBkw,
-            CBsize
-        );
+        ImageStreamIO_createIm(&data.image[ID], name, naxis, size, datatype, shared, NBkw, CBsize);
     }
     else
     {
         // Cannot create image : name already in use
         ID = image_ID(name);
 
-        if(data.image[ID].md[0].datatype != datatype)
+        if (data.image[ID].md[0].datatype != datatype)
         {
             FUNC_RETURN_FAILURE("Pre-existing image \"%s\" has wrong type", name);
         }
-        if(data.image[ID].md[0].naxis != naxis)
+        if (data.image[ID].md[0].naxis != naxis)
         {
             FUNC_RETURN_FAILURE("Pre-existing image \"%s\" has wrong naxis", name);
         }
 
-        for(int i = 0; i < naxis; i++)
-            if(data.image[ID].md[0].size[i] != size[i])
+        for (int i = 0; i < naxis; i++)
+            if (data.image[ID].md[0].size[i] != size[i])
             {
-                FUNC_RETURN_FAILURE(
-                    "Pre-existing image \"%s\" has wrong size: axis %d :  %ld  %ld",
-                    name, i, (long) data.image[ID].md[0].size[i], (long) size[i]);
+                FUNC_RETURN_FAILURE("Pre-existing image \"%s\" has wrong size: axis %d :  %ld  %ld", name, i,
+                                    (long)data.image[ID].md[0].size[i], (long)size[i]);
             }
     }
 
-    if(data.MEM_MONITOR == 1)
+    if (data.MEM_MONITOR == 1)
     {
         list_image_ID_ncurses();
     }
 
-    if(outID != NULL)
+    if (outID != NULL)
     {
         *outID = ID;
     }
@@ -455,14 +347,7 @@ errno_t create_image_ID(
     return RETURN_SUCCESS;
 }
 
-
-
-
-errno_t create_1Dimage_ID(
-    const char *ID_name,
-    uint32_t    xsize,
-    imageID    *outID
-)
+errno_t create_1Dimage_ID(const char *ID_name, uint32_t xsize, imageID *outID)
 {
     DEBUG_TRACE_FSTART();
 
@@ -472,21 +357,18 @@ errno_t create_1Dimage_ID(
 
     naxes[0] = xsize;
 
-    if(data.precision == 0)
-    {   // single precision
+    if (data.precision == 0)
+    { // single precision
         FUNC_CHECK_RETURN(
-            create_image_ID(
-                ID_name, naxis, naxes, _DATATYPE_FLOAT, data.SHARED_DFT,
-                data.NBKEYWORD_DFT, 0, &ID));
+            create_image_ID(ID_name, naxis, naxes, _DATATYPE_FLOAT, data.SHARED_DFT, data.NBKEYWORD_DFT, 0, &ID));
     }
-    if(data.precision == 1)
-    {   // double precision
+    if (data.precision == 1)
+    { // double precision
         FUNC_CHECK_RETURN(
-            create_image_ID(ID_name, naxis, naxes, _DATATYPE_DOUBLE, data.SHARED_DFT,
-                            data.NBKEYWORD_DFT, 0, &ID));
+            create_image_ID(ID_name, naxis, naxes, _DATATYPE_DOUBLE, data.SHARED_DFT, data.NBKEYWORD_DFT, 0, &ID));
     }
 
-    if(outID != NULL)
+    if (outID != NULL)
     {
         *outID = ID;
     }
@@ -495,13 +377,7 @@ errno_t create_1Dimage_ID(
     return RETURN_SUCCESS;
 }
 
-
-
-errno_t create_1DCimage_ID(
-    const char *ID_name,
-    uint32_t    xsize,
-    imageID    *outID
-)
+errno_t create_1DCimage_ID(const char *ID_name, uint32_t xsize, imageID *outID)
 {
     DEBUG_TRACE_FSTART();
 
@@ -511,20 +387,18 @@ errno_t create_1DCimage_ID(
 
     naxes[0] = xsize;
 
-    if(data.precision == 0)
-    {   // single precision
-        FUNC_CHECK_RETURN(
-            create_image_ID(ID_name, naxis, naxes, _DATATYPE_COMPLEX_FLOAT,
-                            data.SHARED_DFT, data.NBKEYWORD_DFT, 0, &ID));
+    if (data.precision == 0)
+    { // single precision
+        FUNC_CHECK_RETURN(create_image_ID(ID_name, naxis, naxes, _DATATYPE_COMPLEX_FLOAT, data.SHARED_DFT,
+                                          data.NBKEYWORD_DFT, 0, &ID));
     }
-    if(data.precision == 1)
-    {   // double precision
-        FUNC_CHECK_RETURN(
-            create_image_ID(ID_name, naxis, naxes, _DATATYPE_COMPLEX_DOUBLE,
-                            data.SHARED_DFT, data.NBKEYWORD_DFT, 0, &ID));
+    if (data.precision == 1)
+    { // double precision
+        FUNC_CHECK_RETURN(create_image_ID(ID_name, naxis, naxes, _DATATYPE_COMPLEX_DOUBLE, data.SHARED_DFT,
+                                          data.NBKEYWORD_DFT, 0, &ID));
     }
 
-    if(outID != NULL)
+    if (outID != NULL)
     {
         *outID = ID;
     }
@@ -533,14 +407,7 @@ errno_t create_1DCimage_ID(
     return RETURN_SUCCESS;
 }
 
-
-
-errno_t create_2Dimage_ID(
-    const char *ID_name,
-    uint32_t    xsize,
-    uint32_t    ysize,
-    imageID    *outID
-)
+errno_t create_2Dimage_ID(const char *ID_name, uint32_t xsize, uint32_t ysize, imageID *outID)
 {
     DEBUG_TRACE_FSTART();
 
@@ -551,28 +418,24 @@ errno_t create_2Dimage_ID(
     naxes[0] = xsize;
     naxes[1] = ysize;
 
-    if(data.precision == 0)
-    {   // single precision
+    if (data.precision == 0)
+    { // single precision
         FUNC_CHECK_RETURN(
-            create_image_ID(ID_name, naxis, naxes, _DATATYPE_FLOAT, data.SHARED_DFT,
-                            data.NBKEYWORD_DFT, 0, &ID));
+            create_image_ID(ID_name, naxis, naxes, _DATATYPE_FLOAT, data.SHARED_DFT, data.NBKEYWORD_DFT, 0, &ID));
     }
-    else if(data.precision == 1)
-    {   // double precision
+    else if (data.precision == 1)
+    { // double precision
         FUNC_CHECK_RETURN(
-            create_image_ID(ID_name, naxis, naxes, _DATATYPE_DOUBLE, data.SHARED_DFT,
-                            data.NBKEYWORD_DFT, 0, &ID));
+            create_image_ID(ID_name, naxis, naxes, _DATATYPE_DOUBLE, data.SHARED_DFT, data.NBKEYWORD_DFT, 0, &ID));
     }
     else
-    {   // single precision
-        printf("Default precision (%d) invalid value: assuming single precision\n",
-               data.precision);
+    { // single precision
+        printf("Default precision (%d) invalid value: assuming single precision\n", data.precision);
         FUNC_CHECK_RETURN(
-            create_image_ID(ID_name, naxis, naxes, _DATATYPE_FLOAT, data.SHARED_DFT,
-                            data.NBKEYWORD_DFT, 0, &ID));
+            create_image_ID(ID_name, naxis, naxes, _DATATYPE_FLOAT, data.SHARED_DFT, data.NBKEYWORD_DFT, 0, &ID));
     }
 
-    if(outID != NULL)
+    if (outID != NULL)
     {
         *outID = ID;
     }
@@ -581,15 +444,7 @@ errno_t create_2Dimage_ID(
     return RETURN_SUCCESS;
 }
 
-
-
-
-errno_t create_2Dimage_ID_double(
-    const char *ID_name,
-    uint32_t    xsize,
-    uint32_t    ysize,
-    imageID    *outID
-)
+errno_t create_2Dimage_ID_double(const char *ID_name, uint32_t xsize, uint32_t ysize, imageID *outID)
 {
     DEBUG_TRACE_FSTART();
 
@@ -601,10 +456,9 @@ errno_t create_2Dimage_ID_double(
     naxes[1] = ysize;
 
     FUNC_CHECK_RETURN(
-        create_image_ID(ID_name, naxis, naxes, _DATATYPE_DOUBLE, data.SHARED_DFT,
-                        data.NBKEYWORD_DFT, 0, &ID));
+        create_image_ID(ID_name, naxis, naxes, _DATATYPE_DOUBLE, data.SHARED_DFT, data.NBKEYWORD_DFT, 0, &ID));
 
-    if(outID != NULL)
+    if (outID != NULL)
     {
         *outID = ID;
     }
@@ -613,14 +467,8 @@ errno_t create_2Dimage_ID_double(
     return RETURN_SUCCESS;
 }
 
-
 /* 2D complex image */
-errno_t create_2DCimage_ID(
-    const char *ID_name,
-    uint32_t    xsize,
-    uint32_t    ysize,
-    imageID    *outID
-)
+errno_t create_2DCimage_ID(const char *ID_name, uint32_t xsize, uint32_t ysize, imageID *outID)
 {
     DEBUG_TRACE_FSTART();
 
@@ -631,20 +479,18 @@ errno_t create_2DCimage_ID(
     naxes[0] = xsize;
     naxes[1] = ysize;
 
-    if(data.precision == 0)
-    {   // single precision
-        FUNC_CHECK_RETURN(
-            create_image_ID(ID_name, naxis, naxes, _DATATYPE_COMPLEX_FLOAT,
-                            data.SHARED_DFT, data.NBKEYWORD_DFT, 0, &ID));
+    if (data.precision == 0)
+    { // single precision
+        FUNC_CHECK_RETURN(create_image_ID(ID_name, naxis, naxes, _DATATYPE_COMPLEX_FLOAT, data.SHARED_DFT,
+                                          data.NBKEYWORD_DFT, 0, &ID));
     }
-    if(data.precision == 1)
-    {   // double precision
-        FUNC_CHECK_RETURN(
-            create_image_ID(ID_name, naxis, naxes, _DATATYPE_COMPLEX_DOUBLE,
-                            data.SHARED_DFT, data.NBKEYWORD_DFT, 0, &ID));
+    if (data.precision == 1)
+    { // double precision
+        FUNC_CHECK_RETURN(create_image_ID(ID_name, naxis, naxes, _DATATYPE_COMPLEX_DOUBLE, data.SHARED_DFT,
+                                          data.NBKEYWORD_DFT, 0, &ID));
     }
 
-    if(outID != NULL)
+    if (outID != NULL)
     {
         *outID = ID;
     }
@@ -653,15 +499,8 @@ errno_t create_2DCimage_ID(
     return RETURN_SUCCESS;
 }
 
-
-
 /* 2D complex image */
-errno_t create_2DCimage_ID_double(
-    const char    *ID_name,
-    uint32_t       xsize,
-    uint32_t       ysize,
-    imageID    *outID
-)
+errno_t create_2DCimage_ID_double(const char *ID_name, uint32_t xsize, uint32_t ysize, imageID *outID)
 {
     DEBUG_TRACE_FSTART();
 
@@ -673,10 +512,9 @@ errno_t create_2DCimage_ID_double(
     naxes[1] = ysize;
 
     FUNC_CHECK_RETURN(
-        create_image_ID(ID_name, naxis, naxes, _DATATYPE_COMPLEX_DOUBLE,
-                        data.SHARED_DFT, data.NBKEYWORD_DFT, 0, &ID));
+        create_image_ID(ID_name, naxis, naxes, _DATATYPE_COMPLEX_DOUBLE, data.SHARED_DFT, data.NBKEYWORD_DFT, 0, &ID));
 
-    if(outID != NULL)
+    if (outID != NULL)
     {
         *outID = ID;
     }
@@ -685,16 +523,8 @@ errno_t create_2DCimage_ID_double(
     return RETURN_SUCCESS;
 }
 
-
-
 /* 3D image, single precision */
-errno_t create_3Dimage_ID_float(
-    const char *ID_name,
-    uint32_t xsize,
-    uint32_t ysize,
-    uint32_t zsize,
-    imageID    *outID
-)
+errno_t create_3Dimage_ID_float(const char *ID_name, uint32_t xsize, uint32_t ysize, uint32_t zsize, imageID *outID)
 {
     DEBUG_TRACE_FSTART();
 
@@ -710,13 +540,12 @@ errno_t create_3Dimage_ID_float(
     //  fflush(stdout);
 
     FUNC_CHECK_RETURN(
-        create_image_ID(ID_name, naxis, naxes, _DATATYPE_FLOAT, data.SHARED_DFT,
-                        data.NBKEYWORD_DFT, 0, &ID));
+        create_image_ID(ID_name, naxis, naxes, _DATATYPE_FLOAT, data.SHARED_DFT, data.NBKEYWORD_DFT, 0, &ID));
 
     //  printf("IMAGE CREATED WITH ID = %ld\n",ID);
     //  fflush(stdout);
 
-    if(outID != NULL)
+    if (outID != NULL)
     {
         *outID = ID;
     }
@@ -725,15 +554,8 @@ errno_t create_3Dimage_ID_float(
     return RETURN_SUCCESS;
 }
 
-
 /* 3D image, double precision */
-errno_t create_3Dimage_ID_double(
-    const char *ID_name,
-    uint32_t xsize,
-    uint32_t ysize,
-    uint32_t zsize,
-    imageID    *outID
-)
+errno_t create_3Dimage_ID_double(const char *ID_name, uint32_t xsize, uint32_t ysize, uint32_t zsize, imageID *outID)
 {
     DEBUG_TRACE_FSTART();
 
@@ -746,10 +568,9 @@ errno_t create_3Dimage_ID_double(
     naxes[2] = zsize;
 
     FUNC_CHECK_RETURN(
-        create_image_ID(ID_name, naxis, naxes, _DATATYPE_DOUBLE, data.SHARED_DFT,
-                        data.NBKEYWORD_DFT, 0, &ID));
+        create_image_ID(ID_name, naxis, naxes, _DATATYPE_DOUBLE, data.SHARED_DFT, data.NBKEYWORD_DFT, 0, &ID));
 
-    if(outID != NULL)
+    if (outID != NULL)
     {
         *outID = ID;
     }
@@ -758,16 +579,8 @@ errno_t create_3Dimage_ID_double(
     return RETURN_SUCCESS;
 }
 
-
-
 /* 3D image, default precision */
-errno_t create_3Dimage_ID(
-    const char *ID_name,
-    uint32_t xsize,
-    uint32_t ysize,
-    uint32_t zsize,
-    imageID    *outID
-)
+errno_t create_3Dimage_ID(const char *ID_name, uint32_t xsize, uint32_t ysize, uint32_t zsize, imageID *outID)
 {
     DEBUG_TRACE_FSTART();
 
@@ -775,29 +588,26 @@ errno_t create_3Dimage_ID(
     long naxis = 3;
     uint32_t *naxes;
 
-
-    naxes = (uint32_t *) malloc(sizeof(uint32_t) * 3);
+    naxes = (uint32_t *)malloc(sizeof(uint32_t) * 3);
     naxes[0] = xsize;
     naxes[1] = ysize;
     naxes[2] = zsize;
 
-    if(data.precision == 0)
-    {   // single precision
+    if (data.precision == 0)
+    { // single precision
         FUNC_CHECK_RETURN(
-            create_image_ID(ID_name, naxis, naxes, _DATATYPE_FLOAT, data.SHARED_DFT,
-                            data.NBKEYWORD_DFT, 0, &ID));
+            create_image_ID(ID_name, naxis, naxes, _DATATYPE_FLOAT, data.SHARED_DFT, data.NBKEYWORD_DFT, 0, &ID));
     }
 
-    if(data.precision == 1)
-    {   // double precision
+    if (data.precision == 1)
+    { // double precision
         FUNC_CHECK_RETURN(
-            create_image_ID(ID_name, naxis, naxes, _DATATYPE_DOUBLE, data.SHARED_DFT,
-                            data.NBKEYWORD_DFT, 0, &ID));
+            create_image_ID(ID_name, naxis, naxes, _DATATYPE_DOUBLE, data.SHARED_DFT, data.NBKEYWORD_DFT, 0, &ID));
     }
 
     free(naxes);
 
-    if(outID != NULL)
+    if (outID != NULL)
     {
         *outID = ID;
     }
@@ -806,15 +616,8 @@ errno_t create_3Dimage_ID(
     return RETURN_SUCCESS;
 }
 
-
 /* 3D complex image */
-errno_t create_3DCimage_ID(
-    const char *ID_name,
-    uint32_t xsize,
-    uint32_t ysize,
-    uint32_t zsize,
-    imageID    *outID
-)
+errno_t create_3DCimage_ID(const char *ID_name, uint32_t xsize, uint32_t ysize, uint32_t zsize, imageID *outID)
 {
     DEBUG_TRACE_FSTART();
 
@@ -822,28 +625,26 @@ errno_t create_3DCimage_ID(
     long naxis = 3;
     uint32_t *naxes;
 
-
-    naxes = (uint32_t *) malloc(sizeof(uint32_t) * 3);
+    naxes = (uint32_t *)malloc(sizeof(uint32_t) * 3);
     naxes[0] = xsize;
     naxes[1] = ysize;
     naxes[2] = zsize;
 
-    if(data.precision == 0)
-    {   // single precision
-        FUNC_CHECK_RETURN(
-            create_image_ID(ID_name, naxis, naxes, _DATATYPE_COMPLEX_FLOAT,
-                            data.SHARED_DFT, data.NBKEYWORD_DFT, 0, &ID));
+    if (data.precision == 0)
+    { // single precision
+        FUNC_CHECK_RETURN(create_image_ID(ID_name, naxis, naxes, _DATATYPE_COMPLEX_FLOAT, data.SHARED_DFT,
+                                          data.NBKEYWORD_DFT, 0, &ID));
     }
 
-    if(data.precision == 1)
-    {   // double precision
-        FUNC_CHECK_RETURN(create_image_ID(ID_name, naxis, naxes, _DATATYPE_COMPLEX_DOUBLE,
-                                          data.SHARED_DFT, data.NBKEYWORD_DFT, 0, &ID));
+    if (data.precision == 1)
+    { // double precision
+        FUNC_CHECK_RETURN(create_image_ID(ID_name, naxis, naxes, _DATATYPE_COMPLEX_DOUBLE, data.SHARED_DFT,
+                                          data.NBKEYWORD_DFT, 0, &ID));
     }
 
     free(naxes);
 
-    if(outID != NULL)
+    if (outID != NULL)
     {
         *outID = ID;
     }
@@ -851,9 +652,3 @@ errno_t create_3DCimage_ID(
     DEBUG_TRACE_FEXIT();
     return RETURN_SUCCESS;
 }
-
-
-
-
-
-
diff --git a/src/COREMOD_memory/create_image.h b/src/COREMOD_memory/create_image.h
index c935791f..7891e369 100644
--- a/src/COREMOD_memory/create_image.h
+++ b/src/COREMOD_memory/create_image.h
@@ -2,99 +2,27 @@
  * @file    create_image.h
  */
 
-
-
-
-
-
-
 errno_t create_image_addCLIcmd();
 
+errno_t create_image_ID(const char *name, long naxis, uint32_t *size, uint8_t datatype, int shared, int nbkw,
+                        int CBsize, imageID *outID);
 
+errno_t create_1Dimage_ID(const char *ID_name, uint32_t xsize, imageID *outID);
 
+errno_t create_1DCimage_ID(const char *ID_name, uint32_t xsize, imageID *outID);
 
+errno_t create_2Dimage_ID(const char *ID_name, uint32_t xsize, uint32_t ysize, imageID *outID);
 
-errno_t create_image_ID(
-    const char *name,
-    long        naxis,
-    uint32_t   *size,
-    uint8_t     datatype,
-    int         shared,
-    int         nbkw,
-    int         CBsize,
-    imageID    *outID
-);
-
-
-
-errno_t create_1Dimage_ID(
-    const char *ID_name,
-    uint32_t    xsize,
-    imageID    *outID
-);
-
-errno_t create_1DCimage_ID(
-    const char *ID_name,
-    uint32_t    xsize,
-    imageID    *outID
-);
-
-errno_t create_2Dimage_ID(
-    const char *ID_name,
-    uint32_t    xsize,
-    uint32_t    ysize,
-    imageID    *outID
-);
-
-errno_t create_2Dimage_ID_double(
-    const char *ID_name,
-    uint32_t    xsize,
-    uint32_t    ysize,
-    imageID    *outID
-);
+errno_t create_2Dimage_ID_double(const char *ID_name, uint32_t xsize, uint32_t ysize, imageID *outID);
 
-errno_t create_2DCimage_ID(
-    const char *ID_name,
-    uint32_t    xsize,
-    uint32_t    ysize,
-    imageID    *outID
-);
+errno_t create_2DCimage_ID(const char *ID_name, uint32_t xsize, uint32_t ysize, imageID *outID);
 
-errno_t create_2DCimage_ID_double(
-    const char *ID_name,
-    uint32_t    xsize,
-    uint32_t    ysize,
-    imageID    *outID
-);
+errno_t create_2DCimage_ID_double(const char *ID_name, uint32_t xsize, uint32_t ysize, imageID *outID);
 
-errno_t create_3Dimage_ID(
-    const char *ID_name,
-    uint32_t    xsize,
-    uint32_t    ysize,
-    uint32_t    zsize,
-    imageID    *outID
-);
+errno_t create_3Dimage_ID(const char *ID_name, uint32_t xsize, uint32_t ysize, uint32_t zsize, imageID *outID);
 
-errno_t create_3Dimage_ID_float(
-    const char *ID_name,
-    uint32_t xsize,
-    uint32_t ysize,
-    uint32_t zsize,
-    imageID    *outID
-);
+errno_t create_3Dimage_ID_float(const char *ID_name, uint32_t xsize, uint32_t ysize, uint32_t zsize, imageID *outID);
 
-errno_t create_3Dimage_ID_double(
-    const char *ID_name,
-    uint32_t    xsize,
-    uint32_t    ysize,
-    uint32_t    zsize,
-    imageID    *outID
-);
+errno_t create_3Dimage_ID_double(const char *ID_name, uint32_t xsize, uint32_t ysize, uint32_t zsize, imageID *outID);
 
-errno_t create_3DCimage_ID(
-    const char *ID_name,
-    uint32_t    xsize,
-    uint32_t    ysize,
-    uint32_t    zsize,
-    imageID    *outID
-);
+errno_t create_3DCimage_ID(const char *ID_name, uint32_t xsize, uint32_t ysize, uint32_t zsize, imageID *outID);
diff --git a/src/COREMOD_memory/create_variable.c b/src/COREMOD_memory/create_variable.c
index 4519d446..fcbf728f 100644
--- a/src/COREMOD_memory/create_variable.c
+++ b/src/COREMOD_memory/create_variable.c
@@ -1,22 +1,14 @@
 /**
  * @file    create_variable.c
- * @brief   create variables 
+ * @brief   create variables
  */
 
-
 #include "CommandLineInterface/CLIcore.h"
-#include "variable_ID.h"
 #include "image_ID.h"
-
-
-
-
+#include "variable_ID.h"
 
 /* creates floating point variable */
-variableID create_variable_ID(
-    const char *name,
-    double value
-)
+variableID create_variable_ID(const char *name, double value)
 {
     variableID ID;
     long i1, i2;
@@ -29,18 +21,16 @@ variableID create_variable_ID(
     i1 = image_ID(name);
     //printf("TEST   %s  %ld   %ld %ld ================== \n", __FILE__, __LINE__, data.NB_MAX_IMAGE, data.NB_MAX_VARIABLE);
 
-
     i2 = variable_ID(name);
     //    printf("TEST   %s  %ld   %ld %ld ================== \n", __FILE__, __LINE__, data.NB_MAX_IMAGE, data.NB_MAX_VARIABLE);
 
-    if(i1 != -1)
+    if (i1 != -1)
     {
-        printf("ERROR: cannot create variable \"%s\": name already used as an image\n",
-               name);
+        printf("ERROR: cannot create variable \"%s\": name already used as an image\n", name);
     }
     else
     {
-        if(i2 != -1)
+        if (i2 != -1)
         {
             //	  printf("Warning : variable name \"%s\" is already in use\n",name);
             ID = i2;
@@ -54,19 +44,13 @@ variableID create_variable_ID(
         data.variable[ID].type = 0; /** floating point double */
         strcpy(data.variable[ID].name, name);
         data.variable[ID].value.f = value;
-
     }
     //    printf("TEST   %s  %ld   %ld %ld ================== \n", __FILE__, __LINE__, data.NB_MAX_IMAGE, data.NB_MAX_VARIABLE);
     return ID;
 }
 
-
-
 /* creates long variable */
-variableID create_variable_long_ID(
-    const char *name,
-    long value
-)
+variableID create_variable_long_ID(const char *name, long value)
 {
     variableID ID;
     long i1, i2;
@@ -75,14 +59,13 @@ variableID create_variable_long_ID(
     i1 = image_ID(name);
     i2 = variable_ID(name);
 
-    if(i1 != -1)
+    if (i1 != -1)
     {
-        printf("ERROR: cannot create variable \"%s\": name already used as an image\n",
-               name);
+        printf("ERROR: cannot create variable \"%s\": name already used as an image\n", name);
     }
     else
     {
-        if(i2 != -1)
+        if (i2 != -1)
         {
             //	  printf("Warning : variable name \"%s\" is already in use\n",name);
             ID = i2;
@@ -96,19 +79,13 @@ variableID create_variable_long_ID(
         data.variable[ID].type = 1; /** long */
         strcpy(data.variable[ID].name, name);
         data.variable[ID].value.l = value;
-
     }
 
     return ID;
 }
 
-
-
 /* creates long variable */
-variableID create_variable_string_ID(
-    const char *name,
-    const char *value
-)
+variableID create_variable_string_ID(const char *name, const char *value)
 {
     variableID ID;
     long i1, i2;
@@ -117,14 +94,13 @@ variableID create_variable_string_ID(
     i1 = image_ID(name);
     i2 = variable_ID(name);
 
-    if(i1 != -1)
+    if (i1 != -1)
     {
-        printf("ERROR: cannot create variable \"%s\": name already used as an image\n",
-               name);
+        printf("ERROR: cannot create variable \"%s\": name already used as an image\n", name);
     }
     else
     {
-        if(i2 != -1)
+        if (i2 != -1)
         {
             //	  printf("Warning : variable name \"%s\" is already in use\n",name);
             ID = i2;
@@ -142,14 +118,3 @@ variableID create_variable_string_ID(
 
     return ID;
 }
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/COREMOD_memory/create_variable.h b/src/COREMOD_memory/create_variable.h
index aace42cf..8e43a026 100644
--- a/src/COREMOD_memory/create_variable.h
+++ b/src/COREMOD_memory/create_variable.h
@@ -2,23 +2,8 @@
  * @file    create_variable.h
  */
 
+variableID create_variable_ID(const char *name, double value);
 
+variableID create_variable_long_ID(const char *name, long value);
 
-
-
-variableID create_variable_ID(
-    const char *name,
-    double      value
-);
-
-variableID create_variable_long_ID(
-    const char *name,
-    long value
-);
-
-variableID create_variable_string_ID(
-    const char *name,
-    const char *value
-);
-
-
+variableID create_variable_string_ID(const char *name, const char *value);
diff --git a/src/COREMOD_memory/delete_image.c b/src/COREMOD_memory/delete_image.c
index ccb670bf..f94bf46b 100644
--- a/src/COREMOD_memory/delete_image.c
+++ b/src/COREMOD_memory/delete_image.c
@@ -6,71 +6,28 @@
 #include <malloc.h>
 #include <sys/mman.h>
 
-
 #include "CommandLineInterface/CLIcore.h"
 #include "image_ID.h"
 #include "list_image.h"
 
-
-
 // Forward declaration(s)
-errno_t delete_image_ID(
-    const char *__restrict imname,
-    int errmode
-);
-
-
-
-
-
+errno_t delete_image_ID(const char *__restrict imname, int errmode);
 
 // CLI function arguments and parameters
 static char *imname;
 static long *errmode;
 
-
-
-
 // CLI function arguments and parameters
-static CLICMDARGDEF farg[] =
-{
-    {
-        CLIARG_IMG, ".imname", "image name", "im",
-        CLIARG_VISIBLE_DEFAULT,
-        (void **) &imname, NULL
-    },
-    {
-        CLIARG_LONG, ".errmode", "errors mode \n(0:ignore) (1:warning) (2:error) (3:exit)", "1",
-        CLIARG_HIDDEN_DEFAULT,
-        (void **) &errmode, NULL
-    }
-};
-
-
+static CLICMDARGDEF farg[] = {
+    {CLIARG_IMG, ".imname", "image name", "im", CLIARG_VISIBLE_DEFAULT, (void **)&imname, NULL},
+    {CLIARG_LONG, ".errmode", "errors mode \n(0:ignore) (1:warning) (2:error) (3:exit)", "1", CLIARG_HIDDEN_DEFAULT,
+     (void **)&errmode, NULL}};
 
 // CLI function initialization data
-static CLICMDDATA CLIcmddata =
-{
-    "rm",
-    "remove image",
-    CLICMD_FIELDS_DEFAULTS
-};
-
-
+static CLICMDDATA CLIcmddata = {"rm", "remove image", CLICMD_FIELDS_DEFAULTS};
 
 // detailed help
-static errno_t help_function()
-{
-    return RETURN_SUCCESS;
-}
-
-
-
-
-
-
-
-
+static errno_t help_function() { return RETURN_SUCCESS; }
 
 static errno_t compute_function()
 {
@@ -78,12 +35,7 @@ static errno_t compute_function()
 
     INSERT_STD_PROCINFO_COMPUTEFUNC_START
 
-    FUNC_CHECK_RETURN(
-        delete_image_ID(
-            imname,
-            (int) *errmode
-        )
-    );
+    FUNC_CHECK_RETURN(delete_image_ID(imname, (int)*errmode));
 
     INSERT_STD_PROCINFO_COMPUTEFUNC_END
 
@@ -91,15 +43,11 @@ static errno_t compute_function()
     return RETURN_SUCCESS;
 }
 
-
-
-
-
 INSERT_STD_FPSCLIfunctions
 
-
-// Register function in CLI
-errno_t CLIADDCMD_COREMOD_memory__delete_image()
+    // Register function in CLI
+    errno_t
+    CLIADDCMD_COREMOD_memory__delete_image()
 {
     //INSERT_STD_FPSCLIREGISTERFUNC
 
@@ -109,15 +57,6 @@ errno_t CLIADDCMD_COREMOD_memory__delete_image()
     return RETURN_SUCCESS;
 }
 
-
-
-
-
-
-
-
-
-
 /** @brief deletes an ID
  *
  * errmode values:
@@ -127,43 +66,38 @@ errno_t CLIADDCMD_COREMOD_memory__delete_image()
  * DELETE_IMAGE_ERRMODE_EXIT
  *
  */
-errno_t delete_image_ID(
-    const char *__restrict imname,
-    int errmode
-)
+errno_t delete_image_ID(const char *__restrict imname, int errmode)
 {
     DEBUG_TRACE_FSTART();
 
     imageID ID;
-    long    s;
-    char    fname[STRINGMAXLEN_FULLFILENAME];
+    long s;
+    char fname[STRINGMAXLEN_FULLFILENAME];
 
     ID = image_ID(imname);
 
-    if(ID == -1)
+    if (ID == -1)
     {
-        if(errmode == DELETE_IMAGE_ERRMODE_IGNORE)
+        if (errmode == DELETE_IMAGE_ERRMODE_IGNORE)
         {
             DEBUG_TRACE_FEXIT();
             return RETURN_SUCCESS;
         }
 
-        if(errmode == DELETE_IMAGE_ERRMODE_WARNING)
+        if (errmode == DELETE_IMAGE_ERRMODE_WARNING)
         {
-            PRINT_WARNING("Image \"%s\" does not exist",
-                          imname);
+            PRINT_WARNING("Image \"%s\" does not exist", imname);
             DEBUG_TRACE_FEXIT();
             return RETURN_SUCCESS;
         }
 
-        if(errmode == DELETE_IMAGE_ERRMODE_ERROR)
+        if (errmode == DELETE_IMAGE_ERRMODE_ERROR)
         {
-            PRINT_WARNING("Image \"%s\" does not exist",
-                          imname);
+            PRINT_WARNING("Image \"%s\" does not exist", imname);
             FUNC_RETURN_FAILURE("Image \"%s\" does not exist", imname);
         }
 
-        if(errmode == DELETE_IMAGE_ERRMODE_EXIT)
+        if (errmode == DELETE_IMAGE_ERRMODE_EXIT)
         {
             abort();
         }
@@ -173,9 +107,9 @@ errno_t delete_image_ID(
     {
         data.image[ID].used = 0;
 
-        if(data.image[ID].md[0].shared == 1)
+        if (data.image[ID].md[0].shared == 1)
         {
-            for(s = 0; s < data.image[ID].md[0].sem; s++)
+            for (s = 0; s < data.image[ID].md[0].sem; s++)
             {
                 sem_close(data.image[ID].semptr[s]);
             }
@@ -183,17 +117,15 @@ errno_t delete_image_ID(
             free(data.image[ID].semptr);
             data.image[ID].semptr = NULL;
 
-
-            if(data.image[ID].semlog != NULL)
+            if (data.image[ID].semlog != NULL)
             {
                 sem_close(data.image[ID].semlog);
                 data.image[ID].semlog = NULL;
             }
 
-            if(munmap(data.image[ID].md, data.image[ID].memsize) == -1)
+            if (munmap(data.image[ID].md, data.image[ID].memsize) == -1)
             {
-                printf("unmapping ID %ld : %p  %ld\n", ID, data.image[ID].md,
-                       data.image[ID].memsize);
+                printf("unmapping ID %ld : %p  %ld\n", ID, data.image[ID].md, data.image[ID].memsize);
                 perror("Error un-mmapping the file");
             }
 
@@ -205,68 +137,65 @@ errno_t delete_image_ID(
 
             data.image[ID].memsize = 0;
 
-            if(data.rmSHMfile == 1)    // remove files from disk
+            if (data.rmSHMfile == 1) // remove files from disk
             {
-                EXECUTE_SYSTEM_COMMAND("rm /dev/shm/sem.%s.%s_sem*",
-                                       data.shmsemdirname, imname);
-                WRITE_FULLFILENAME(fname, "/dev/shm/sem.%s.%s_semlog", data.shmsemdirname,
-                                   imname);
+                EXECUTE_SYSTEM_COMMAND("rm /dev/shm/sem.%s.%s_sem*", data.shmsemdirname, imname);
+                WRITE_FULLFILENAME(fname, "/dev/shm/sem.%s.%s_semlog", data.shmsemdirname, imname);
                 remove(fname);
 
                 EXECUTE_SYSTEM_COMMAND("rm %s/%s.im.shm", data.shmdir, imname);
             }
-
         }
         else
         {
-            if(data.image[ID].md[0].datatype == _DATATYPE_UINT8)
+            if (data.image[ID].md[0].datatype == _DATATYPE_UINT8)
             {
-                if(data.image[ID].array.UI8 == NULL)
+                if (data.image[ID].array.UI8 == NULL)
                 {
                     FUNC_RETURN_FAILURE("data array pointer is null");
                 }
                 free(data.image[ID].array.UI8);
                 data.image[ID].array.UI8 = NULL;
             }
-            if(data.image[ID].md[0].datatype == _DATATYPE_INT32)
+            if (data.image[ID].md[0].datatype == _DATATYPE_INT32)
             {
-                if(data.image[ID].array.SI32 == NULL)
+                if (data.image[ID].array.SI32 == NULL)
                 {
                     FUNC_RETURN_FAILURE("data array pointer is null");
                 }
                 free(data.image[ID].array.SI32);
                 data.image[ID].array.SI32 = NULL;
             }
-            if(data.image[ID].md[0].datatype == _DATATYPE_FLOAT)
+            if (data.image[ID].md[0].datatype == _DATATYPE_FLOAT)
             {
-                if(data.image[ID].array.F == NULL)
+                if (data.image[ID].array.F == NULL)
                 {
                     FUNC_RETURN_FAILURE("data array pointer is null");
                 }
                 free(data.image[ID].array.F);
                 data.image[ID].array.F = NULL;
             }
-            if(data.image[ID].md[0].datatype == _DATATYPE_DOUBLE)
+            if (data.image[ID].md[0].datatype == _DATATYPE_DOUBLE)
             {
-                if(data.image[ID].array.D == NULL)
+                if (data.image[ID].array.D == NULL)
                 {
                     FUNC_RETURN_FAILURE("data array pointer is null");
                 }
                 free(data.image[ID].array.D);
                 data.image[ID].array.D = NULL;
             }
-            if(data.image[ID].md[0].datatype == _DATATYPE_COMPLEX_FLOAT)
+            if (data.image[ID].md[0].datatype == _DATATYPE_COMPLEX_FLOAT)
             {
-                if(data.image[ID].array.CF == NULL)
+                if (data.image[ID].array.CF == NULL)
                 {
                     FUNC_RETURN_FAILURE("data array pointer is null");
                 }
                 free(data.image[ID].array.CF);
                 data.image[ID].array.CF = NULL;
             }
-            if(data.image[ID].md[0].datatype == _DATATYPE_COMPLEX_DOUBLE)
+            if (data.image[ID].md[0].datatype == _DATATYPE_COMPLEX_DOUBLE)
             {
-                if(data.image[ID].array.CD == NULL)
+                if (data.image[ID].array.CD == NULL)
                 {
                     FUNC_RETURN_FAILURE("data array pointer is null");
                 }
@@ -274,28 +203,25 @@ errno_t delete_image_ID(
                 data.image[ID].array.CD = NULL;
             }
 
-            if(data.image[ID].md == NULL)
+            if (data.image[ID].md == NULL)
             {
                 FUNC_RETURN_FAILURE("data array pointer is null");
             }
             free(data.image[ID].md);
             data.image[ID].md = NULL;
 
-
-            if(data.image[ID].kw != NULL)
+            if (data.image[ID].kw != NULL)
             {
                 free(data.image[ID].kw);
                 data.image[ID].kw = NULL;
             }
-
         }
         //free(data.image[ID].logstatus);
         /*      free(data.image[ID].size);*/
         //      data.image[ID].md[0].last_access = 0;
     }
 
-
-    if(data.MEM_MONITOR == 1)
+    if (data.MEM_MONITOR == 1)
     {
         list_image_ID_ncurses();
     }
@@ -304,19 +230,15 @@ errno_t delete_image_ID(
     return RETURN_SUCCESS;
 }
 
-
-
 // delete all images with a prefix
-errno_t delete_image_ID_prefix(
-    const char *prefix
-)
+errno_t delete_image_ID_prefix(const char *prefix)
 {
     imageID i;
 
-    for(i = 0; i < data.NB_MAX_IMAGE; i++)
+    for (i = 0; i < data.NB_MAX_IMAGE; i++)
     {
-        if(data.image[i].used == 1)
-            if((strncmp(prefix, data.image[i].name, strlen(prefix))) == 0)
+        if (data.image[i].used == 1)
+            if ((strncmp(prefix, data.image[i].name, strlen(prefix))) == 0)
             {
                 printf("deleting image %s\n", data.image[i].name);
                 delete_image_ID(data.image[i].name, DELETE_IMAGE_ERRMODE_IGNORE);
@@ -324,6 +246,3 @@ errno_t delete_image_ID_prefix(
     }
     return RETURN_SUCCESS;
 }
-
-
-
diff --git a/src/COREMOD_memory/delete_image.h b/src/COREMOD_memory/delete_image.h
index 681b6646..37986343 100644
--- a/src/COREMOD_memory/delete_image.h
+++ b/src/COREMOD_memory/delete_image.h
@@ -1,21 +1,15 @@
 #ifndef MILK_COREMOD_MEMORY_DELETE_IMAGE_H
 #define MILK_COREMOD_MEMORY_DELETE_IMAGE_H
 
-
-#define DELETE_IMAGE_ERRMODE_IGNORE  0
+#define DELETE_IMAGE_ERRMODE_IGNORE 0
 #define DELETE_IMAGE_ERRMODE_WARNING 1
-#define DELETE_IMAGE_ERRMODE_ERROR   2
-#define DELETE_IMAGE_ERRMODE_EXIT    3
+#define DELETE_IMAGE_ERRMODE_ERROR 2
+#define DELETE_IMAGE_ERRMODE_EXIT 3
 
 errno_t CLIADDCMD_COREMOD_memory__delete_image();
 
-errno_t    delete_image_ID(
-    const char *imname,
-    int errmode
-);
+errno_t delete_image_ID(const char *imname, int errmode);
 
-errno_t    delete_image_ID_prefix(
-    const char *prefix
-);
+errno_t delete_image_ID_prefix(const char *prefix);
 
 #endif
diff --git a/src/COREMOD_memory/delete_sharedmem_image.c b/src/COREMOD_memory/delete_sharedmem_image.c
index 1d7ed525..c9df065d 100644
--- a/src/COREMOD_memory/delete_sharedmem_image.c
+++ b/src/COREMOD_memory/delete_sharedmem_image.c
@@ -6,88 +6,49 @@
 #include <malloc.h>
 #include <sys/mman.h>
 
-
 #include "CommandLineInterface/CLIcore.h"
 
 #include "image_ID.h"
 #include "list_image.h"
 
-
-
 // CLI function arguments and parameters
 static char *imname;
 
-
-
-
 // CLI function arguments and parameters
-static CLICMDARGDEF farg[] =
-{
-    {
-        CLIARG_IMG, ".imname", "image name", "im",
-        CLIARG_VISIBLE_DEFAULT,
-        (void **) &imname, NULL
-    }
-};
-
-
+static CLICMDARGDEF farg[] = {
+    {CLIARG_IMG, ".imname", "image name", "im", CLIARG_VISIBLE_DEFAULT, (void **)&imname, NULL}};
 
 // CLI function initialization data
-static CLICMDDATA CLIcmddata =
-{
-    "rmshmim",
-    "remove shared image and files",
-    CLICMD_FIELDS_DEFAULTS
-};
-
-
+static CLICMDDATA CLIcmddata = {"rmshmim", "remove shared image and files", CLICMD_FIELDS_DEFAULTS};
 
 // detailed help
-static errno_t help_function()
-{
-    return RETURN_SUCCESS;
-}
-
-
+static errno_t help_function() { return RETURN_SUCCESS; }
 
-
-errno_t destroy_shared_image_ID(
-    const char *__restrict imname
-)
+errno_t destroy_shared_image_ID(const char *__restrict imname)
 {
     imageID ID;
 
     ID = image_ID(imname);
-    if((ID != -1) && (data.image[ID].md[0].shared == 1))
+    if ((ID != -1) && (data.image[ID].md[0].shared == 1))
     {
         ImageStreamIO_destroyIm(&data.image[ID]);
     }
     else
     {
-        fprintf(stderr,
-                "%c[%d;%dm WARNING: shared image %s does not exist [ %s  %s  %d ] %c[%d;m\n",
-                (char) 27, 1, 31, imname, __FILE__, __func__, __LINE__, (char) 27, 0);
+        fprintf(stderr, "%c[%d;%dm WARNING: shared image %s does not exist [ %s  %s  %d ] %c[%d;m\n", (char)27, 1, 31,
+                imname, __FILE__, __func__, __LINE__, (char)27, 0);
     }
 
     return RETURN_SUCCESS;
 }
 
-
-
-
-
-
 static errno_t compute_function()
 {
     DEBUG_TRACE_FSTART();
 
     INSERT_STD_PROCINFO_COMPUTEFUNC_START
 
-    FUNC_CHECK_RETURN(
-        destroy_shared_image_ID(
-            imname
-        )
-    );
+    FUNC_CHECK_RETURN(destroy_shared_image_ID(imname));
 
     INSERT_STD_PROCINFO_COMPUTEFUNC_END
 
@@ -95,15 +56,11 @@ static errno_t compute_function()
     return RETURN_SUCCESS;
 }
 
-
-
-
-
 INSERT_STD_FPSCLIfunctions
 
-
-// Register function in CLI
-errno_t CLIADDCMD_COREMOD_memory__delete_sharedmem_image()
+    // Register function in CLI
+    errno_t
+    CLIADDCMD_COREMOD_memory__delete_sharedmem_image()
 {
     //INSERT_STD_FPSCLIREGISTERFUNC
 
diff --git a/src/COREMOD_memory/delete_sharedmem_image.h b/src/COREMOD_memory/delete_sharedmem_image.h
index 5ce79c25..a0397f65 100644
--- a/src/COREMOD_memory/delete_sharedmem_image.h
+++ b/src/COREMOD_memory/delete_sharedmem_image.h
@@ -1,11 +1,8 @@
 #ifndef MILK_COREMOD_MEMORY_DELETE_SHAREDMEM_IMAGE_H
 #define MILK_COREMOD_MEMORY_DELETE_SHAREDMEM_IMAGE_H
 
-
 errno_t CLIADDCMD_COREMOD_memory__delete_sharedmem_image();
 
-errno_t destroy_shared_image_ID(
-    const char *__restrict imname
-);
+errno_t destroy_shared_image_ID(const char *__restrict imname);
 
 #endif
diff --git a/src/COREMOD_memory/delete_variable.c b/src/COREMOD_memory/delete_variable.c
index 65d1f0a7..98cb0a13 100644
--- a/src/COREMOD_memory/delete_variable.c
+++ b/src/COREMOD_memory/delete_variable.c
@@ -1,29 +1,23 @@
 /** @file delete_variable.c
  */
 
-
 #include "CommandLineInterface/CLIcore.h"
 #include "variable_ID.h"
 
 /* deletes a variable ID */
-errno_t delete_variable_ID(
-    const char *varname
-)
+errno_t delete_variable_ID(const char *varname)
 {
     imageID ID;
 
     ID = variable_ID(varname);
-    if(ID != -1)
+    if (ID != -1)
     {
         data.variable[ID].used = 0;
         /*      free(data.variable[ID].name);*/
     }
     else
-        fprintf(stderr,
-                "%c[%d;%dm WARNING: variable %s does not exist [ %s  %s  %d ] %c[%d;m\n",
-                (char) 27, 1, 31, varname, __FILE__, __func__, __LINE__, (char) 27, 0);
+        fprintf(stderr, "%c[%d;%dm WARNING: variable %s does not exist [ %s  %s  %d ] %c[%d;m\n", (char)27, 1, 31,
+                varname, __FILE__, __func__, __LINE__, (char)27, 0);
 
     return RETURN_SUCCESS;
 }
-
-
diff --git a/src/COREMOD_memory/delete_variable.h b/src/COREMOD_memory/delete_variable.h
index b7f19911..0d4180e5 100644
--- a/src/COREMOD_memory/delete_variable.h
+++ b/src/COREMOD_memory/delete_variable.h
@@ -1,7 +1,4 @@
 /** @file delete_variable.h
  */
 
-errno_t delete_variable_ID(
-    const char *varname
-);
-
+errno_t delete_variable_ID(const char *varname);
diff --git a/src/COREMOD_memory/fps_ID.c b/src/COREMOD_memory/fps_ID.c
index 4c536f7d..a7d815e2 100644
--- a/src/COREMOD_memory/fps_ID.c
+++ b/src/COREMOD_memory/fps_ID.c
@@ -3,31 +3,26 @@
  * @brief   find fps ID(s) from name
  */
 
-
 #include "CommandLineInterface/CLIcore.h"
 
-
-
 /* ID number corresponding to a name */
-long fps_ID(
-    const char *name
-)
+long fps_ID(const char *name)
 {
-    long    i;
-    int     loopOK;
-    long    tmpID = 0;
+    long i;
+    int loopOK;
+    long tmpID = 0;
 
     i = 0;
     loopOK = 1;
-    while(loopOK == 1)
+    while (loopOK == 1)
     {
 
-        if(data.fpsarray[i].SMfd >= 0)
+        if (data.fpsarray[i].SMfd >= 0)
         {
             // fps in use
 
-            if((strncmp(name, data.fpsarray[i].md->name, strlen(name)) == 0)
-                    && (data.fpsarray[i].md->name[strlen(name)] == '\0'))
+            if ((strncmp(name, data.fpsarray[i].md->name, strlen(name)) == 0) &&
+                (data.fpsarray[i].md->name[strlen(name)] == '\0'))
             {
                 loopOK = 0;
                 tmpID = i;
@@ -36,7 +31,7 @@ long fps_ID(
 
         i++;
 
-        if(i == data.NB_MAX_FPS)
+        if (i == data.NB_MAX_FPS)
         {
             loopOK = 0;
             tmpID = -1;
@@ -46,37 +41,33 @@ long fps_ID(
     return tmpID;
 }
 
-
-
-
 /* next available ID number */
 long next_avail_fps_ID()
 {
     long i;
     long ID = -1;
 
-# ifdef _OPENMP
-    #pragma omp critical
+#ifdef _OPENMP
+#pragma omp critical
     {
 #endif
-        for(i = 0; i < data.NB_MAX_FPS; i++)
+        for (i = 0; i < data.NB_MAX_FPS; i++)
         {
-            if(data.fpsarray[i].SMfd < 0)
+            if (data.fpsarray[i].SMfd < 0)
             {
                 // fps is unused, lets grab it
                 ID = i;
                 break;
             }
         }
-# ifdef _OPENMP
+#ifdef _OPENMP
     }
-# endif
+#endif
 
-    if(ID == -1)
+    if (ID == -1)
     {
         printf("ERROR: ran out of FPS IDs - cannot allocate new ID\n");
-        printf("NB_MAX_FPS should be increased above current value (%ld)\n",
-               data.NB_MAX_FPS);
+        printf("NB_MAX_FPS should be increased above current value (%ld)\n", data.NB_MAX_FPS);
         exit(0);
     }
 
diff --git a/src/COREMOD_memory/fps_ID.h b/src/COREMOD_memory/fps_ID.h
index 58082f60..ab1e709f 100644
--- a/src/COREMOD_memory/fps_ID.h
+++ b/src/COREMOD_memory/fps_ID.h
@@ -2,9 +2,6 @@
  * @file    fps_ID.h
  */
 
-long    fps_ID(
-    const char *name
-);
+long fps_ID(const char *name);
 
-
-long    next_avail_fps_ID();
+long next_avail_fps_ID();
diff --git a/src/COREMOD_memory/fps_create.c b/src/COREMOD_memory/fps_create.c
index b5d965a4..a927f7da 100644
--- a/src/COREMOD_memory/fps_create.c
+++ b/src/COREMOD_memory/fps_create.c
@@ -3,27 +3,18 @@
  * @brief   create function parameter structure
  */
 
-#include <sys/stat.h>
 #include <fcntl.h> // for open
-#include <unistd.h> // for close
 #include <sys/mman.h>
-
+#include <sys/stat.h>
+#include <unistd.h> // for close
 
 #include "CommandLineInterface/CLIcore.h"
 
-
-
-
-
 // ==========================================
 // Forward declaration(s)
 // ==========================================
 
-errno_t function_parameter_struct_create(
-    int NBparamMAX,
-    const char *name
-);
-
+errno_t function_parameter_struct_create(int NBparamMAX, const char *name);
 
 // ==========================================
 // Command line interface wrapper function(s)
@@ -31,26 +22,17 @@ errno_t function_parameter_struct_create(
 
 static errno_t fps_create__cli()
 {
-    if(0
-            + CLI_checkarg(1, CLIARG_LONG)
-            + CLI_checkarg_noerrmsg(2, CLIARG_STR)
-            == 0)
+    if (0 + CLI_checkarg(1, CLIARG_LONG) + CLI_checkarg_noerrmsg(2, CLIARG_STR) == 0)
     {
-        function_parameter_struct_create(
-            data.cmdargtoken[1].val.numl,
-            data.cmdargtoken[2].val.string
-        );
+        function_parameter_struct_create(data.cmdargtoken[1].val.numl, data.cmdargtoken[2].val.string);
         return CLICMD_SUCCESS;
     }
     else
     {
         return CLICMD_INVALID_ARG;
     }
-
 }
 
-
-
 // ==========================================
 // Register CLI command(s)
 // ==========================================
@@ -58,27 +40,14 @@ static errno_t fps_create__cli()
 errno_t fps_create_addCLIcmd()
 {
 
-    RegisterCLIcommand(
-        "fpscreate",
-        __FILE__,
-        fps_create__cli,
-        "create function parameter structure (FPS)",
-        "<NBparam> <name>",
-        "fpscreate 100 newfps",
-        "errno_t function_parameter_struct_create(int NBparamMAX, const char *name");
+    RegisterCLIcommand("fpscreate", __FILE__, fps_create__cli, "create function parameter structure (FPS)",
+                       "<NBparam> <name>", "fpscreate 100 newfps",
+                       "errno_t function_parameter_struct_create(int NBparamMAX, const char *name");
 
     return RETURN_SUCCESS;
 }
 
-
-
-
-
-
-errno_t function_parameter_struct_create(
-    int NBparamMAX,
-    const char *name
-)
+errno_t function_parameter_struct_create(int NBparamMAX, const char *name)
 {
     int index;
     char *mapv;
@@ -89,12 +58,12 @@ errno_t function_parameter_struct_create(
 
     char SM_fname[200];
     size_t sharedsize = 0; // shared memory size in bytes
-    int SM_fd; // shared memory file descriptor
+    int SM_fd;             // shared memory file descriptor
 
     char shmdname[200];
     function_parameter_struct_shmdirname(shmdname);
 
-    if(snprintf(SM_fname, sizeof(SM_fname), "%s/%s.fps.shm", shmdname, name) < 0)
+    if (snprintf(SM_fname, sizeof(SM_fname), "%s/%s.fps.shm", shmdname, name) < 0)
     {
         PRINT_ERROR("snprintf error");
     }
@@ -107,7 +76,7 @@ errno_t function_parameter_struct_create(
     sharedsize += sizeof(FUNCTION_PARAMETER) * NBparamMAX;
 
     SM_fd = open(SM_fname, O_RDWR | O_CREAT | O_TRUNC, (mode_t)0600);
-    if(SM_fd == -1)
+    if (SM_fd == -1)
     {
         perror("Error opening file for writing");
         printf("STEP %s %d\n", __FILE__, __LINE__);
@@ -119,18 +88,17 @@ errno_t function_parameter_struct_create(
 
     int result;
     result = lseek(SM_fd, sharedsize - 1, SEEK_SET);
-    if(result == -1)
+    if (result == -1)
     {
         close(SM_fd);
-        printf("ERROR [%s %s %d]: Error calling lseek() to 'stretch' the file\n",
-               __FILE__, __func__, __LINE__);
+        printf("ERROR [%s %s %d]: Error calling lseek() to 'stretch' the file\n", __FILE__, __func__, __LINE__);
         printf("STEP %s %d\n", __FILE__, __LINE__);
         fflush(stdout);
         exit(0);
     }
 
     result = write(SM_fd, "", 1);
-    if(result != 1)
+    if (result != 1)
     {
         close(SM_fd);
         perror("Error writing last byte of the file");
@@ -139,9 +107,8 @@ errno_t function_parameter_struct_create(
         exit(0);
     }
 
-    fps.md = (FUNCTION_PARAMETER_STRUCT_MD *) mmap(0, sharedsize,
-             PROT_READ | PROT_WRITE, MAP_SHARED, SM_fd, 0);
-    if(fps.md == MAP_FAILED)
+    fps.md = (FUNCTION_PARAMETER_STRUCT_MD *)mmap(0, sharedsize, PROT_READ | PROT_WRITE, MAP_SHARED, SM_fd, 0);
+    if (fps.md == MAP_FAILED)
     {
         close(SM_fd);
         perror("Error mmapping the file");
@@ -151,33 +118,28 @@ errno_t function_parameter_struct_create(
     }
     //funcparamstruct->md = funcparammd;
 
-    mapv = (char *) fps.md;
+    mapv = (char *)fps.md;
     mapv += sizeof(FUNCTION_PARAMETER_STRUCT_MD);
-    fps.parray = (FUNCTION_PARAMETER *) mapv;
-
-
+    fps.parray = (FUNCTION_PARAMETER *)mapv;
 
     //printf("shared memory space = %ld bytes\n", sharedsize); //TEST
 
-
     fps.md->NBparamMAX = NBparamMAX;
 
-    for(index = 0; index < NBparamMAX; index++)
+    for (index = 0; index < NBparamMAX; index++)
     {
         fps.parray[index].fpflag = 0; // not active
         fps.parray[index].cnt0 = 0;   // update counter
     }
 
-
-    strncpy(fps.md->name, name, STRINGMAXLEN_FPS_NAME-1);
-    strncpy(fps.md->callprogname, data.package_name, FPS_CALLPROGNAME_STRMAXLEN-1);
-    strncpy(fps.md->callfuncname, data.cmdargtoken[0].val.string,
-            FPS_CALLFUNCNAME_STRMAXLEN-1);
+    strncpy(fps.md->name, name, STRINGMAXLEN_FPS_NAME - 1);
+    strncpy(fps.md->callprogname, data.package_name, FPS_CALLPROGNAME_STRMAXLEN - 1);
+    strncpy(fps.md->callfuncname, data.cmdargtoken[0].val.string, FPS_CALLFUNCNAME_STRMAXLEN - 1);
 
     char cwd[FPS_CWD_STRLENMAX];
-    if(getcwd(cwd, sizeof(cwd)) != NULL)
+    if (getcwd(cwd, sizeof(cwd)) != NULL)
     {
-        strncpy(fps.md->workdir, cwd, FPS_CWD_STRLENMAX-1);
+        strncpy(fps.md->workdir, cwd, FPS_CWD_STRLENMAX - 1);
     }
     else
     {
@@ -185,7 +147,7 @@ errno_t function_parameter_struct_create(
         return 1;
     }
 
-    strncpy(fps.md->sourcefname, "NULL", FPS_SRCDIR_STRLENMAX-1);
+    strncpy(fps.md->sourcefname, "NULL", FPS_SRCDIR_STRLENMAX - 1);
     fps.md->sourceline = 0;
 
     // set default fpsdatadir
@@ -193,36 +155,27 @@ errno_t function_parameter_struct_create(
     // and create the directory
     mkdir(fps.md->datadir, S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH);
 
-
     // set default fpsconfdir
     sprintf(fps.md->confdir, "fps.%s.confdir", fps.md->name);
     // and create the directory
     mkdir(fps.md->confdir, S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH);
 
-
     // write currently loaded modules to fps
     fps.md->NBmodule = 0;
-    for(int m = 0; m < data.NBmodule; m++)
+    for (int m = 0; m < data.NBmodule; m++)
     {
-        if(data.module[m].type ==  MODULE_TYPE_CUSTOMLOAD) // custom loaded module
+        if (data.module[m].type == MODULE_TYPE_CUSTOMLOAD) // custom loaded module
         {
-            strncpy(fps.md->modulename[fps.md->NBmodule], data.module[m].loadname,
-                    FPS_MODULE_STRMAXLEN-1);
+            strncpy(fps.md->modulename[fps.md->NBmodule], data.module[m].loadname, FPS_MODULE_STRMAXLEN - 1);
             fps.md->NBmodule++;
         }
     }
 
-
-    fps.md->signal     = (uint64_t) FUNCTION_PARAMETER_STRUCT_SIGNAL_CONFRUN;
-    fps.md->confwaitus = (uint64_t) 1000; // 1 kHz default
+    fps.md->signal = (uint64_t)FUNCTION_PARAMETER_STRUCT_SIGNAL_CONFRUN;
+    fps.md->confwaitus = (uint64_t)1000; // 1 kHz default
     fps.md->msgcnt = 0;
 
     munmap(fps.md, sharedsize);
 
-
     return EXIT_SUCCESS;
 }
-
-
-
-
diff --git a/src/COREMOD_memory/fps_create.h b/src/COREMOD_memory/fps_create.h
index ebedf24d..a90656ae 100644
--- a/src/COREMOD_memory/fps_create.h
+++ b/src/COREMOD_memory/fps_create.h
@@ -5,12 +5,8 @@
 #ifndef _FPS_CREATE_H
 #define FPS_CREATE_H
 
-
 errno_t fps_create_addCLIcmd();
 
-errno_t function_parameter_struct_create(
-    int NBparamMAX,
-    const char *name
-);
+errno_t function_parameter_struct_create(int NBparamMAX, const char *name);
 
 #endif
diff --git a/src/COREMOD_memory/fps_list.c b/src/COREMOD_memory/fps_list.c
index 31f50daf..f5d2a6b1 100644
--- a/src/COREMOD_memory/fps_list.c
+++ b/src/COREMOD_memory/fps_list.c
@@ -3,32 +3,20 @@
  * @brief   list function parameter structure
  */
 
-
-
 #include <dirent.h>
 
 #include "CommandLineInterface/CLIcore.h"
 
-
-
-
-
 // ==========================================
 // Forward declaration(s)
 // ==========================================
 
 errno_t fps_list();
 
-
-
 // ==========================================
 // Command line interface wrapper function(s)
 // ==========================================
 
-
-
-
-
 // ==========================================
 // Register CLI command(s)
 // ==========================================
@@ -36,23 +24,12 @@ errno_t fps_list();
 errno_t fps_list_addCLIcmd()
 {
 
-    RegisterCLIcommand(
-        "fpslist",
-        __FILE__,
-        fps_list,
-        "list function parameter structures (FPSs)",
-        "no argument",
-        "fpslist",
-        "errno_t fps_list()");
+    RegisterCLIcommand("fpslist", __FILE__, fps_list, "list function parameter structures (FPSs)", "no argument",
+                       "fpslist", "errno_t fps_list()");
 
     return RETURN_SUCCESS;
 }
 
-
-
-
-
-
 errno_t fps_list()
 {
     long fpsID;
@@ -62,27 +39,24 @@ errno_t fps_list()
     int NBchar_fpsname = 12;
     int NBchar_NBparam = 4;
 
-    for(fpsID = 0; fpsID < data.NB_MAX_FPS; fpsID++)
+    for (fpsID = 0; fpsID < data.NB_MAX_FPS; fpsID++)
     {
-        if(data.fpsarray[fpsID].SMfd > -1)
+        if (data.fpsarray[fpsID].SMfd > -1)
         {
 
-            if(fpscnt == 0)
+            if (fpscnt == 0)
             {
                 printf("FPSs currently connected :\n");
             }
             // connected
-            printf("%*ld  %*s  %*ld/%*ld entries\n",
-                   NBchar_fpsID, fpsID,
-                   NBchar_fpsname, data.fpsarray[fpsID].md[0].name,
-                   NBchar_NBparam, data.fpsarray[fpsID].NBparamActive,
-                   NBchar_NBparam, data.fpsarray[fpsID].NBparam
-                  );
+            printf("%*ld  %*s  %*ld/%*ld entries\n", NBchar_fpsID, fpsID, NBchar_fpsname,
+                   data.fpsarray[fpsID].md[0].name, NBchar_NBparam, data.fpsarray[fpsID].NBparamActive, NBchar_NBparam,
+                   data.fpsarray[fpsID].NBparam);
 
             fpscnt++;
         }
     }
-    if(fpscnt == 0)
+    if (fpscnt == 0)
     {
         printf("No FPS currently connected\n");
     }
@@ -94,16 +68,16 @@ errno_t fps_list()
 
     struct dirent *de;
     DIR *dr = opendir(data.shmdir);
-    if(dr == NULL)
+    if (dr == NULL)
     {
         printf("Could not open current directory");
         return RETURN_FAILURE;
     }
 
     fpscnt = 0;
-    while((de = readdir(dr)) != NULL)
+    while ((de = readdir(dr)) != NULL)
     {
-        if(strstr(de->d_name, ".fps.shm") != NULL)
+        if (strstr(de->d_name, ".fps.shm") != NULL)
         {
             char fpsname[100];
             int slen = strlen(de->d_name);
@@ -111,17 +85,11 @@ errno_t fps_list()
 
             strncpy(fpsname, de->d_name, slen1);
             fpsname[slen1] = '\0';
-            printf("%*ld  %*s\n",
-                   NBchar_fpsID, fpscnt,
-                   NBchar_fpsname, fpsname);
-            fpscnt ++;
+            printf("%*ld  %*s\n", NBchar_fpsID, fpscnt, NBchar_fpsname, fpsname);
+            fpscnt++;
         }
     }
     closedir(dr);
 
     return RETURN_SUCCESS;
 }
-
-
-
-
diff --git a/src/COREMOD_memory/fps_list.h b/src/COREMOD_memory/fps_list.h
index 27c756b1..a87ea142 100644
--- a/src/COREMOD_memory/fps_list.h
+++ b/src/COREMOD_memory/fps_list.h
@@ -2,9 +2,6 @@
  * @file    fps_list.h
  */
 
-
-
 errno_t fps_list_addCLIcmd();
 
-
 errno_t fps_list();
diff --git a/src/COREMOD_memory/image_ID.c b/src/COREMOD_memory/image_ID.c
index f47f40da..7217d343 100644
--- a/src/COREMOD_memory/image_ID.c
+++ b/src/COREMOD_memory/image_ID.c
@@ -3,30 +3,24 @@
  * @brief   find image ID(s) from name
  */
 
-
 #include "CommandLineInterface/CLIcore.h"
 
-
-
 /* ID number corresponding to a name */
-imageID image_ID(
-    const char *name
-)
+imageID image_ID(const char *name)
 {
     DEBUG_TRACE_FSTART();
 
-    imageID    i;
-    int        loopOK;
-    imageID    tmpID = 0;
+    imageID i;
+    int loopOK;
+    imageID tmpID = 0;
 
     i = 0;
     loopOK = 1;
-    while(loopOK == 1)
+    while (loopOK == 1)
     {
-        if(data.image[i].used == 1)
+        if (data.image[i].used == 1)
         {
-            if((strncmp(name, data.image[i].name, strlen(name)) == 0)
-                    && (data.image[i].name[strlen(name)] == '\0'))
+            if ((strncmp(name, data.image[i].name, strlen(name)) == 0) && (data.image[i].name[strlen(name)] == '\0'))
             {
                 loopOK = 0;
                 tmpID = i;
@@ -35,7 +29,7 @@ imageID image_ID(
         }
         i++;
 
-        if(i == data.NB_MAX_IMAGE)
+        if (i == data.NB_MAX_IMAGE)
         {
             loopOK = 0;
             tmpID = -1;
@@ -47,26 +41,22 @@ imageID image_ID(
     return tmpID;
 }
 
-
 /* ID number corresponding to a name */
-imageID image_ID_noaccessupdate(
-    const char *name
-)
+imageID image_ID_noaccessupdate(const char *name)
 {
     DEBUG_TRACE_FSTART();
 
-    imageID   i;
-    imageID   tmpID = 0;
-    int       loopOK;
+    imageID i;
+    imageID tmpID = 0;
+    int loopOK;
 
     i = 0;
     loopOK = 1;
-    while(loopOK == 1)
+    while (loopOK == 1)
     {
-        if(data.image[i].used == 1)
+        if (data.image[i].used == 1)
         {
-            if((strncmp(name, data.image[i].name, strlen(name)) == 0)
-                    && (data.image[i].name[strlen(name)] == '\0'))
+            if ((strncmp(name, data.image[i].name, strlen(name)) == 0) && (data.image[i].name[strlen(name)] == '\0'))
             {
                 loopOK = 0;
                 tmpID = i;
@@ -74,7 +64,7 @@ imageID image_ID_noaccessupdate(
         }
         i++;
 
-        if(i == data.NB_MAX_IMAGE)
+        if (i == data.NB_MAX_IMAGE)
         {
             loopOK = 0;
             tmpID = -1;
@@ -85,9 +75,6 @@ imageID image_ID_noaccessupdate(
     return tmpID;
 }
 
-
-
-
 /* next available ID number */
 imageID next_avail_image_ID()
 {
@@ -96,28 +83,27 @@ imageID next_avail_image_ID()
     imageID i;
     imageID ID = -1;
 
-# ifdef _OPENMP
-    #pragma omp critical
+#ifdef _OPENMP
+#pragma omp critical
     {
 #endif
-        for(i = 0; i < data.NB_MAX_IMAGE; i++)
+        for (i = 0; i < data.NB_MAX_IMAGE; i++)
         {
-            if(data.image[i].used == 0)
+            if (data.image[i].used == 0)
             {
                 ID = i;
                 data.image[ID].used = 1;
                 break;
             }
         }
-# ifdef _OPENMP
+#ifdef _OPENMP
     }
-# endif
+#endif
 
-    if(ID == -1)
+    if (ID == -1)
     {
         printf("ERROR: ran out of image IDs - cannot allocate new ID\n");
-        printf("NB_MAX_IMAGE should be increased above current value (%ld)\n",
-               data.NB_MAX_IMAGE);
+        printf("NB_MAX_IMAGE should be increased above current value (%ld)\n", data.NB_MAX_IMAGE);
         exit(0);
     }
 
diff --git a/src/COREMOD_memory/image_ID.h b/src/COREMOD_memory/image_ID.h
index 8a0f4042..deec247f 100644
--- a/src/COREMOD_memory/image_ID.h
+++ b/src/COREMOD_memory/image_ID.h
@@ -2,13 +2,8 @@
  * @file    image_ID.h
  */
 
-imageID    image_ID(
-    const char *name
-);
+imageID image_ID(const char *name);
 
-imageID    image_ID_noaccessupdate(
-    const char *name
-);
+imageID image_ID_noaccessupdate(const char *name);
 
-
-imageID    next_avail_image_ID();
+imageID next_avail_image_ID();
diff --git a/src/COREMOD_memory/image_checksize.c b/src/COREMOD_memory/image_checksize.c
index 2af9060d..5c0a5a11 100644
--- a/src/COREMOD_memory/image_checksize.c
+++ b/src/COREMOD_memory/image_checksize.c
@@ -3,38 +3,28 @@
  * @brief   check image size
  */
 
-
 #include "CommandLineInterface/CLIcore.h"
 #include "image_ID.h"
 
-
-
-
-
-
 //  check only is size > 0
-int check_2Dsize(
-    const char *ID_name,
-    uint32_t    xsize,
-    uint32_t    ysize
-)
+int check_2Dsize(const char *ID_name, uint32_t xsize, uint32_t ysize)
 {
-    int      retval;
-    imageID  ID;
+    int retval;
+    imageID ID;
 
     retval = 1;
     ID = image_ID(ID_name);
-    if(data.image[ID].md[0].naxis != 2)
+    if (data.image[ID].md[0].naxis != 2)
     {
         retval = 0;
     }
-    if(retval == 1)
+    if (retval == 1)
     {
-        if((xsize > 0) && (data.image[ID].md[0].size[0] != xsize))
+        if ((xsize > 0) && (data.image[ID].md[0].size[0] != xsize))
         {
             retval = 0;
         }
-        if((ysize > 0) && (data.image[ID].md[0].size[1] != ysize))
+        if ((ysize > 0) && (data.image[ID].md[0].size[1] != ysize))
         {
             retval = 0;
         }
@@ -43,38 +33,31 @@ int check_2Dsize(
     return retval;
 }
 
-
-
-int check_3Dsize(
-    const char *ID_name,
-    uint32_t    xsize,
-    uint32_t    ysize,
-    uint32_t    zsize
-)
+int check_3Dsize(const char *ID_name, uint32_t xsize, uint32_t ysize, uint32_t zsize)
 {
-    int     retval;
+    int retval;
     imageID ID;
 
     retval = 1;
     ID = image_ID(ID_name);
-    if(data.image[ID].md[0].naxis != 3)
+    if (data.image[ID].md[0].naxis != 3)
     {
         /*      printf("Wrong naxis : %ld - should be 3\n",data.image[ID].md[0].naxis);*/
         retval = 0;
     }
-    if(retval == 1)
+    if (retval == 1)
     {
-        if((xsize > 0) && (data.image[ID].md[0].size[0] != xsize))
+        if ((xsize > 0) && (data.image[ID].md[0].size[0] != xsize))
         {
             /*	  printf("Wrong xsize : %ld - should be %ld\n",data.image[ID].md[0].size[0],xsize);*/
             retval = 0;
         }
-        if((ysize > 0) && (data.image[ID].md[0].size[1] != ysize))
+        if ((ysize > 0) && (data.image[ID].md[0].size[1] != ysize))
         {
             /*	  printf("Wrong ysize : %ld - should be %ld\n",data.image[ID].md[0].size[1],ysize);*/
             retval = 0;
         }
-        if((zsize > 0) && (data.image[ID].md[0].size[2] != zsize))
+        if ((zsize > 0) && (data.image[ID].md[0].size[2] != zsize))
         {
             /*	  printf("Wrong zsize : %ld - should be %ld\n",data.image[ID].md[0].size[2],zsize);*/
             retval = 0;
@@ -85,84 +68,64 @@ int check_3Dsize(
     return retval;
 }
 
-
-
-
-
-
-
-int COREMOD_MEMORY_check_2Dsize(
-    const char *IDname,
-    uint32_t    xsize,
-    uint32_t    ysize
-)
+int COREMOD_MEMORY_check_2Dsize(const char *IDname, uint32_t xsize, uint32_t ysize)
 {
-    int     sizeOK = 1; // 1 if size matches
+    int sizeOK = 1; // 1 if size matches
     imageID ID;
 
-
     ID = image_ID(IDname);
-    if(data.image[ID].md[0].naxis != 2)
+    if (data.image[ID].md[0].naxis != 2)
     {
-        printf("WARNING : image %s naxis = %d does not match expected value 2\n",
-               IDname, (int) data.image[ID].md[0].naxis);
+        printf("WARNING : image %s naxis = %d does not match expected value 2\n", IDname,
+               (int)data.image[ID].md[0].naxis);
         sizeOK = 0;
     }
-    if((xsize > 0) && (data.image[ID].md[0].size[0] != xsize))
+    if ((xsize > 0) && (data.image[ID].md[0].size[0] != xsize))
     {
-        printf("WARNING : image %s xsize = %d does not match expected value %d\n",
-               IDname, (int) data.image[ID].md[0].size[0], (int) xsize);
+        printf("WARNING : image %s xsize = %d does not match expected value %d\n", IDname,
+               (int)data.image[ID].md[0].size[0], (int)xsize);
         sizeOK = 0;
     }
-    if((ysize > 0) && (data.image[ID].md[0].size[1] != ysize))
+    if ((ysize > 0) && (data.image[ID].md[0].size[1] != ysize))
     {
-        printf("WARNING : image %s ysize = %d does not match expected value %d\n",
-               IDname, (int) data.image[ID].md[0].size[1], (int) ysize);
+        printf("WARNING : image %s ysize = %d does not match expected value %d\n", IDname,
+               (int)data.image[ID].md[0].size[1], (int)ysize);
         sizeOK = 0;
     }
 
     return sizeOK;
 }
 
-
-
-int COREMOD_MEMORY_check_3Dsize(
-    const char *IDname,
-    uint32_t    xsize,
-    uint32_t    ysize,
-    uint32_t    zsize
-)
+int COREMOD_MEMORY_check_3Dsize(const char *IDname, uint32_t xsize, uint32_t ysize, uint32_t zsize)
 {
-    int     sizeOK = 1; // 1 if size matches
+    int sizeOK = 1; // 1 if size matches
     imageID ID;
 
     ID = image_ID(IDname);
-    if(data.image[ID].md[0].naxis != 3)
+    if (data.image[ID].md[0].naxis != 3)
     {
-        printf("WARNING : image %s naxis = %d does not match expected value 3\n",
-               IDname, (int) data.image[ID].md[0].naxis);
+        printf("WARNING : image %s naxis = %d does not match expected value 3\n", IDname,
+               (int)data.image[ID].md[0].naxis);
         sizeOK = 0;
     }
-    if((xsize > 0) && (data.image[ID].md[0].size[0] != xsize))
+    if ((xsize > 0) && (data.image[ID].md[0].size[0] != xsize))
     {
-        printf("WARNING : image %s xsize = %d does not match expected value %d\n",
-               IDname, (int) data.image[ID].md[0].size[0], (int) xsize);
+        printf("WARNING : image %s xsize = %d does not match expected value %d\n", IDname,
+               (int)data.image[ID].md[0].size[0], (int)xsize);
         sizeOK = 0;
     }
-    if((ysize > 0) && (data.image[ID].md[0].size[1] != ysize))
+    if ((ysize > 0) && (data.image[ID].md[0].size[1] != ysize))
     {
-        printf("WARNING : image %s ysize = %d does not match expected value %d\n",
-               IDname, (int) data.image[ID].md[0].size[1], (int) ysize);
+        printf("WARNING : image %s ysize = %d does not match expected value %d\n", IDname,
+               (int)data.image[ID].md[0].size[1], (int)ysize);
         sizeOK = 0;
     }
-    if((zsize > 0) && (data.image[ID].md[0].size[2] != zsize))
+    if ((zsize > 0) && (data.image[ID].md[0].size[2] != zsize))
     {
-        printf("WARNING : image %s zsize = %d does not match expected value %d\n",
-               IDname, (int) data.image[ID].md[0].size[2], (int) zsize);
+        printf("WARNING : image %s zsize = %d does not match expected value %d\n", IDname,
+               (int)data.image[ID].md[0].size[2], (int)zsize);
         sizeOK = 0;
     }
 
     return sizeOK;
 }
-
-
diff --git a/src/COREMOD_memory/image_checksize.h b/src/COREMOD_memory/image_checksize.h
index c6ba462e..ab147985 100644
--- a/src/COREMOD_memory/image_checksize.h
+++ b/src/COREMOD_memory/image_checksize.h
@@ -2,31 +2,10 @@
  * @file    image_checksize.h
  */
 
+int check_2Dsize(const char *ID_name, uint32_t xsize, uint32_t ysize);
 
+int check_3Dsize(const char *ID_name, uint32_t xsize, uint32_t ysize, uint32_t zsize);
 
+int COREMOD_MEMORY_check_2Dsize(const char *IDname, uint32_t xsize, uint32_t ysize);
 
-int check_2Dsize(
-    const char *ID_name,
-    uint32_t    xsize,
-    uint32_t    ysize
-);
-
-int check_3Dsize(
-    const char *ID_name,
-    uint32_t    xsize,
-    uint32_t    ysize,
-    uint32_t    zsize
-);
-
-int COREMOD_MEMORY_check_2Dsize(
-    const char *IDname,
-    uint32_t    xsize,
-    uint32_t    ysize
-);
-
-int COREMOD_MEMORY_check_3Dsize(
-    const char *IDname,
-    uint32_t    xsize,
-    uint32_t    ysize,
-    uint32_t    zsize
-);
+int COREMOD_MEMORY_check_3Dsize(const char *IDname, uint32_t xsize, uint32_t ysize, uint32_t zsize);
diff --git a/src/COREMOD_memory/image_complex.c b/src/COREMOD_memory/image_complex.c
index f9c6f62e..99ebb485 100644
--- a/src/COREMOD_memory/image_complex.c
+++ b/src/COREMOD_memory/image_complex.c
@@ -3,74 +3,40 @@
  * @brief   complex number conversion
  */
 
-
 #include <math.h>
 
 #include "CommandLineInterface/CLIcore.h"
-#include "image_ID.h"
 #include "create_image.h"
-#include "stream_sem.h"
 #include "delete_image.h"
+#include "image_ID.h"
+#include "stream_sem.h"
 
-
-
-
-
-
-errno_t mk_reim_from_amph(
-    const char *am_name,
-    const char *ph_name,
-    const char *re_out_name,
-    const char *im_out_name,
-    int         sharedmem
-)
+errno_t mk_reim_from_amph(const char *am_name, const char *ph_name, const char *re_out_name, const char *im_out_name,
+                          int sharedmem)
 {
     DEBUG_TRACE_FSTART();
 
-    FUNC_CHECK_RETURN(
-        mk_complex_from_amph(am_name, ph_name, "Ctmp", 0)
-    );
+    FUNC_CHECK_RETURN(mk_complex_from_amph(am_name, ph_name, "Ctmp", 0));
 
-    FUNC_CHECK_RETURN(
-        mk_reim_from_complex("Ctmp", re_out_name, im_out_name, sharedmem)
-    );
+    FUNC_CHECK_RETURN(mk_reim_from_complex("Ctmp", re_out_name, im_out_name, sharedmem));
 
-    FUNC_CHECK_RETURN(
-        delete_image_ID("Ctmp", DELETE_IMAGE_ERRMODE_WARNING)
-    );
+    FUNC_CHECK_RETURN(delete_image_ID("Ctmp", DELETE_IMAGE_ERRMODE_WARNING));
 
     DEBUG_TRACE_FEXIT();
     return RETURN_SUCCESS;
 }
 
-
-
-errno_t mk_amph_from_reim(
-    const char *re_name,
-    const char *im_name,
-    const char *am_out_name,
-    const char *ph_out_name,
-    int         sharedmem
-)
+errno_t mk_amph_from_reim(const char *re_name, const char *im_name, const char *am_out_name, const char *ph_out_name,
+                          int sharedmem)
 {
     DEBUG_TRACE_FSTART();
 
-    FUNC_CHECK_RETURN(
-        mk_complex_from_reim(re_name, im_name, "Ctmp", 0)
-    );
+    FUNC_CHECK_RETURN(mk_complex_from_reim(re_name, im_name, "Ctmp", 0));
 
-    FUNC_CHECK_RETURN(
-        mk_amph_from_complex("Ctmp", am_out_name, ph_out_name, sharedmem)
-    );
+    FUNC_CHECK_RETURN(mk_amph_from_complex("Ctmp", am_out_name, ph_out_name, sharedmem));
 
-    FUNC_CHECK_RETURN(
-        delete_image_ID("Ctmp", DELETE_IMAGE_ERRMODE_WARNING)
-    );
+    FUNC_CHECK_RETURN(delete_image_ID("Ctmp", DELETE_IMAGE_ERRMODE_WARNING));
 
     DEBUG_TRACE_FEXIT();
     return RETURN_SUCCESS;
 }
-
-
-
-
diff --git a/src/COREMOD_memory/image_complex.h b/src/COREMOD_memory/image_complex.h
index 74a56b40..62ef5a2e 100644
--- a/src/COREMOD_memory/image_complex.h
+++ b/src/COREMOD_memory/image_complex.h
@@ -1,20 +1,10 @@
 #ifndef COREMOD_MEMORY_IMAGE_COMPLEX_H
 #define COREMOD_MEMORY_IMAGE_COMPLEX_H
 
-errno_t mk_reim_from_amph(
-    const char *am_name,
-    const char *ph_name,
-    const char *re_out_name,
-    const char *im_out_name,
-    int         sharedmem
-);
+errno_t mk_reim_from_amph(const char *am_name, const char *ph_name, const char *re_out_name, const char *im_out_name,
+                          int sharedmem);
 
-errno_t mk_amph_from_reim(
-    const char *re_name,
-    const char *im_name,
-    const char *am_out_name,
-    const char *ph_out_name,
-    int         sharedmem
-);
+errno_t mk_amph_from_reim(const char *re_name, const char *im_name, const char *am_out_name, const char *ph_out_name,
+                          int sharedmem);
 
 #endif
diff --git a/src/COREMOD_memory/image_copy.c b/src/COREMOD_memory/image_copy.c
index 69516e3b..6b71df0f 100644
--- a/src/COREMOD_memory/image_copy.c
+++ b/src/COREMOD_memory/image_copy.c
@@ -4,79 +4,57 @@
 
 #include "CommandLineInterface/CLIcore.h"
 
-#include "variable_ID.h"
-#include "image_ID.h"
-#include "delete_image.h"
 #include "create_image.h"
+#include "delete_image.h"
+#include "image_ID.h"
 #include "list_image.h"
-#include "stream_sem.h"
 #include "read_shmim.h"
-
-
+#include "stream_sem.h"
+#include "variable_ID.h"
 
 // ==========================================
 // Forward declaration(s)
 // ==========================================
 
-imageID copy_image_ID(
-    const char *name,
-    const char *newname,
-    int         shared
-);
-
-imageID chname_image_ID(
-    const char *ID_name,
-    const char *new_name
-);
-
-errno_t COREMOD_MEMORY_cp2shm(
-    const char *IDname,
-    const char *IDshmname
-);
-
+imageID copy_image_ID(const char *name, const char *newname, int shared);
 
+imageID chname_image_ID(const char *ID_name, const char *new_name);
 
+errno_t COREMOD_MEMORY_cp2shm(const char *IDname, const char *IDshmname);
 
 // ==========================================
 // Command line interface wrapper function(s)
 // ==========================================
 
-
 static errno_t copy_image_ID__cli()
 {
-    if(data.cmdargtoken[1].type != CLIARG_IMG)
+    if (data.cmdargtoken[1].type != CLIARG_IMG)
     {
         printf("Image %s does not exist\n", data.cmdargtoken[1].val.string);
         return CLICMD_INVALID_ARG;
     }
 
-    copy_image_ID(data.cmdargtoken[1].val.string, data.cmdargtoken[2].val.string,
-                  0);
+    copy_image_ID(data.cmdargtoken[1].val.string, data.cmdargtoken[2].val.string, 0);
 
     return CLICMD_SUCCESS;
 }
 
-
-
-
 static errno_t copy_image_ID_sharedmem__cli()
 {
-    if(data.cmdargtoken[1].type != CLIARG_IMG)
+    if (data.cmdargtoken[1].type != CLIARG_IMG)
     {
         printf("Image %s does not exist\n", data.cmdargtoken[1].val.string);
         return CLICMD_INVALID_ARG;
     }
 
-    copy_image_ID(data.cmdargtoken[1].val.string, data.cmdargtoken[2].val.string,
-                  1);
+    copy_image_ID(data.cmdargtoken[1].val.string, data.cmdargtoken[2].val.string, 1);
 
     return CLICMD_SUCCESS;
 }
 
-
 static errno_t chname_image_ID__cli()
 {
-    if(data.cmdargtoken[1].type != CLIARG_IMG)
+    if (data.cmdargtoken[1].type != CLIARG_IMG)
     {
         printf("Image %s does not exist\n", data.cmdargtoken[1].val.string);
         return CLICMD_INVALID_ARG;
@@ -87,16 +65,11 @@ static errno_t chname_image_ID__cli()
     return CLICMD_SUCCESS;
 }
 
-
-
 static errno_t COREMOD_MEMORY_cp2shm__cli()
 {
-    if(CLI_checkarg(1, CLIARG_IMG)
-            + CLI_checkarg(2, CLIARG_STR_NOT_IMG)
-            == 0)
+    if (CLI_checkarg(1, CLIARG_IMG) + CLI_checkarg(2, CLIARG_STR_NOT_IMG) == 0)
     {
-        COREMOD_MEMORY_cp2shm(data.cmdargtoken[1].val.string,
-                              data.cmdargtoken[2].val.string);
+        COREMOD_MEMORY_cp2shm(data.cmdargtoken[1].val.string, data.cmdargtoken[2].val.string);
         return CLICMD_SUCCESS;
     }
     else
@@ -105,133 +78,93 @@ static errno_t COREMOD_MEMORY_cp2shm__cli()
     }
 }
 
-
-
-
-
 // ==========================================
 // Register CLI command(s)
 // ==========================================
 
 errno_t image_copy_addCLIcmd()
 {
-	RegisterCLIcommand(
-        "cp",
-        __FILE__, copy_image_ID__cli,
-        "copy image",
-        "source, dest",
-        "cp im1 im4",
-        "long copy_image_ID(const char *name, const char *newname, 0)");
-
-    RegisterCLIcommand(
-        "cpsh",
-        __FILE__, copy_image_ID_sharedmem__cli,
-        "copy image - create in shared mem if does not exist",
-        "source, dest",
-        "cp im1 im4",
-        "long copy_image_ID(const char *name, const char *newname, 1)");
-
-    RegisterCLIcommand(
-        "mv",
-        __FILE__,
-        chname_image_ID__cli,
-        "change image name",
-        "source, dest",
-        "mv im1 im4",
-        "long chname_image_ID(const char *name, const char *newname)");
-
-    RegisterCLIcommand(
-        "imcp2shm",
-        __FILE__,
-        COREMOD_MEMORY_cp2shm__cli,
-        "copy image ot shared memory",
-        "<image> <shared mem image>",
-        "imcp2shm im1 ims1",
-        "long COREMOD_MEMORY_cp2shm(const char *IDname, const char *IDshmname)");
-
-    return RETURN_SUCCESS;
-}
-
-
-
-
-
-
+    RegisterCLIcommand("cp", __FILE__, copy_image_ID__cli, "copy image", "source, dest", "cp im1 im4",
+                       "long copy_image_ID(const char *name, const char *newname, 0)");
 
+    RegisterCLIcommand("cpsh", __FILE__, copy_image_ID_sharedmem__cli,
+                       "copy image - create in shared mem if does not exist", "source, dest", "cp im1 im4",
+                       "long copy_image_ID(const char *name, const char *newname, 1)");
 
+    RegisterCLIcommand("mv", __FILE__, chname_image_ID__cli, "change image name", "source, dest", "mv im1 im4",
+                       "long chname_image_ID(const char *name, const char *newname)");
 
+    RegisterCLIcommand("imcp2shm", __FILE__, COREMOD_MEMORY_cp2shm__cli, "copy image ot shared memory",
+                       "<image> <shared mem image>", "imcp2shm im1 ims1",
+                       "long COREMOD_MEMORY_cp2shm(const char *IDname, const char *IDshmname)");
 
+    return RETURN_SUCCESS;
+}
 
-imageID copy_image_ID(
-    const char *name,
-    const char *newname,
-    int         shared
-)
+imageID copy_image_ID(const char *name, const char *newname, int shared)
 {
-    imageID    ID;
-    imageID    IDout;
-    long       naxis;
-    uint32_t  *size = NULL;
-    uint8_t    datatype;
-    long       nelement;
-    long       i;
-    int        newim = 0;
-
+    imageID ID;
+    imageID IDout;
+    long naxis;
+    uint32_t *size = NULL;
+    uint8_t datatype;
+    long nelement;
+    long i;
+    int newim = 0;
 
     ID = image_ID(name);
-    if(ID == -1)
+    if (ID == -1)
     {
         PRINT_ERROR("image \"%s\" does not exist", name);
         exit(0);
     }
     naxis = data.image[ID].md[0].naxis;
 
-    size = (uint32_t *) malloc(sizeof(uint32_t) * naxis);
-    if(size == NULL)
+    size = (uint32_t *)malloc(sizeof(uint32_t) * naxis);
+    if (size == NULL)
     {
         PRINT_ERROR("malloc error");
         exit(0);
     }
 
-    for(i = 0; i < naxis; i++)
+    for (i = 0; i < naxis; i++)
     {
         size[i] = data.image[ID].md[0].size[i];
     }
-    datatype  = data.image[ID].md[0].datatype;
+    datatype = data.image[ID].md[0].datatype;
 
     nelement = data.image[ID].md[0].nelement;
 
     IDout = image_ID(newname);
 
-    if(IDout != -1)
+    if (IDout != -1)
     {
         // verify newname has the right size and type
-        if(data.image[ID].md[0].nelement != data.image[IDout].md[0].nelement)
+        if (data.image[ID].md[0].nelement != data.image[IDout].md[0].nelement)
         {
-            fprintf(stderr,
-                    "ERROR [copy_image_ID]: images %s and %s do not have the same size -> deleting and re-creating image\n",
-                    name, newname);
+            fprintf(
+                stderr,
+                "ERROR [copy_image_ID]: images %s and %s do not have the same size -> deleting and re-creating image\n",
+                name, newname);
             newim = 1;
         }
-        if(data.image[ID].md[0].datatype != data.image[IDout].md[0].datatype)
+        if (data.image[ID].md[0].datatype != data.image[IDout].md[0].datatype)
         {
-            fprintf(stderr,
-                    "ERROR [copy_image_ID]: images %s and %s do not have the same type -> deleting and re-creating image\n",
-                    name, newname);
+            fprintf(
+                stderr,
+                "ERROR [copy_image_ID]: images %s and %s do not have the same type -> deleting and re-creating image\n",
+                name, newname);
             newim = 1;
         }
 
-        if(newim == 1)
+        if (newim == 1)
         {
             delete_image_ID(newname, DELETE_IMAGE_ERRMODE_WARNING);
             IDout = -1;
         }
     }
 
-
-
-
-    if(IDout == -1)
+    if (IDout == -1)
     {
         create_image_ID(newname, naxis, size, datatype, shared, data.NBKEYWORD_DFT, 0, NULL);
         IDout = image_ID(newname);
@@ -239,95 +172,77 @@ imageID copy_image_ID(
     else
     {
         // verify newname has the right size and type
-        if(data.image[ID].md[0].nelement != data.image[IDout].md[0].nelement)
+        if (data.image[ID].md[0].nelement != data.image[IDout].md[0].nelement)
         {
-            fprintf(stderr,
-                    "ERROR [copy_image_ID]: images %s and %s do not have the same size\n", name,
-                    newname);
+            fprintf(stderr, "ERROR [copy_image_ID]: images %s and %s do not have the same size\n", name, newname);
             exit(0);
         }
-        if(data.image[ID].md[0].datatype != data.image[IDout].md[0].datatype)
+        if (data.image[ID].md[0].datatype != data.image[IDout].md[0].datatype)
         {
-            fprintf(stderr,
-                    "ERROR [copy_image_ID]: images %s and %s do not have the same type\n", name,
-                    newname);
+            fprintf(stderr, "ERROR [copy_image_ID]: images %s and %s do not have the same type\n", name, newname);
             exit(0);
         }
     }
     data.image[IDout].md[0].write = 1;
 
-
-    if(datatype == _DATATYPE_UINT8)
+    if (datatype == _DATATYPE_UINT8)
     {
-        memcpy(data.image[IDout].array.UI8, data.image[ID].array.UI8,
-               SIZEOF_DATATYPE_UINT8 * nelement);
+        memcpy(data.image[IDout].array.UI8, data.image[ID].array.UI8, SIZEOF_DATATYPE_UINT8 * nelement);
     }
 
-    if(datatype == _DATATYPE_INT8)
+    if (datatype == _DATATYPE_INT8)
     {
-        memcpy(data.image[IDout].array.SI8, data.image[ID].array.SI8,
-               SIZEOF_DATATYPE_INT8 * nelement);
+        memcpy(data.image[IDout].array.SI8, data.image[ID].array.SI8, SIZEOF_DATATYPE_INT8 * nelement);
     }
 
-    if(datatype == _DATATYPE_UINT16)
+    if (datatype == _DATATYPE_UINT16)
     {
-        memcpy(data.image[IDout].array.UI16, data.image[ID].array.UI16,
-               SIZEOF_DATATYPE_UINT16 * nelement);
+        memcpy(data.image[IDout].array.UI16, data.image[ID].array.UI16, SIZEOF_DATATYPE_UINT16 * nelement);
     }
 
-    if(datatype == _DATATYPE_INT16)
+    if (datatype == _DATATYPE_INT16)
     {
-        memcpy(data.image[IDout].array.SI16, data.image[ID].array.SI16,
-               SIZEOF_DATATYPE_INT8 * nelement);
+        memcpy(data.image[IDout].array.SI16, data.image[ID].array.SI16, SIZEOF_DATATYPE_INT8 * nelement);
     }
 
-    if(datatype == _DATATYPE_UINT32)
+    if (datatype == _DATATYPE_UINT32)
     {
-        memcpy(data.image[IDout].array.UI32, data.image[ID].array.UI32,
-               SIZEOF_DATATYPE_UINT32 * nelement);
+        memcpy(data.image[IDout].array.UI32, data.image[ID].array.UI32, SIZEOF_DATATYPE_UINT32 * nelement);
     }
 
-    if(datatype == _DATATYPE_INT32)
+    if (datatype == _DATATYPE_INT32)
     {
-        memcpy(data.image[IDout].array.SI32, data.image[ID].array.SI32,
-               SIZEOF_DATATYPE_INT32 * nelement);
+        memcpy(data.image[IDout].array.SI32, data.image[ID].array.SI32, SIZEOF_DATATYPE_INT32 * nelement);
     }
 
-    if(datatype == _DATATYPE_UINT64)
+    if (datatype == _DATATYPE_UINT64)
     {
-        memcpy(data.image[IDout].array.UI64, data.image[ID].array.UI64,
-               SIZEOF_DATATYPE_UINT64 * nelement);
+        memcpy(data.image[IDout].array.UI64, data.image[ID].array.UI64, SIZEOF_DATATYPE_UINT64 * nelement);
     }
 
-    if(datatype == _DATATYPE_INT64)
+    if (datatype == _DATATYPE_INT64)
     {
-        memcpy(data.image[IDout].array.SI64, data.image[ID].array.SI64,
-               SIZEOF_DATATYPE_INT64 * nelement);
+        memcpy(data.image[IDout].array.SI64, data.image[ID].array.SI64, SIZEOF_DATATYPE_INT64 * nelement);
     }
 
-
-    if(datatype == _DATATYPE_FLOAT)
+    if (datatype == _DATATYPE_FLOAT)
     {
-        memcpy(data.image[IDout].array.F, data.image[ID].array.F,
-               SIZEOF_DATATYPE_FLOAT * nelement);
+        memcpy(data.image[IDout].array.F, data.image[ID].array.F, SIZEOF_DATATYPE_FLOAT * nelement);
     }
 
-    if(datatype == _DATATYPE_DOUBLE)
+    if (datatype == _DATATYPE_DOUBLE)
     {
-        memcpy(data.image[IDout].array.D, data.image[ID].array.D,
-               SIZEOF_DATATYPE_DOUBLE * nelement);
+        memcpy(data.image[IDout].array.D, data.image[ID].array.D, SIZEOF_DATATYPE_DOUBLE * nelement);
     }
 
-    if(datatype == _DATATYPE_COMPLEX_FLOAT)
+    if (datatype == _DATATYPE_COMPLEX_FLOAT)
     {
-        memcpy(data.image[IDout].array.CF, data.image[ID].array.CF,
-               SIZEOF_DATATYPE_COMPLEX_FLOAT * nelement);
+        memcpy(data.image[IDout].array.CF, data.image[ID].array.CF, SIZEOF_DATATYPE_COMPLEX_FLOAT * nelement);
     }
 
-    if(datatype == _DATATYPE_COMPLEX_DOUBLE)
+    if (datatype == _DATATYPE_COMPLEX_DOUBLE)
     {
-        memcpy(data.image[IDout].array.CD, data.image[ID].array.CD,
-               SIZEOF_DATATYPE_COMPLEX_DOUBLE * nelement);
+        memcpy(data.image[IDout].array.CD, data.image[ID].array.CD, SIZEOF_DATATYPE_COMPLEX_DOUBLE * nelement);
     }
 
     COREMOD_MEMORY_image_set_sempost_byID(IDout, -1);
@@ -337,22 +252,15 @@ imageID copy_image_ID(
 
     free(size);
 
-
     return IDout;
 }
 
-
-
-
-imageID chname_image_ID(
-    const char *ID_name,
-    const char *new_name
-)
+imageID chname_image_ID(const char *ID_name, const char *new_name)
 {
     imageID ID;
 
     ID = -1;
-    if((image_ID(new_name) == -1) && (variable_ID(new_name) == -1))
+    if ((image_ID(new_name) == -1) && (variable_ID(new_name) == -1))
     {
         ID = image_ID(ID_name);
         strcpy(data.image[ID].name, new_name);
@@ -360,11 +268,10 @@ imageID chname_image_ID(
     }
     else
     {
-        printf("Cannot change name %s -> %s : new name already in use\n", ID_name,
-               new_name);
+        printf("Cannot change name %s -> %s : new name already in use\n", ID_name, new_name);
     }
 
-    if(data.MEM_MONITOR == 1)
+    if (data.MEM_MONITOR == 1)
     {
         list_image_ID_ncurses();
     }
@@ -372,73 +279,63 @@ imageID chname_image_ID(
     return ID;
 }
 
-
-
-
-
-
 /** copy an image to shared memory
  *
  *
  */
-errno_t COREMOD_MEMORY_cp2shm(
-    const char *IDname,
-    const char *IDshmname
-)
+errno_t COREMOD_MEMORY_cp2shm(const char *IDname, const char *IDshmname)
 {
-    imageID    ID;
-    imageID    IDshm;
-    uint8_t    datatype;
-    long       naxis;
-    uint32_t  *sizearray;
-    char      *ptr1;
-    char      *ptr2;
-    long       k;
-    int        axis;
-    int        shmOK;
-
+    imageID ID;
+    imageID IDshm;
+    uint8_t datatype;
+    long naxis;
+    uint32_t *sizearray;
+    char *ptr1;
+    char *ptr2;
+    long k;
+    int axis;
+    int shmOK;
 
     ID = image_ID(IDname);
     naxis = data.image[ID].md[0].naxis;
 
-
-    sizearray = (uint32_t *) malloc(sizeof(uint32_t) * naxis);
+    sizearray = (uint32_t *)malloc(sizeof(uint32_t) * naxis);
     datatype = data.image[ID].md[0].datatype;
-    for(k = 0; k < naxis; k++)
+    for (k = 0; k < naxis; k++)
     {
         sizearray[k] = data.image[ID].md[0].size[k];
     }
 
     shmOK = 1;
     IDshm = read_sharedmem_image(IDshmname);
-    if(IDshm != -1)
+    if (IDshm != -1)
     {
         // verify type and size
-        if(data.image[ID].md[0].naxis != data.image[IDshm].md[0].naxis)
+        if (data.image[ID].md[0].naxis != data.image[IDshm].md[0].naxis)
         {
             shmOK = 0;
         }
-        if(shmOK == 1)
+        if (shmOK == 1)
         {
-            for(axis = 0; axis < data.image[IDshm].md[0].naxis; axis++)
-                if(data.image[ID].md[0].size[axis] != data.image[IDshm].md[0].size[axis])
+            for (axis = 0; axis < data.image[IDshm].md[0].naxis; axis++)
+                if (data.image[ID].md[0].size[axis] != data.image[IDshm].md[0].size[axis])
                 {
                     shmOK = 0;
                 }
         }
-        if(data.image[ID].md[0].datatype != data.image[IDshm].md[0].datatype)
+        if (data.image[ID].md[0].datatype != data.image[IDshm].md[0].datatype)
         {
             shmOK = 0;
         }
 
-        if(shmOK == 0)
+        if (shmOK == 0)
         {
             delete_image_ID(IDshmname, DELETE_IMAGE_ERRMODE_WARNING);
             IDshm = -1;
         }
     }
 
-    if(IDshm == -1)
+    if (IDshm == -1)
     {
         create_image_ID(IDshmname, naxis, sizearray, datatype, 1, 0, 0, &IDshm);
     }
@@ -449,84 +346,72 @@ errno_t COREMOD_MEMORY_cp2shm(
 
     data.image[IDshm].md[0].write = 1;
 
-    switch(datatype)
+    switch (datatype)
     {
 
-        case _DATATYPE_FLOAT :
-            ptr1 = (char *) data.image[ID].array.F;
-            ptr2 = (char *) data.image[IDshm].array.F;
-            memcpy((void *) ptr2, (void *) ptr1,
-                   SIZEOF_DATATYPE_FLOAT * data.image[ID].md[0].nelement);
-            break;
-
-        case _DATATYPE_DOUBLE :
-            ptr1 = (char *) data.image[ID].array.D;
-            ptr2 = (char *) data.image[IDshm].array.D;
-            memcpy((void *) ptr2, (void *) ptr1,
-                   SIZEOF_DATATYPE_DOUBLE * data.image[ID].md[0].nelement);
-            break;
-
-
-        case _DATATYPE_INT8 :
-            ptr1 = (char *) data.image[ID].array.SI8;
-            ptr2 = (char *) data.image[IDshm].array.SI8;
-            memcpy((void *) ptr2, (void *) ptr1,
-                   SIZEOF_DATATYPE_INT8 * data.image[ID].md[0].nelement);
-            break;
-
-        case _DATATYPE_UINT8 :
-            ptr1 = (char *) data.image[ID].array.UI8;
-            ptr2 = (char *) data.image[IDshm].array.UI8;
-            memcpy((void *) ptr2, (void *) ptr1,
-                   SIZEOF_DATATYPE_UINT8 * data.image[ID].md[0].nelement);
-            break;
-
-        case _DATATYPE_INT16 :
-            ptr1 = (char *) data.image[ID].array.SI16;
-            ptr2 = (char *) data.image[IDshm].array.SI16;
-            memcpy((void *) ptr2, (void *) ptr1,
-                   SIZEOF_DATATYPE_INT16 * data.image[ID].md[0].nelement);
-            break;
-
-        case _DATATYPE_UINT16 :
-            ptr1 = (char *) data.image[ID].array.UI16;
-            ptr2 = (char *) data.image[IDshm].array.UI16;
-            memcpy((void *) ptr2, (void *) ptr1,
-                   SIZEOF_DATATYPE_UINT16 * data.image[ID].md[0].nelement);
-            break;
-
-        case _DATATYPE_INT32 :
-            ptr1 = (char *) data.image[ID].array.SI32;
-            ptr2 = (char *) data.image[IDshm].array.SI32;
-            memcpy((void *) ptr2, (void *) ptr1,
-                   SIZEOF_DATATYPE_INT32 * data.image[ID].md[0].nelement);
-            break;
-
-        case _DATATYPE_UINT32 :
-            ptr1 = (char *) data.image[ID].array.UI32;
-            ptr2 = (char *) data.image[IDshm].array.UI32;
-            memcpy((void *) ptr2, (void *) ptr1,
-                   SIZEOF_DATATYPE_UINT32 * data.image[ID].md[0].nelement);
-            break;
-
-        case _DATATYPE_INT64 :
-            ptr1 = (char *) data.image[ID].array.SI64;
-            ptr2 = (char *) data.image[IDshm].array.SI64;
-            memcpy((void *) ptr2, (void *) ptr1,
-                   SIZEOF_DATATYPE_INT64 * data.image[ID].md[0].nelement);
-            break;
-
-        case _DATATYPE_UINT64 :
-            ptr1 = (char *) data.image[ID].array.UI64;
-            ptr2 = (char *) data.image[IDshm].array.UI64;
-            memcpy((void *) ptr2, (void *) ptr1,
-                   SIZEOF_DATATYPE_UINT64 * data.image[ID].md[0].nelement);
-            break;
-
-
-        default :
-            printf("data type not supported\n");
-            break;
+    case _DATATYPE_FLOAT:
+        ptr1 = (char *)data.image[ID].array.F;
+        ptr2 = (char *)data.image[IDshm].array.F;
+        memcpy((void *)ptr2, (void *)ptr1, SIZEOF_DATATYPE_FLOAT * data.image[ID].md[0].nelement);
+        break;
+
+    case _DATATYPE_DOUBLE:
+        ptr1 = (char *)data.image[ID].array.D;
+        ptr2 = (char *)data.image[IDshm].array.D;
+        memcpy((void *)ptr2, (void *)ptr1, SIZEOF_DATATYPE_DOUBLE * data.image[ID].md[0].nelement);
+        break;
+
+    case _DATATYPE_INT8:
+        ptr1 = (char *)data.image[ID].array.SI8;
+        ptr2 = (char *)data.image[IDshm].array.SI8;
+        memcpy((void *)ptr2, (void *)ptr1, SIZEOF_DATATYPE_INT8 * data.image[ID].md[0].nelement);
+        break;
+
+    case _DATATYPE_UINT8:
+        ptr1 = (char *)data.image[ID].array.UI8;
+        ptr2 = (char *)data.image[IDshm].array.UI8;
+        memcpy((void *)ptr2, (void *)ptr1, SIZEOF_DATATYPE_UINT8 * data.image[ID].md[0].nelement);
+        break;
+
+    case _DATATYPE_INT16:
+        ptr1 = (char *)data.image[ID].array.SI16;
+        ptr2 = (char *)data.image[IDshm].array.SI16;
+        memcpy((void *)ptr2, (void *)ptr1, SIZEOF_DATATYPE_INT16 * data.image[ID].md[0].nelement);
+        break;
+
+    case _DATATYPE_UINT16:
+        ptr1 = (char *)data.image[ID].array.UI16;
+        ptr2 = (char *)data.image[IDshm].array.UI16;
+        memcpy((void *)ptr2, (void *)ptr1, SIZEOF_DATATYPE_UINT16 * data.image[ID].md[0].nelement);
+        break;
+
+    case _DATATYPE_INT32:
+        ptr1 = (char *)data.image[ID].array.SI32;
+        ptr2 = (char *)data.image[IDshm].array.SI32;
+        memcpy((void *)ptr2, (void *)ptr1, SIZEOF_DATATYPE_INT32 * data.image[ID].md[0].nelement);
+        break;
+
+    case _DATATYPE_UINT32:
+        ptr1 = (char *)data.image[ID].array.UI32;
+        ptr2 = (char *)data.image[IDshm].array.UI32;
+        memcpy((void *)ptr2, (void *)ptr1, SIZEOF_DATATYPE_UINT32 * data.image[ID].md[0].nelement);
+        break;
+
+    case _DATATYPE_INT64:
+        ptr1 = (char *)data.image[ID].array.SI64;
+        ptr2 = (char *)data.image[IDshm].array.SI64;
+        memcpy((void *)ptr2, (void *)ptr1, SIZEOF_DATATYPE_INT64 * data.image[ID].md[0].nelement);
+        break;
+
+    case _DATATYPE_UINT64:
+        ptr1 = (char *)data.image[ID].array.UI64;
+        ptr2 = (char *)data.image[IDshm].array.UI64;
+        memcpy((void *)ptr2, (void *)ptr1, SIZEOF_DATATYPE_UINT64 * data.image[ID].md[0].nelement);
+        break;
+
+    default:
+        printf("data type not supported\n");
+        break;
     }
     COREMOD_MEMORY_image_set_sempost_byID(IDshm, -1);
     data.image[IDshm].md[0].cnt0++;
@@ -534,11 +419,3 @@ errno_t COREMOD_MEMORY_cp2shm(
 
     return RETURN_SUCCESS;
 }
-
-
-
-
-
-
-
-
diff --git a/src/COREMOD_memory/image_copy.h b/src/COREMOD_memory/image_copy.h
index 31c09f2f..f30008a4 100644
--- a/src/COREMOD_memory/image_copy.h
+++ b/src/COREMOD_memory/image_copy.h
@@ -2,24 +2,10 @@
  * @file    image_copy.h
  */
 
-
-
-
 errno_t image_copy_addCLIcmd();
 
+imageID copy_image_ID(const char *name, const char *newname, int shared);
 
-imageID copy_image_ID(
-    const char *name,
-    const char *newname,
-    int         shared
-);
-
-imageID chname_image_ID(
-    const char *ID_name,
-    const char *new_name
-);
+imageID chname_image_ID(const char *ID_name, const char *new_name);
 
-errno_t COREMOD_MEMORY_cp2shm(
-    const char *IDname,
-    const char *IDshmname
-);
+errno_t COREMOD_MEMORY_cp2shm(const char *IDname, const char *IDshmname);
diff --git a/src/COREMOD_memory/image_copy_shm.c b/src/COREMOD_memory/image_copy_shm.c
index 1061406c..83592889 100644
--- a/src/COREMOD_memory/image_copy_shm.c
+++ b/src/COREMOD_memory/image_copy_shm.c
@@ -3,61 +3,30 @@
 #include "create_image.h"
 #include "read_shmim.h"
 
-
 // Local variables pointers
 static char *inimname;
 static char *outimname;
 
-
-
-static CLICMDARGDEF farg[] =
-{
-    {
-        CLIARG_IMG, ".in_name", "input image", "im1",
-        CLIARG_VISIBLE_DEFAULT,
-        (void **) &inimname, NULL
-    },
-    {
-        CLIARG_STR, ".out_name", "output stream", "out1",
-        CLIARG_VISIBLE_DEFAULT,
-        (void **) &outimname, NULL
-    }
-};
-
+static CLICMDARGDEF farg[] = {
+    {CLIARG_IMG, ".in_name", "input image", "im1", CLIARG_VISIBLE_DEFAULT, (void **)&inimname, NULL},
+    {CLIARG_STR, ".out_name", "output stream", "out1", CLIARG_VISIBLE_DEFAULT, (void **)&outimname, NULL}};
 
 // flag CLICMDFLAG_FPS enabled FPS capability
-static CLICMDDATA CLIcmddata =
-{
-    "imcpshm",
-    "copy image to shm",
-    CLICMD_FIELDS_DEFAULTS
-};
-
-
+static CLICMDDATA CLIcmddata = {"imcpshm", "copy image to shm", CLICMD_FIELDS_DEFAULTS};
 
 // detailed help
-static errno_t help_function()
-{
-    return RETURN_SUCCESS;
-}
-
-
-
-
+static errno_t help_function() { return RETURN_SUCCESS; }
 
 // Computation code
-static errno_t image_copy_shm(
-    IMGID img,
-    char *outshmname
-)
+static errno_t image_copy_shm(IMGID img, char *outshmname)
 {
     resolveIMGID(&img, ERRMODE_ABORT);
     imageID ID = img.ID;
 
     uint8_t naxis = data.image[ID].md[0].naxis;
-    uint32_t *sizearray = (uint32_t *) malloc(sizeof(uint32_t) * naxis);
+    uint32_t *sizearray = (uint32_t *)malloc(sizeof(uint32_t) * naxis);
     uint8_t datatype = data.image[ID].md[0].datatype;
-    for(uint8_t k = 0; k < naxis; k++)
+    for (uint8_t k = 0; k < naxis; k++)
     {
         sizearray[k] = data.image[ID].md[0].size[k];
     }
@@ -69,35 +38,34 @@ static errno_t image_copy_shm(
     imageID IDshm = read_sharedmem_image(outshmname);
     DEBUG_TRACEPOINT("IDshm = %ld", IDshm);
 
-    if(IDshm != -1)
+    if (IDshm != -1)
     {
         // verify type and size
-        if(data.image[ID].md[0].naxis != data.image[IDshm].md[0].naxis)
+        if (data.image[ID].md[0].naxis != data.image[IDshm].md[0].naxis)
         {
             shmOK = 0;
         }
-        if(shmOK == 1)
+        if (shmOK == 1)
         {
-            for(uint8_t axis = 0; axis < data.image[IDshm].md[0].naxis; axis++)
-                if(data.image[ID].md[0].size[axis] != data.image[IDshm].md[0].size[axis])
+            for (uint8_t axis = 0; axis < data.image[IDshm].md[0].naxis; axis++)
+                if (data.image[ID].md[0].size[axis] != data.image[IDshm].md[0].size[axis])
                 {
                     shmOK = 0;
                 }
         }
-        if(data.image[ID].md[0].datatype != data.image[IDshm].md[0].datatype)
+        if (data.image[ID].md[0].datatype != data.image[IDshm].md[0].datatype)
         {
             shmOK = 0;
         }
 
-        if(shmOK == 0)
+        if (shmOK == 0)
         {
             delete_image_ID(outshmname, DELETE_IMAGE_ERRMODE_WARNING);
             IDshm = -1;
         }
     }
 
-
-    if(IDshm == -1)
+    if (IDshm == -1)
     {
         DEBUG_TRACEPOINT("Creating image");
         create_image_ID(outshmname, naxis, sizearray, datatype, 1, NBkw, 0, &IDshm);
@@ -111,103 +79,88 @@ static errno_t image_copy_shm(
 
     data.image[IDshm].md[0].write = 1;
 
-    char      *ptr1;
-    char      *ptr2;
+    char *ptr1;
+    char *ptr2;
 
-    switch(datatype)
+    switch (datatype)
     {
-        case _DATATYPE_FLOAT :
-            ptr1 = (char *) data.image[ID].array.F;
-            ptr2 = (char *) data.image[IDshm].array.F;
-            memcpy((void *) ptr2, (void *) ptr1,
-                   SIZEOF_DATATYPE_FLOAT * data.image[ID].md[0].nelement);
-            break;
-
-        case _DATATYPE_DOUBLE :
-            ptr1 = (char *) data.image[ID].array.D;
-            ptr2 = (char *) data.image[IDshm].array.D;
-            memcpy((void *) ptr2, (void *) ptr1,
-                   SIZEOF_DATATYPE_DOUBLE * data.image[ID].md[0].nelement);
-            break;
-
-
-        case _DATATYPE_INT8 :
-            ptr1 = (char *) data.image[ID].array.SI8;
-            ptr2 = (char *) data.image[IDshm].array.SI8;
-            memcpy((void *) ptr2, (void *) ptr1,
-                   SIZEOF_DATATYPE_INT8 * data.image[ID].md[0].nelement);
-            break;
-
-        case _DATATYPE_UINT8 :
-            ptr1 = (char *) data.image[ID].array.UI8;
-            ptr2 = (char *) data.image[IDshm].array.UI8;
-            memcpy((void *) ptr2, (void *) ptr1,
-                   SIZEOF_DATATYPE_UINT8 * data.image[ID].md[0].nelement);
-            break;
-
-        case _DATATYPE_INT16 :
-            ptr1 = (char *) data.image[ID].array.SI16;
-            ptr2 = (char *) data.image[IDshm].array.SI16;
-            memcpy((void *) ptr2, (void *) ptr1,
-                   SIZEOF_DATATYPE_INT16 * data.image[ID].md[0].nelement);
-            break;
-
-        case _DATATYPE_UINT16 :
-            ptr1 = (char *) data.image[ID].array.UI16;
-            ptr2 = (char *) data.image[IDshm].array.UI16;
-            memcpy((void *) ptr2, (void *) ptr1,
-                   SIZEOF_DATATYPE_UINT16 * data.image[ID].md[0].nelement);
-            break;
-
-        case _DATATYPE_INT32 :
-            ptr1 = (char *) data.image[ID].array.SI32;
-            ptr2 = (char *) data.image[IDshm].array.SI32;
-            memcpy((void *) ptr2, (void *) ptr1,
-                   SIZEOF_DATATYPE_INT32 * data.image[ID].md[0].nelement);
-            break;
-
-        case _DATATYPE_UINT32 :
-            ptr1 = (char *) data.image[ID].array.UI32;
-            ptr2 = (char *) data.image[IDshm].array.UI32;
-            memcpy((void *) ptr2, (void *) ptr1,
-                   SIZEOF_DATATYPE_UINT32 * data.image[ID].md[0].nelement);
-            break;
-
-        case _DATATYPE_INT64 :
-            ptr1 = (char *) data.image[ID].array.SI64;
-            ptr2 = (char *) data.image[IDshm].array.SI64;
-            memcpy((void *) ptr2, (void *) ptr1,
-                   SIZEOF_DATATYPE_INT64 * data.image[ID].md[0].nelement);
-            break;
-
-        case _DATATYPE_UINT64 :
-            ptr1 = (char *) data.image[ID].array.UI64;
-            ptr2 = (char *) data.image[IDshm].array.UI64;
-            memcpy((void *) ptr2, (void *) ptr1,
-                   SIZEOF_DATATYPE_UINT64 * data.image[ID].md[0].nelement);
-            break;
-
-        default :
-            printf("data type not supported\n");
-            break;
+    case _DATATYPE_FLOAT:
+        ptr1 = (char *)data.image[ID].array.F;
+        ptr2 = (char *)data.image[IDshm].array.F;
+        memcpy((void *)ptr2, (void *)ptr1, SIZEOF_DATATYPE_FLOAT * data.image[ID].md[0].nelement);
+        break;
+
+    case _DATATYPE_DOUBLE:
+        ptr1 = (char *)data.image[ID].array.D;
+        ptr2 = (char *)data.image[IDshm].array.D;
+        memcpy((void *)ptr2, (void *)ptr1, SIZEOF_DATATYPE_DOUBLE * data.image[ID].md[0].nelement);
+        break;
+
+    case _DATATYPE_INT8:
+        ptr1 = (char *)data.image[ID].array.SI8;
+        ptr2 = (char *)data.image[IDshm].array.SI8;
+        memcpy((void *)ptr2, (void *)ptr1, SIZEOF_DATATYPE_INT8 * data.image[ID].md[0].nelement);
+        break;
+
+    case _DATATYPE_UINT8:
+        ptr1 = (char *)data.image[ID].array.UI8;
+        ptr2 = (char *)data.image[IDshm].array.UI8;
+        memcpy((void *)ptr2, (void *)ptr1, SIZEOF_DATATYPE_UINT8 * data.image[ID].md[0].nelement);
+        break;
+
+    case _DATATYPE_INT16:
+        ptr1 = (char *)data.image[ID].array.SI16;
+        ptr2 = (char *)data.image[IDshm].array.SI16;
+        memcpy((void *)ptr2, (void *)ptr1, SIZEOF_DATATYPE_INT16 * data.image[ID].md[0].nelement);
+        break;
+
+    case _DATATYPE_UINT16:
+        ptr1 = (char *)data.image[ID].array.UI16;
+        ptr2 = (char *)data.image[IDshm].array.UI16;
+        memcpy((void *)ptr2, (void *)ptr1, SIZEOF_DATATYPE_UINT16 * data.image[ID].md[0].nelement);
+        break;
+
+    case _DATATYPE_INT32:
+        ptr1 = (char *)data.image[ID].array.SI32;
+        ptr2 = (char *)data.image[IDshm].array.SI32;
+        memcpy((void *)ptr2, (void *)ptr1, SIZEOF_DATATYPE_INT32 * data.image[ID].md[0].nelement);
+        break;
+
+    case _DATATYPE_UINT32:
+        ptr1 = (char *)data.image[ID].array.UI32;
+        ptr2 = (char *)data.image[IDshm].array.UI32;
+        memcpy((void *)ptr2, (void *)ptr1, SIZEOF_DATATYPE_UINT32 * data.image[ID].md[0].nelement);
+        break;
+
+    case _DATATYPE_INT64:
+        ptr1 = (char *)data.image[ID].array.SI64;
+        ptr2 = (char *)data.image[IDshm].array.SI64;
+        memcpy((void *)ptr2, (void *)ptr1, SIZEOF_DATATYPE_INT64 * data.image[ID].md[0].nelement);
+        break;
+
+    case _DATATYPE_UINT64:
+        ptr1 = (char *)data.image[ID].array.UI64;
+        ptr2 = (char *)data.image[IDshm].array.UI64;
+        memcpy((void *)ptr2, (void *)ptr1, SIZEOF_DATATYPE_UINT64 * data.image[ID].md[0].nelement);
+        break;
+
+    default:
+        printf("data type not supported\n");
+        break;
     }
 
     // copy keywords
-    ptr1 = (char *) data.image[ID].kw;
-    ptr2 = (char *) data.image[IDshm].kw;
-    memcpy((void *) ptr2, (void *) ptr1,
-           sizeof(IMAGE_KEYWORD) * NBkw);
+    ptr1 = (char *)data.image[ID].kw;
+    ptr2 = (char *)data.image[IDshm].kw;
+    memcpy((void *)ptr2, (void *)ptr1, sizeof(IMAGE_KEYWORD) * NBkw);
 
     COREMOD_MEMORY_image_set_sempost_byID(IDshm, -1);
     data.image[IDshm].md[0].cnt0++;
     data.image[IDshm].md[0].write = 0;
 
-
-
     return RETURN_SUCCESS;
 }
 
-
 // adding INSERT_STD_PROCINFO statements enables processinfo support
 static errno_t compute_function()
 {
@@ -215,10 +168,7 @@ static errno_t compute_function()
 
     INSERT_STD_PROCINFO_COMPUTEFUNC_START
 
-    image_copy_shm(
-        makeIMGID(inimname),
-        outimname
-    );
+    image_copy_shm(makeIMGID(inimname), outimname);
 
     INSERT_STD_PROCINFO_COMPUTEFUNC_END
 
@@ -226,10 +176,10 @@ static errno_t compute_function()
     return RETURN_SUCCESS;
 }
 
-
 INSERT_STD_FPSCLIfunctions
 
-errno_t CLIADDCMD_COREMOD_memory__image_copy_shm()
+    errno_t
+    CLIADDCMD_COREMOD_memory__image_copy_shm()
 {
     INSERT_STD_CLIREGISTERFUNC
     return RETURN_SUCCESS;
diff --git a/src/COREMOD_memory/image_keyword.c b/src/COREMOD_memory/image_keyword.c
index e703a7b3..8dd07e11 100644
--- a/src/COREMOD_memory/image_keyword.c
+++ b/src/COREMOD_memory/image_keyword.c
@@ -2,43 +2,16 @@
  * @file    image_keyword.c
  */
 
-
-
 #include "CommandLineInterface/CLIcore.h"
 #include "image_ID.h"
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 // ==========================================
 // forward declarations
 // ==========================================
 
-long image_write_keyword_L(
-    const char *IDname,
-    const char *kname,
-    long value, const
-    char       *comment
-);
-
-long image_list_keywords(
-    const char *IDname
-);
-
+long image_write_keyword_L(const char *IDname, const char *kname, long value, const char *comment);
 
+long image_list_keywords(const char *IDname);
 
 // ==========================================
 // command line interface wrapper functions
@@ -46,19 +19,12 @@ long image_list_keywords(
 
 errno_t image_write_keyword_L__cli()
 {
-    if(0
-            + CLI_checkarg(1, CLIARG_IMG)
-            + CLI_checkarg(2, CLIARG_STR_NOT_IMG)
-            + CLI_checkarg(3, CLIARG_LONG)
-            + CLI_checkarg(4, CLIARG_STR_NOT_IMG)
-            == 0)
+    if (0 + CLI_checkarg(1, CLIARG_IMG) + CLI_checkarg(2, CLIARG_STR_NOT_IMG) + CLI_checkarg(3, CLIARG_LONG) +
+            CLI_checkarg(4, CLIARG_STR_NOT_IMG) ==
+        0)
     {
-        image_write_keyword_L(
-            data.cmdargtoken[1].val.string,
-            data.cmdargtoken[2].val.string,
-            data.cmdargtoken[3].val.numl,
-            data.cmdargtoken[4].val.string
-        );
+        image_write_keyword_L(data.cmdargtoken[1].val.string, data.cmdargtoken[2].val.string,
+                              data.cmdargtoken[3].val.numl, data.cmdargtoken[4].val.string);
         return CLICMD_SUCCESS;
     }
     else
@@ -67,14 +33,9 @@ errno_t image_write_keyword_L__cli()
     }
 }
 
-
-
-
 errno_t image_list_keywords__cli()
 {
-    if(0
-            + CLI_checkarg(1, CLIARG_IMG)
-            == 0)
+    if (0 + CLI_checkarg(1, CLIARG_IMG) == 0)
     {
         image_list_keywords(data.cmdargtoken[1].val.string);
         return CLICMD_SUCCESS;
@@ -85,10 +46,6 @@ errno_t image_list_keywords__cli()
     }
 }
 
-
-
-
-
 // ==========================================
 // Register CLI commands
 // ==========================================
@@ -96,57 +53,32 @@ errno_t image_list_keywords__cli()
 errno_t image_keyword_addCLIcmd()
 {
     RegisterCLIcommand(
-        "imwritekwL",
-        __FILE__,
-        image_write_keyword_L__cli,
-        "write long type keyword",
-        "<imname> <kname> <value [long]> <comment>",
-        "imwritekwL im1 kw2 34 my_keyword_comment",
+        "imwritekwL", __FILE__, image_write_keyword_L__cli, "write long type keyword",
+        "<imname> <kname> <value [long]> <comment>", "imwritekwL im1 kw2 34 my_keyword_comment",
         "long image_write_keyword_L(const char *IDname, const char *kname, long value, const char *comment)");
 
-    RegisterCLIcommand(
-        "imlistkw",
-        __FILE__,
-        image_list_keywords__cli,
-        "list image keywords",
-        "<imname>",
-        "imlistkw im1",
-        "long image_list_keywords(const char *IDname)");
+    RegisterCLIcommand("imlistkw", __FILE__, image_list_keywords__cli, "list image keywords", "<imname>",
+                       "imlistkw im1", "long image_list_keywords(const char *IDname)");
 
     return RETURN_SUCCESS;
 }
 
-
-
-
-
-
-
-
-
-
-
-long image_write_keyword_L(
-    const char *IDname,
-    const char *kname,
-    long        value,
-    const char *comment
-)
+long image_write_keyword_L(const char *IDname, const char *kname, long value, const char *comment)
 {
-    imageID  ID;
-    long     kw, NBkw, kw0;
+    imageID ID;
+    long kw, NBkw, kw0;
 
     ID = image_ID(IDname);
     NBkw = data.image[ID].md[0].NBkw;
 
     kw = 0;
-    while((data.image[ID].kw[kw].type != 'N') && (kw < NBkw))
+    while ((data.image[ID].kw[kw].type != 'N') && (kw < NBkw))
     {
         kw++;
     }
     kw0 = kw;
 
-    if(kw0 == NBkw)
+    if (kw0 == NBkw)
     {
         printf("ERROR: no available keyword entry\n");
         exit(0);
@@ -162,31 +94,24 @@ long image_write_keyword_L(
     return kw0;
 }
 
-
-
-long image_write_keyword_D(
-    const char *IDname,
-    const char *kname,
-    double      value,
-    const char *comment
-)
+long image_write_keyword_D(const char *IDname, const char *kname, double value, const char *comment)
 {
-    imageID  ID;
-    long     kw;
-    long     NBkw;
-    long     kw0;
+    imageID ID;
+    long kw;
+    long NBkw;
+    long kw0;
 
     ID = image_ID(IDname);
     NBkw = data.image[ID].md[0].NBkw;
 
     kw = 0;
-    while((data.image[ID].kw[kw].type != 'N') && (kw < NBkw))
+    while ((data.image[ID].kw[kw].type != 'N') && (kw < NBkw))
     {
         kw++;
     }
     kw0 = kw;
 
-    if(kw0 == NBkw)
+    if (kw0 == NBkw)
     {
         printf("ERROR: no available keyword entry\n");
         exit(0);
@@ -202,31 +127,24 @@ long image_write_keyword_D(
     return kw0;
 }
 
-
-
-long image_write_keyword_S(
-    const char *IDname,
-    const char *kname,
-    const char *value,
-    const char *comment
-)
+long image_write_keyword_S(const char *IDname, const char *kname, const char *value, const char *comment)
 {
     imageID ID;
-    long    kw;
-    long    NBkw;
-    long    kw0;
+    long kw;
+    long NBkw;
+    long kw0;
 
     ID = image_ID(IDname);
     NBkw = data.image[ID].md[0].NBkw;
 
     kw = 0;
-    while((data.image[ID].kw[kw].type != 'N') && (kw < NBkw))
+    while ((data.image[ID].kw[kw].type != 'N') && (kw < NBkw))
     {
         kw++;
     }
     kw0 = kw;
 
-    if(kw0 == NBkw)
+    if (kw0 == NBkw)
     {
         printf("ERROR: no available keyword entry\n");
         exit(0);
@@ -242,34 +160,29 @@ long image_write_keyword_S(
     return kw0;
 }
 
-
-
-
-imageID image_list_keywords(
-    const char *IDname
-)
+imageID image_list_keywords(const char *IDname)
 {
     imageID ID;
-    long    kw;
+    long kw;
 
     ID = image_ID(IDname);
 
-    for(kw = 0; kw < data.image[ID].md[0].NBkw; kw++)
+    for (kw = 0; kw < data.image[ID].md[0].NBkw; kw++)
     {
-        if(data.image[ID].kw[kw].type == 'L')
+        if (data.image[ID].kw[kw].type == 'L')
         {
-            printf("%18s  %20ld %s\n", data.image[ID].kw[kw].name,
-                   data.image[ID].kw[kw].value.numl, data.image[ID].kw[kw].comment);
+            printf("%18s  %20ld %s\n", data.image[ID].kw[kw].name, data.image[ID].kw[kw].value.numl,
+                   data.image[ID].kw[kw].comment);
         }
-        if(data.image[ID].kw[kw].type == 'D')
+        if (data.image[ID].kw[kw].type == 'D')
         {
-            printf("%18s  %20lf %s\n", data.image[ID].kw[kw].name,
-                   data.image[ID].kw[kw].value.numf, data.image[ID].kw[kw].comment);
+            printf("%18s  %20lf %s\n", data.image[ID].kw[kw].name, data.image[ID].kw[kw].value.numf,
+                   data.image[ID].kw[kw].comment);
         }
-        if(data.image[ID].kw[kw].type == 'S')
+        if (data.image[ID].kw[kw].type == 'S')
         {
-            printf("%18s  %20s %s\n", data.image[ID].kw[kw].name,
-                   data.image[ID].kw[kw].value.valstr, data.image[ID].kw[kw].comment);
+            printf("%18s  %20s %s\n", data.image[ID].kw[kw].name, data.image[ID].kw[kw].value.valstr,
+                   data.image[ID].kw[kw].comment);
         }
         //	if(data.image[ID].kw[kw].type=='N')
         //	printf("-------------\n");
@@ -278,25 +191,17 @@ imageID image_list_keywords(
     return ID;
 }
 
-
-
-
-long image_read_keyword_D(
-    const char *IDname,
-    const char *kname,
-    double     *val
-)
+long image_read_keyword_D(const char *IDname, const char *kname, double *val)
 {
-    variableID  ID;
-    long        kw;
-    long        kw0;
+    variableID ID;
+    long kw;
+    long kw0;
 
     ID = image_ID(IDname);
     kw0 = -1;
-    for(kw = 0; kw < data.image[ID].md[0].NBkw; kw++)
+    for (kw = 0; kw < data.image[ID].md[0].NBkw; kw++)
     {
-        if((data.image[ID].kw[kw].type == 'D')
-                && (strncmp(kname, data.image[ID].kw[kw].name, strlen(kname)) == 0))
+        if ((data.image[ID].kw[kw].type == 'D') && (strncmp(kname, data.image[ID].kw[kw].name, strlen(kname)) == 0))
         {
             kw0 = kw;
             *val = data.image[ID].kw[kw].value.numf;
@@ -306,24 +211,17 @@ long image_read_keyword_D(
     return kw0;
 }
 
-
-
-long image_read_keyword_L(
-    const char *IDname,
-    const char *kname,
-    long       *val
-)
+long image_read_keyword_L(const char *IDname, const char *kname, long *val)
 {
     variableID ID;
-    long       kw;
-    long       kw0;
+    long kw;
+    long kw0;
 
     ID = image_ID(IDname);
     kw0 = -1;
-    for(kw = 0; kw < data.image[ID].md[0].NBkw; kw++)
+    for (kw = 0; kw < data.image[ID].md[0].NBkw; kw++)
     {
-        if((data.image[ID].kw[kw].type == 'L')
-                && (strncmp(kname, data.image[ID].kw[kw].name, strlen(kname)) == 0))
+        if ((data.image[ID].kw[kw].type == 'L') && (strncmp(kname, data.image[ID].kw[kw].name, strlen(kname)) == 0))
         {
             kw0 = kw;
             *val = data.image[ID].kw[kw].value.numl;
@@ -332,4 +230,3 @@ long image_read_keyword_L(
 
     return kw0;
 }
-
diff --git a/src/COREMOD_memory/image_keyword.h b/src/COREMOD_memory/image_keyword.h
index c8e1c33d..b66dea63 100644
--- a/src/COREMOD_memory/image_keyword.h
+++ b/src/COREMOD_memory/image_keyword.h
@@ -2,46 +2,16 @@
  * @file    image_keyword.h
  */
 
-
-
-
 errno_t image_keyword_addCLIcmd();
 
+long image_write_keyword_L(const char *IDname, const char *kname, long value, const char *comment);
 
+long image_write_keyword_D(const char *IDname, const char *kname, double value, const char *comment);
 
-long image_write_keyword_L(
-    const char *IDname,
-    const char *kname,
-    long value, const
-    char       *comment
-);
-
-long image_write_keyword_D(
-    const char *IDname,
-    const char *kname,
-    double      value,
-    const char *comment
-);
-
-long image_write_keyword_S(
-    const char *IDname,
-    const char *kname,
-    const char *value,
-    const char *comment
-);
+long image_write_keyword_S(const char *IDname, const char *kname, const char *value, const char *comment);
 
-long image_list_keywords(
-    const char *IDname
-);
+long image_list_keywords(const char *IDname);
 
-long image_read_keyword_D(
-    const char *IDname,
-    const char *kname,
-    double     *val
-);
+long image_read_keyword_D(const char *IDname, const char *kname, double *val);
 
-long image_read_keyword_L(
-    const char *IDname,
-    const char *kname,
-    long       *val
-);
+long image_read_keyword_L(const char *IDname, const char *kname, long *val);
diff --git a/src/COREMOD_memory/image_keyword_addD.c b/src/COREMOD_memory/image_keyword_addD.c
index 78e0fba1..92f83358 100644
--- a/src/COREMOD_memory/image_keyword_addD.c
+++ b/src/COREMOD_memory/image_keyword_addD.c
@@ -5,58 +5,28 @@ static char *kwname;
 static double *kwval;
 static char *comment;
 
-static CLICMDARGDEF farg[] =
-{
-    {
-        CLIARG_IMG, ".in_name", "input image", "im1",
-        CLIARG_VISIBLE_DEFAULT,
-        (void **) &inimname, NULL
-    },
-    {
-        CLIARG_STR, ".kwname", "keyword name", "KW1",
-        CLIARG_VISIBLE_DEFAULT,
-        (void **) &kwname, NULL
-    },
-    {
-        CLIARG_FLOAT, ".kwval", "keyword value", "1.234",
-        CLIARG_VISIBLE_DEFAULT,
-        (void **) &kwval, NULL
-    },
-    {
-        CLIARG_STR, ".comment", "comment", "keyword comment",
-        CLIARG_VISIBLE_DEFAULT,
-        (void **) &comment, NULL
-    }
-};
-
-
-static CLICMDDATA CLIcmddata =
-{
-    "imkwaddD",
-    "add float type image keyword",
-    CLICMD_FIELDS_NOFPS
-};
+static CLICMDARGDEF farg[] = {
+    {CLIARG_IMG, ".in_name", "input image", "im1", CLIARG_VISIBLE_DEFAULT, (void **)&inimname, NULL},
+    {CLIARG_STR, ".kwname", "keyword name", "KW1", CLIARG_VISIBLE_DEFAULT, (void **)&kwname, NULL},
+    {CLIARG_FLOAT, ".kwval", "keyword value", "1.234", CLIARG_VISIBLE_DEFAULT, (void **)&kwval, NULL},
+    {CLIARG_STR, ".comment", "comment", "keyword comment", CLIARG_VISIBLE_DEFAULT, (void **)&comment, NULL}};
 
+static CLICMDDATA CLIcmddata = {"imkwaddD", "add float type image keyword", CLICMD_FIELDS_NOFPS};
 
-errno_t image_keyword_addD(
-    IMGID img,
-    char *kwname,
-    double kwval,
-    char *comment
-)
+errno_t image_keyword_addD(IMGID img, char *kwname, double kwval, char *comment)
 {
     resolveIMGID(&img, ERRMODE_ABORT);
 
     int NBkw = img.md->NBkw; // max nb kw
 
     int kw = 0;
-    while((img.im->kw[kw].type != 'N') && (kw < NBkw))
+    while ((img.im->kw[kw].type != 'N') && (kw < NBkw))
     {
         kw++;
     }
     int kw0 = kw;
 
-    if(kw0 == NBkw)
+    if (kw0 == NBkw)
     {
         printf("ERROR: no available keyword entry\n");
         abort();
@@ -72,28 +42,16 @@ errno_t image_keyword_addD(
     return RETURN_SUCCESS;
 }
 
-
-
-
-
 static errno_t compute_function()
 {
-    image_keyword_addD(
-        makeIMGID(inimname),
-        kwname,
-        *kwval,
-        comment
-    );
+    image_keyword_addD(makeIMGID(inimname), kwname, *kwval, comment);
     return RETURN_SUCCESS;
 }
 
-
-
 INSERT_STD_CLIfunction
 
-
-
-errno_t CLIADDCMD_COREMOD_memory__image_keyword_addD()
+    errno_t
+    CLIADDCMD_COREMOD_memory__image_keyword_addD()
 {
     INSERT_STD_CLIREGISTERFUNC
 
diff --git a/src/COREMOD_memory/image_keyword_addD.h b/src/COREMOD_memory/image_keyword_addD.h
index 9240f2b0..9fb2316e 100644
--- a/src/COREMOD_memory/image_keyword_addD.h
+++ b/src/COREMOD_memory/image_keyword_addD.h
@@ -1,12 +1,7 @@
 #ifndef COREMOD_MEMORY_IMAGE_KEYWORD_ADDD_H
 #define COREMOD_MEMORY_IMAGE_KEYWORD_ADDD_H
 
-errno_t image_keyword_addD(
-    IMGID img,
-    char *kwname,
-    double kwval,
-    char *comment
-);
+errno_t image_keyword_addD(IMGID img, char *kwname, double kwval, char *comment);
 
 errno_t CLIADDCMD_COREMOD_memory__image_keyword_addD();
 
diff --git a/src/COREMOD_memory/image_keyword_addL.c b/src/COREMOD_memory/image_keyword_addL.c
index 008ac2a2..b6c34dd0 100644
--- a/src/COREMOD_memory/image_keyword_addL.c
+++ b/src/COREMOD_memory/image_keyword_addL.c
@@ -5,58 +5,28 @@ static char *kwname;
 static long *kwval;
 static char *comment;
 
-static CLICMDARGDEF farg[] =
-{
-    {
-        CLIARG_IMG, ".in_name", "input image", "im1",
-        CLIARG_VISIBLE_DEFAULT,
-        (void **) &inimname, NULL
-    },
-    {
-        CLIARG_STR, ".kwname", "keyword name", "KW1",
-        CLIARG_VISIBLE_DEFAULT,
-        (void **) &kwname, NULL
-    },
-    {
-        CLIARG_LONG, ".kwval", "keyword value", "1",
-        CLIARG_VISIBLE_DEFAULT,
-        (void **) &kwval, NULL
-    },
-    {
-        CLIARG_STR, ".comment", "comment", "keyword comment",
-        CLIARG_VISIBLE_DEFAULT,
-        (void **) &comment, NULL
-    }
-};
-
-
-static CLICMDDATA CLIcmddata =
-{
-    "imkwaddL",
-    "add integer type image keyword",
-    CLICMD_FIELDS_NOFPS
-};
+static CLICMDARGDEF farg[] = {
+    {CLIARG_IMG, ".in_name", "input image", "im1", CLIARG_VISIBLE_DEFAULT, (void **)&inimname, NULL},
+    {CLIARG_STR, ".kwname", "keyword name", "KW1", CLIARG_VISIBLE_DEFAULT, (void **)&kwname, NULL},
+    {CLIARG_LONG, ".kwval", "keyword value", "1", CLIARG_VISIBLE_DEFAULT, (void **)&kwval, NULL},
+    {CLIARG_STR, ".comment", "comment", "keyword comment", CLIARG_VISIBLE_DEFAULT, (void **)&comment, NULL}};
 
+static CLICMDDATA CLIcmddata = {"imkwaddL", "add integer type image keyword", CLICMD_FIELDS_NOFPS};
 
-errno_t image_keyword_addL(
-    IMGID img,
-    char *kwname,
-    long kwval,
-    char *comment
-)
+errno_t image_keyword_addL(IMGID img, char *kwname, long kwval, char *comment)
 {
     resolveIMGID(&img, ERRMODE_ABORT);
 
     int NBkw = img.md->NBkw; // max nb kw
 
     int kw = 0;
-    while((img.im->kw[kw].type != 'N') && (kw < NBkw))
+    while ((img.im->kw[kw].type != 'N') && (kw < NBkw))
     {
         kw++;
     }
     int kw0 = kw;
 
-    if(kw0 == NBkw)
+    if (kw0 == NBkw)
     {
         printf("ERROR: no available keyword entry\n");
         abort();
@@ -72,28 +42,16 @@ errno_t image_keyword_addL(
     return RETURN_SUCCESS;
 }
 
-
-
-
-
 static errno_t compute_function()
 {
-    image_keyword_addL(
-        makeIMGID(inimname),
-        kwname,
-        *kwval,
-        comment
-    );
+    image_keyword_addL(makeIMGID(inimname), kwname, *kwval, comment);
     return RETURN_SUCCESS;
 }
 
-
-
 INSERT_STD_CLIfunction
 
-
-
-errno_t CLIADDCMD_COREMOD_memory__image_keyword_addL()
+    errno_t
+    CLIADDCMD_COREMOD_memory__image_keyword_addL()
 {
     INSERT_STD_CLIREGISTERFUNC
 
diff --git a/src/COREMOD_memory/image_keyword_addL.h b/src/COREMOD_memory/image_keyword_addL.h
index e304c27d..98b29543 100644
--- a/src/COREMOD_memory/image_keyword_addL.h
+++ b/src/COREMOD_memory/image_keyword_addL.h
@@ -1,12 +1,7 @@
 #ifndef COREMOD_MEMORY_IMAGE_KEYWORD_ADDL_H
 #define COREMOD_MEMORY_IMAGE_KEYWORD_ADDL_H
 
-errno_t image_keyword_addL(
-    IMGID img,
-    char *kwname,
-    long kwval,
-    char *comment
-);
+errno_t image_keyword_addL(IMGID img, char *kwname, long kwval, char *comment);
 
 errno_t CLIADDCMD_COREMOD_memory__image_keyword_addL();
 
diff --git a/src/COREMOD_memory/image_keyword_addS.c b/src/COREMOD_memory/image_keyword_addS.c
index 20876dd8..2fb799db 100644
--- a/src/COREMOD_memory/image_keyword_addS.c
+++ b/src/COREMOD_memory/image_keyword_addS.c
@@ -5,58 +5,28 @@ static char *kwname;
 static char *kwval;
 static char *comment;
 
-static CLICMDARGDEF farg[] =
-{
-    {
-        CLIARG_IMG, ".in_name", "input image", "im1",
-        CLIARG_VISIBLE_DEFAULT,
-        (void **) &inimname, NULL
-    },
-    {
-        CLIARG_STR, ".kwname", "keyword name", "KW1",
-        CLIARG_VISIBLE_DEFAULT,
-        (void **) &kwname, NULL
-    },
-    {
-        CLIARG_STR, ".kwval", "keyword value", "blue",
-        CLIARG_VISIBLE_DEFAULT,
-        (void **) &kwval, NULL
-    },
-    {
-        CLIARG_STR, ".comment", "comment", "keyword comment",
-        CLIARG_VISIBLE_DEFAULT,
-        (void **) &comment, NULL
-    }
-};
-
-
-static CLICMDDATA CLIcmddata =
-{
-    "imkwaddS",
-    "add string type image keyword",
-    CLICMD_FIELDS_NOFPS
-};
+static CLICMDARGDEF farg[] = {
+    {CLIARG_IMG, ".in_name", "input image", "im1", CLIARG_VISIBLE_DEFAULT, (void **)&inimname, NULL},
+    {CLIARG_STR, ".kwname", "keyword name", "KW1", CLIARG_VISIBLE_DEFAULT, (void **)&kwname, NULL},
+    {CLIARG_STR, ".kwval", "keyword value", "blue", CLIARG_VISIBLE_DEFAULT, (void **)&kwval, NULL},
+    {CLIARG_STR, ".comment", "comment", "keyword comment", CLIARG_VISIBLE_DEFAULT, (void **)&comment, NULL}};
 
+static CLICMDDATA CLIcmddata = {"imkwaddS", "add string type image keyword", CLICMD_FIELDS_NOFPS};
 
-errno_t image_keyword_addS(
-    IMGID img,
-    char *kwname,
-    char *kwval,
-    char *comment
-)
+errno_t image_keyword_addS(IMGID img, char *kwname, char *kwval, char *comment)
 {
     resolveIMGID(&img, ERRMODE_ABORT);
 
     int NBkw = img.md->NBkw; // max nb kw
 
     int kw = 0;
-    while((img.im->kw[kw].type != 'N') && (kw < NBkw))
+    while ((img.im->kw[kw].type != 'N') && (kw < NBkw))
     {
         kw++;
     }
     int kw0 = kw;
 
-    if(kw0 == NBkw)
+    if (kw0 == NBkw)
     {
         printf("ERROR: no available keyword entry\n");
         abort();
@@ -72,28 +42,16 @@ errno_t image_keyword_addS(
     return RETURN_SUCCESS;
 }
 
-
-
-
-
 static errno_t compute_function()
 {
-    image_keyword_addS(
-        makeIMGID(inimname),
-        kwname,
-        kwval,
-        comment
-    );
+    image_keyword_addS(makeIMGID(inimname), kwname, kwval, comment);
     return RETURN_SUCCESS;
 }
 
-
-
 INSERT_STD_CLIfunction
 
-
-
-errno_t CLIADDCMD_COREMOD_memory__image_keyword_addS()
+    errno_t
+    CLIADDCMD_COREMOD_memory__image_keyword_addS()
 {
     INSERT_STD_CLIREGISTERFUNC
 
diff --git a/src/COREMOD_memory/image_keyword_addS.h b/src/COREMOD_memory/image_keyword_addS.h
index 9b5465fc..b6c62554 100644
--- a/src/COREMOD_memory/image_keyword_addS.h
+++ b/src/COREMOD_memory/image_keyword_addS.h
@@ -1,12 +1,7 @@
 #ifndef COREMOD_MEMORY_IMAGE_KEYWORD_ADDS_H
 #define COREMOD_MEMORY_IMAGE_KEYWORD_ADDS_H
 
-errno_t image_keyword_addS(
-    IMGID img,
-    char *kwname,
-    char *kwval,
-    char *comment
-);
+errno_t image_keyword_addS(IMGID img, char *kwname, char *kwval, char *comment);
 
 errno_t CLIADDCMD_COREMOD_memory__image_keyword_addS();
 
diff --git a/src/COREMOD_memory/image_keyword_list.c b/src/COREMOD_memory/image_keyword_list.c
index 8a22860b..de0efd2e 100644
--- a/src/COREMOD_memory/image_keyword_list.c
+++ b/src/COREMOD_memory/image_keyword_list.c
@@ -2,58 +2,40 @@
 
 static char *inimname;
 
-static CLICMDARGDEF farg[] =
-{
-    {
-        CLIARG_IMG, ".in_name", "input image", "im1",
-        CLIARG_VISIBLE_DEFAULT,
-        (void **) &inimname, NULL
-    }
-};
+static CLICMDARGDEF farg[] = {
+    {CLIARG_IMG, ".in_name", "input image", "im1", CLIARG_VISIBLE_DEFAULT, (void **)&inimname, NULL}};
 
+static CLICMDDATA CLIcmddata = {"imkwlist", "list image keywords", CLICMD_FIELDS_NOFPS};
 
-static CLICMDDATA CLIcmddata =
-{
-    "imkwlist",
-    "list image keywords",
-    CLICMD_FIELDS_NOFPS
-};
-
-
-errno_t image_keywords_list(
-    IMGID img
-)
+errno_t image_keywords_list(IMGID img)
 {
     resolveIMGID(&img, ERRMODE_ABORT);
 
     int NBkw = img.md->NBkw;
     int kwcnt = 0;
-    for(int kw = 0; kw < NBkw; kw++)
+    for (int kw = 0; kw < NBkw; kw++)
     {
         char tmpkwvalstr[81];
-        switch(img.im->kw[kw].type)
+        switch (img.im->kw[kw].type)
         {
-            case 'L':
-                printf("[L] %-8s= %20ld / %s\n", img.im->kw[kw].name,
-                       img.im->kw[kw].value.numl, img.im->kw[kw].comment);
-                kwcnt++;
-                break;
-
-            case 'D':
-                printf("[D] %-8s= %20g / %s\n", img.im->kw[kw].name,
-                       img.im->kw[kw].value.numf, img.im->kw[kw].comment);
-                kwcnt++;
-                break;
-
-            case 'S':
-                sprintf(tmpkwvalstr, "'%s'", img.im->kw[kw].value.valstr);
-                printf("[S] %-8s= %-20s / %s\n", img.im->kw[kw].name,
-                       tmpkwvalstr, img.im->kw[kw].comment);
-                kwcnt++;
-                break;
-
-            default:
-                break;
+        case 'L':
+            printf("[L] %-8s= %20ld / %s\n", img.im->kw[kw].name, img.im->kw[kw].value.numl, img.im->kw[kw].comment);
+            kwcnt++;
+            break;
+
+        case 'D':
+            printf("[D] %-8s= %20g / %s\n", img.im->kw[kw].name, img.im->kw[kw].value.numf, img.im->kw[kw].comment);
+            kwcnt++;
+            break;
+
+        case 'S':
+            sprintf(tmpkwvalstr, "'%s'", img.im->kw[kw].value.valstr);
+            printf("[S] %-8s= %-20s / %s\n", img.im->kw[kw].name, tmpkwvalstr, img.im->kw[kw].comment);
+            kwcnt++;
+            break;
+
+        default:
+            break;
         }
     }
 
@@ -62,22 +44,16 @@ errno_t image_keywords_list(
     return RETURN_SUCCESS;
 }
 
-
 static errno_t compute_function()
 {
-    image_keywords_list(
-        makeIMGID(inimname)
-    );
+    image_keywords_list(makeIMGID(inimname));
     return RETURN_SUCCESS;
 }
 
-
-
 INSERT_STD_CLIfunction
 
-
-
-errno_t CLIADDCMD_COREMOD_memory__image_keyword_list()
+    errno_t
+    CLIADDCMD_COREMOD_memory__image_keyword_list()
 {
     INSERT_STD_CLIREGISTERFUNC
 
diff --git a/src/COREMOD_memory/image_keyword_list.h b/src/COREMOD_memory/image_keyword_list.h
index c128c408..c3452c0f 100644
--- a/src/COREMOD_memory/image_keyword_list.h
+++ b/src/COREMOD_memory/image_keyword_list.h
@@ -1,9 +1,7 @@
 #ifndef COREMOD_MEMORY_IMAGE_KEYWORD_LIST_H
 #define COREMOD_MEMORY_IMAGE_KEYWORD_LIST_H
 
-errno_t image_keywords_list(
-    IMGID img
-);
+errno_t image_keywords_list(IMGID img);
 
 errno_t CLIADDCMD_COREMOD_memory__image_keyword_list();
 
diff --git a/src/COREMOD_memory/image_make2D.c b/src/COREMOD_memory/image_make2D.c
index 8b39feee..017c6769 100644
--- a/src/COREMOD_memory/image_make2D.c
+++ b/src/COREMOD_memory/image_make2D.c
@@ -1,81 +1,48 @@
 #include "CommandLineInterface/CLIcore.h"
 
-
-
 // Local variables pointers
 static char *outimname;
 static uint32_t *imxsize;
 static uint32_t *imysize;
 
+static CLICMDARGDEF farg[] = {
+    {CLIARG_STR, ".out_name", "output image", "out1", CLIARG_VISIBLE_DEFAULT, (void **)&outimname, NULL},
+    {CLIARG_LONG, ".xsize", "x size", "512", CLIARG_VISIBLE_DEFAULT, (void **)&imxsize, NULL},
+    {CLIARG_LONG, ".ysize", "y size", "512", CLIARG_VISIBLE_DEFAULT, (void **)&imysize, NULL}};
 
-
-static CLICMDARGDEF farg[] =
-{
-    {
-        CLIARG_STR, ".out_name", "output image", "out1",
-        CLIARG_VISIBLE_DEFAULT,
-        (void **) &outimname, NULL
-    },
-    {
-        CLIARG_LONG, ".xsize", "x size", "512",
-        CLIARG_VISIBLE_DEFAULT,
-        (void **) &imxsize, NULL
-    },
-    {
-        CLIARG_LONG, ".ysize", "y size", "512",
-        CLIARG_VISIBLE_DEFAULT,
-        (void **) &imysize, NULL
-    }
-};
-
-static CLICMDDATA CLIcmddata =
-{
-    "mk2Dim",
-    "make 2D image",
-    CLICMD_FIELDS_DEFAULTS
-};
-
-
+static CLICMDDATA CLIcmddata = {"mk2Dim", "make 2D image", CLICMD_FIELDS_DEFAULTS};
 
 // detailed help
 static errno_t help_function()
 {
-    printf(
-        "Create 2D image\n"
-        "File name can be appended with attribute:\n"
-        "For example: \"s>im1\", indicates a shared memory image (attribute \"s\")\n"
-        "Attributes list:\n"
-        "    s>      shared memory\n"
-        "    k20>    number of keyword=20\n"
-        "    c5>     5-deep circular buffer for logging\n"
-        "    tui8>   type unsigned int 8-bit\n"
-        "    tsi8>   type signed int 8-bit\n"
-        "    tui16>  type unsigned int 16-bit\n"
-        "    tsi16>  type signed int 16-bit\n"
-        "    tui32>  type unsigned int 32-bit\n"
-        "    tsi32>  type signed int 32-bit\n"
-        "    tui64>  type unsigned int 64-bit\n"
-        "    tf32>   type float 32-bit\n"
-        "    tf64>   type float 64-bit\n"
-    );
+    printf("Create 2D image\n"
+           "File name can be appended with attribute:\n"
+           "For example: \"s>im1\", indicates a shared memory image (attribute \"s\")\n"
+           "Attributes list:\n"
+           "    s>      shared memory\n"
+           "    k20>    number of keyword=20\n"
+           "    c5>     5-deep circular buffer for logging\n"
+           "    tui8>   type unsigned int 8-bit\n"
+           "    tsi8>   type signed int 8-bit\n"
+           "    tui16>  type unsigned int 16-bit\n"
+           "    tsi16>  type signed int 16-bit\n"
+           "    tui32>  type unsigned int 32-bit\n"
+           "    tsi32>  type signed int 32-bit\n"
+           "    tui64>  type unsigned int 64-bit\n"
+           "    tf32>   type float 32-bit\n"
+           "    tf64>   type float 64-bit\n");
 
     return RETURN_SUCCESS;
 }
 
-
-
-static imageID make_2Dimage(
-    IMGID *img
-)
+static imageID make_2Dimage(IMGID *img)
 {
     // Create image if needed
     imcreateIMGID(img);
 
-    return(img->ID);
+    return (img->ID);
 }
 
-
-
 static errno_t compute_function()
 {
     DEBUG_TRACE_FSTART();
@@ -84,27 +51,21 @@ static errno_t compute_function()
 
     INSERT_STD_PROCINFO_COMPUTEFUNC_START
 
-    make_2Dimage(
-        &img
-    );
+    make_2Dimage(&img);
 
     processinfo_update_output_stream(processinfo, img.ID);
     INSERT_STD_PROCINFO_COMPUTEFUNC_END
 
-
     DEBUG_TRACE_FEXIT();
     return RETURN_SUCCESS;
 }
 
-
-
-
 INSERT_STD_FPSCLIfunctions
 
-// Register function in CLI
-errno_t CLIADDCMD_COREMOD_memory__mk2Dim()
+    // Register function in CLI
+    errno_t
+    CLIADDCMD_COREMOD_memory__mk2Dim()
 {
     INSERT_STD_CLIREGISTERFUNC
     return RETURN_SUCCESS;
 }
-
diff --git a/src/COREMOD_memory/image_make2D.h b/src/COREMOD_memory/image_make2D.h
index dae4da6a..822052a7 100644
--- a/src/COREMOD_memory/image_make2D.h
+++ b/src/COREMOD_memory/image_make2D.h
@@ -3,4 +3,4 @@
 
 errno_t CLIADDCMD_COREMOD_memory__mk2Dim();
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/COREMOD_memory/image_make3D.c b/src/COREMOD_memory/image_make3D.c
index ebbbdbf1..454f6f24 100644
--- a/src/COREMOD_memory/image_make3D.c
+++ b/src/COREMOD_memory/image_make3D.c
@@ -1,71 +1,34 @@
 #include "CommandLineInterface/CLIcore.h"
 
-
-
 // Local variables pointers
 static char *outimname;
 static uint32_t *imxsize;
 static uint32_t *imysize;
 static uint32_t *imzsize;
 
+static CLICMDARGDEF farg[] = {
+    {CLIARG_STR, ".out_name", "output image", "out1", CLIARG_VISIBLE_DEFAULT, (void **)&outimname, NULL},
+    {CLIARG_LONG, ".xsize", "x size", "512", CLIARG_VISIBLE_DEFAULT, (void **)&imxsize, NULL},
+    {CLIARG_LONG, ".ysize", "y size", "512", CLIARG_VISIBLE_DEFAULT, (void **)&imysize, NULL},
+    {CLIARG_LONG, ".zsize", "z size", "512", CLIARG_VISIBLE_DEFAULT, (void **)&imzsize, NULL}};
 
-static CLICMDARGDEF farg[] =
-{
-    {
-        CLIARG_STR, ".out_name", "output image", "out1",
-        CLIARG_VISIBLE_DEFAULT,
-        (void **) &outimname, NULL
-    },
-    {
-        CLIARG_LONG, ".xsize", "x size", "512",
-        CLIARG_VISIBLE_DEFAULT,
-        (void **) &imxsize, NULL
-    },
-    {
-        CLIARG_LONG, ".ysize", "y size", "512",
-        CLIARG_VISIBLE_DEFAULT,
-        (void **) &imysize, NULL
-    },
-    {
-        CLIARG_LONG, ".zsize", "z size", "512",
-        CLIARG_VISIBLE_DEFAULT,
-        (void **) &imzsize, NULL
-    }
-};
-
-static CLICMDDATA CLIcmddata =
-{
-    "mk3Dim",
-    "make 3D image\n"
-    "attributes: s>    : shared\n"
-    "            k20>  : 20 keywords\n",
-    CLICMD_FIELDS_DEFAULTS
-};
-
-
-
+static CLICMDDATA CLIcmddata = {"mk3Dim",
+                                "make 3D image\n"
+                                "attributes: s>    : shared\n"
+                                "            k20>  : 20 keywords\n",
+                                CLICMD_FIELDS_DEFAULTS};
 
 // detailed help
-static errno_t help_function()
-{
-    return RETURN_SUCCESS;
-}
-
-
+static errno_t help_function() { return RETURN_SUCCESS; }
 
-
-static imageID make_3Dimage(
-    IMGID *img
-)
+static imageID make_3Dimage(IMGID *img)
 {
     // Create image if needed
     imcreateIMGID(img);
 
-    return(img->ID);
+    return (img->ID);
 }
 
-
-
 static errno_t compute_function()
 {
     DEBUG_TRACE_FSTART();
@@ -74,9 +37,7 @@ static errno_t compute_function()
 
     INSERT_STD_PROCINFO_COMPUTEFUNC_START
 
-    make_3Dimage(
-        &img
-    );
+    make_3Dimage(&img);
 
     processinfo_update_output_stream(processinfo, img.ID);
     INSERT_STD_PROCINFO_COMPUTEFUNC_END
@@ -85,15 +46,12 @@ static errno_t compute_function()
     return RETURN_SUCCESS;
 }
 
-
-
-
 INSERT_STD_FPSCLIfunctions
 
-// Register function in CLI
-errno_t CLIADDCMD_COREMOD_memory__mk3Dim()
+    // Register function in CLI
+    errno_t
+    CLIADDCMD_COREMOD_memory__mk3Dim()
 {
     INSERT_STD_CLIREGISTERFUNC
     return RETURN_SUCCESS;
 }
-
diff --git a/src/COREMOD_memory/image_make3D.h b/src/COREMOD_memory/image_make3D.h
index 77ba21c6..9944ec9e 100644
--- a/src/COREMOD_memory/image_make3D.h
+++ b/src/COREMOD_memory/image_make3D.h
@@ -3,4 +3,4 @@
 
 errno_t CLIADDCMD_COREMOD_memory__mk3Dim();
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/COREMOD_memory/image_mk_amph_from_complex.c b/src/COREMOD_memory/image_mk_amph_from_complex.c
index 0dc0b1d1..30ffe86e 100644
--- a/src/COREMOD_memory/image_mk_amph_from_complex.c
+++ b/src/COREMOD_memory/image_mk_amph_from_complex.c
@@ -2,159 +2,106 @@
 
 #include "CommandLineInterface/CLIcore.h"
 
-
 // Local variables pointers
 static char *inimname;
 static char *outampimname;
 static char *outphaimname;
 
+static CLICMDARGDEF farg[] = {
+    {CLIARG_IMG, ".imre_name", "input imaginary image", "imC", CLIARG_VISIBLE_DEFAULT, (void **)&inimname, NULL},
+    {CLIARG_STR, ".imim_name", "output amplitude image", "outamp", CLIARG_VISIBLE_DEFAULT, (void **)&outampimname,
+     NULL},
+    {CLIARG_STR, ".out_name", "output phase image", "outpha", CLIARG_VISIBLE_DEFAULT, (void **)&outphaimname, NULL}};
 
-
-
-
-static CLICMDARGDEF farg[] =
-{
-    {
-        CLIARG_IMG, ".imre_name", "input imaginary image", "imC",
-        CLIARG_VISIBLE_DEFAULT,
-        (void **) &inimname, NULL
-    },
-    {
-        CLIARG_STR, ".imim_name", "output amplitude image", "outamp",
-        CLIARG_VISIBLE_DEFAULT,
-        (void **) &outampimname, NULL
-    },
-    {
-        CLIARG_STR, ".out_name", "output phase image", "outpha",
-        CLIARG_VISIBLE_DEFAULT,
-        (void **) &outphaimname, NULL
-    }
-};
-
-static CLICMDDATA CLIcmddata =
-{
-    "c2ap",
-    "complex -> ampl, pha",
-    CLICMD_FIELDS_DEFAULTS
-};
-
+static CLICMDDATA CLIcmddata = {"c2ap", "complex -> ampl, pha", CLICMD_FIELDS_DEFAULTS};
 
 // detailed help
-static errno_t help_function()
-{
-    return RETURN_SUCCESS;
-}
-
+static errno_t help_function() { return RETURN_SUCCESS; }
 
-
-
-
-
-errno_t mk_amph_from_complex(
-    const char *in_name,
-    const char *am_name,
-    const char *ph_name,
-    int         sharedmem
-)
+errno_t mk_amph_from_complex(const char *in_name, const char *am_name, const char *ph_name, int sharedmem)
 {
     DEBUG_TRACE_FSTART();
 
-    imageID    IDam;
-    imageID    IDph;
-    imageID    IDin;
-    uint32_t   naxes[3];
-    uint8_t    datatype;
+    imageID IDam;
+    imageID IDph;
+    imageID IDin;
+    uint32_t naxes[3];
+    uint8_t datatype;
 
     IDin = image_ID(in_name);
     datatype = data.image[IDin].md[0].datatype;
     uint8_t naxis = data.image[IDin].md[0].naxis;
 
-    for(uint8_t i = 0; i < naxis; i++)
+    for (uint8_t i = 0; i < naxis; i++)
     {
         naxes[i] = data.image[IDin].md[0].size[i];
     }
     uint64_t nelement = data.image[IDin].md[0].nelement;
 
-    if(datatype == _DATATYPE_COMPLEX_FLOAT) // single precision
+    if (datatype == _DATATYPE_COMPLEX_FLOAT) // single precision
     {
         FUNC_CHECK_RETURN(
-            create_image_ID(am_name, naxis, naxes,  _DATATYPE_FLOAT, sharedmem,
-                            data.NBKEYWORD_DFT, 0, &IDam)
-        );
+            create_image_ID(am_name, naxis, naxes, _DATATYPE_FLOAT, sharedmem, data.NBKEYWORD_DFT, 0, &IDam));
 
         FUNC_CHECK_RETURN(
-            create_image_ID(ph_name, naxis, naxes,  _DATATYPE_FLOAT, sharedmem,
-                            data.NBKEYWORD_DFT, 0, &IDph)
-        );
+            create_image_ID(ph_name, naxis, naxes, _DATATYPE_FLOAT, sharedmem, data.NBKEYWORD_DFT, 0, &IDph));
 
         data.image[IDam].md[0].write = 1;
         data.image[IDph].md[0].write = 1;
-# ifdef _OPENMP
-        #pragma omp parallel if (nelement>OMP_NELEMENT_LIMIT) private(ii,amp_f,pha_f)
+#ifdef _OPENMP
+#pragma omp parallel if (nelement > OMP_NELEMENT_LIMIT) private(ii, amp_f, pha_f)
         {
-            #pragma omp for
-# endif
-            for(uint64_t ii = 0; ii < nelement; ii++)
+#pragma omp for
+#endif
+            for (uint64_t ii = 0; ii < nelement; ii++)
             {
-                float amp_f = (float) sqrt(data.image[IDin].array.CF[ii].re *
-                                           data.image[IDin].array.CF[ii].re + data.image[IDin].array.CF[ii].im *
-                                           data.image[IDin].array.CF[ii].im);
-                float pha_f = (float) atan2(data.image[IDin].array.CF[ii].im,
-                                            data.image[IDin].array.CF[ii].re);
+                float amp_f = (float)sqrt(data.image[IDin].array.CF[ii].re * data.image[IDin].array.CF[ii].re +
+                                          data.image[IDin].array.CF[ii].im * data.image[IDin].array.CF[ii].im);
+                float pha_f = (float)atan2(data.image[IDin].array.CF[ii].im, data.image[IDin].array.CF[ii].re);
                 data.image[IDam].array.F[ii] = amp_f;
                 data.image[IDph].array.F[ii] = pha_f;
             }
-# ifdef _OPENMP
+#ifdef _OPENMP
         }
-# endif
-        if(sharedmem == 1)
+#endif
+        if (sharedmem == 1)
         {
-            FUNC_CHECK_RETURN(
-                COREMOD_MEMORY_image_set_sempost_byID(IDam, -1)
-            );
+            FUNC_CHECK_RETURN(COREMOD_MEMORY_image_set_sempost_byID(IDam, -1));
 
-            FUNC_CHECK_RETURN(
-                COREMOD_MEMORY_image_set_sempost_byID(IDph, -1)
-            );
+            FUNC_CHECK_RETURN(COREMOD_MEMORY_image_set_sempost_byID(IDph, -1));
         }
         data.image[IDam].md[0].cnt0++;
         data.image[IDph].md[0].cnt0++;
         data.image[IDam].md[0].write = 0;
         data.image[IDph].md[0].write = 0;
     }
-    else if(datatype == _DATATYPE_COMPLEX_DOUBLE) // double precision
+    else if (datatype == _DATATYPE_COMPLEX_DOUBLE) // double precision
     {
         FUNC_CHECK_RETURN(
-            create_image_ID(am_name, naxis, naxes, _DATATYPE_DOUBLE, sharedmem,
-                            data.NBKEYWORD_DFT, 0, &IDam)
-        );
+            create_image_ID(am_name, naxis, naxes, _DATATYPE_DOUBLE, sharedmem, data.NBKEYWORD_DFT, 0, &IDam));
 
         FUNC_CHECK_RETURN(
-            create_image_ID(ph_name, naxis, naxes, _DATATYPE_DOUBLE, sharedmem,
-                            data.NBKEYWORD_DFT, 0, &IDph)
-        );
+            create_image_ID(ph_name, naxis, naxes, _DATATYPE_DOUBLE, sharedmem, data.NBKEYWORD_DFT, 0, &IDph));
 
         data.image[IDam].md[0].write = 1;
         data.image[IDph].md[0].write = 1;
-# ifdef _OPENMP
-        #pragma omp parallel if (nelement>OMP_NELEMENT_LIMIT) private(ii,amp_d,pha_d)
+#ifdef _OPENMP
+#pragma omp parallel if (nelement > OMP_NELEMENT_LIMIT) private(ii, amp_d, pha_d)
         {
-            #pragma omp for
-# endif
-            for(uint64_t ii = 0; ii < nelement; ii++)
+#pragma omp for
+#endif
+            for (uint64_t ii = 0; ii < nelement; ii++)
             {
-                double amp_d = sqrt(data.image[IDin].array.CD[ii].re *
-                                    data.image[IDin].array.CD[ii].re
-                                    + data.image[IDin].array.CD[ii].im * data.image[IDin].array.CD[ii].im);
-                double pha_d = atan2(data.image[IDin].array.CD[ii].im,
-                                     data.image[IDin].array.CD[ii].re);
+                double amp_d = sqrt(data.image[IDin].array.CD[ii].re * data.image[IDin].array.CD[ii].re +
+                                    data.image[IDin].array.CD[ii].im * data.image[IDin].array.CD[ii].im);
+                double pha_d = atan2(data.image[IDin].array.CD[ii].im, data.image[IDin].array.CD[ii].re);
                 data.image[IDam].array.D[ii] = amp_d;
                 data.image[IDph].array.D[ii] = pha_d;
             }
-# ifdef _OPENMP
+#ifdef _OPENMP
         }
-# endif
-        if(sharedmem == 1)
+#endif
+        if (sharedmem == 1)
         {
             COREMOD_MEMORY_image_set_sempost_byID(IDam, -1);
             COREMOD_MEMORY_image_set_sempost_byID(IDph, -1);
@@ -174,25 +121,13 @@ errno_t mk_amph_from_complex(
     return RETURN_SUCCESS;
 }
 
-
-
-
-
-
-
 static errno_t compute_function()
 {
     DEBUG_TRACE_FSTART();
 
-
     INSERT_STD_PROCINFO_COMPUTEFUNC_START
 
-    mk_amph_from_complex(
-        inimname,
-        outampimname,
-        outphaimname,
-        0
-    );
+    mk_amph_from_complex(inimname, outampimname, outphaimname, 0);
 
     INSERT_STD_PROCINFO_COMPUTEFUNC_END
 
@@ -200,15 +135,12 @@ static errno_t compute_function()
     return RETURN_SUCCESS;
 }
 
-
-
-
 INSERT_STD_FPSCLIfunctions
 
-// Register function in CLI
-errno_t CLIADDCMD_COREMOD__mk_amph_from_complex()
+    // Register function in CLI
+    errno_t
+    CLIADDCMD_COREMOD__mk_amph_from_complex()
 {
     INSERT_STD_CLIREGISTERFUNC
     return RETURN_SUCCESS;
 }
-
diff --git a/src/COREMOD_memory/image_mk_amph_from_complex.h b/src/COREMOD_memory/image_mk_amph_from_complex.h
index 6ffd1fd7..6080d8f7 100644
--- a/src/COREMOD_memory/image_mk_amph_from_complex.h
+++ b/src/COREMOD_memory/image_mk_amph_from_complex.h
@@ -1,12 +1,7 @@
 #ifndef COREMOD_MEMORY_IMAGE_MK_AMPH_FROM_COMPLEX_H
 #define COREMOD_MEMORY_IMAGE_MK_AMPH_FROM_COMPLEX_H
 
-errno_t mk_amph_from_complex(
-    const char *in_name,
-    const char *am_name,
-    const char *ph_name,
-    int         sharedmem
-);
+errno_t mk_amph_from_complex(const char *in_name, const char *am_name, const char *ph_name, int sharedmem);
 
 errno_t CLIADDCMD_COREMOD__mk_amph_from_complex();
 
diff --git a/src/COREMOD_memory/image_mk_complex_from_amph.c b/src/COREMOD_memory/image_mk_complex_from_amph.c
index e3a29c0e..b01746f9 100644
--- a/src/COREMOD_memory/image_mk_complex_from_amph.c
+++ b/src/COREMOD_memory/image_mk_complex_from_amph.c
@@ -2,74 +2,35 @@
 
 #include "CommandLineInterface/CLIcore.h"
 
-
 // Local variables pointers
 static char *inampimname;
 static char *inphaimname;
 static char *outimname;
 
+static CLICMDARGDEF farg[] = {
+    {CLIARG_IMG, ".imamp_name", "amplitude image", "imamp", CLIARG_VISIBLE_DEFAULT, (void **)&inampimname, NULL},
+    {CLIARG_IMG, ".impha_name", "phase image", "impha", CLIARG_VISIBLE_DEFAULT, (void **)&inphaimname, NULL},
+    {CLIARG_STR, ".out_name", "output complex image", "outim", CLIARG_VISIBLE_DEFAULT, (void **)&outimname, NULL}};
 
-
-
-
-static CLICMDARGDEF farg[] =
-{
-    {
-        CLIARG_IMG, ".imamp_name", "amplitude image", "imamp",
-        CLIARG_VISIBLE_DEFAULT,
-        (void **) &inampimname, NULL
-    },
-    {
-        CLIARG_IMG, ".impha_name", "phase image", "impha",
-        CLIARG_VISIBLE_DEFAULT,
-        (void **) &inphaimname, NULL
-    },
-    {
-        CLIARG_STR, ".out_name", "output complex image", "outim",
-        CLIARG_VISIBLE_DEFAULT,
-        (void **) &outimname, NULL
-    }
-};
-
-static CLICMDDATA CLIcmddata =
-{
-    "ap2c",
-    "amplitude, phase -> complex",
-    CLICMD_FIELDS_DEFAULTS
-};
-
+static CLICMDDATA CLIcmddata = {"ap2c", "amplitude, phase -> complex", CLICMD_FIELDS_DEFAULTS};
 
 // detailed help
-static errno_t help_function()
-{
-    return RETURN_SUCCESS;
-}
+static errno_t help_function() { return RETURN_SUCCESS; }
 
-
-
-
-
-
-
-errno_t mk_complex_from_amph(
-    const char *am_name,
-    const char *ph_name,
-    const char *out_name,
-    int         sharedmem
-)
+errno_t mk_complex_from_amph(const char *am_name, const char *ph_name, const char *out_name, int sharedmem)
 {
     DEBUG_TRACE_FSTART();
 
-    imageID    IDam;
-    imageID    IDph;
-    imageID    IDout;
-    uint32_t   naxes[3];
-    long       naxis;
-    uint64_t   nelement;
-    long       i;
-    uint8_t    datatype_am;
-    uint8_t    datatype_ph;
-    uint8_t    datatype_out;
+    imageID IDam;
+    imageID IDph;
+    imageID IDout;
+    uint32_t naxes[3];
+    long naxis;
+    uint64_t nelement;
+    long i;
+    uint8_t datatype_am;
+    uint8_t datatype_ph;
+    uint8_t datatype_out;
 
     IDam = image_ID(am_name);
     IDph = image_ID(ph_name);
@@ -77,116 +38,100 @@ errno_t mk_complex_from_amph(
     datatype_ph = data.image[IDph].md[0].datatype;
 
     naxis = data.image[IDam].md[0].naxis;
-    for(i = 0; i < naxis; i++)
+    for (i = 0; i < naxis; i++)
     {
         naxes[i] = data.image[IDam].md[0].size[i];
     }
     nelement = data.image[IDam].md[0].nelement;
 
-    if((datatype_am == _DATATYPE_FLOAT) && (datatype_ph == _DATATYPE_FLOAT))
+    if ((datatype_am == _DATATYPE_FLOAT) && (datatype_ph == _DATATYPE_FLOAT))
     {
         datatype_out = _DATATYPE_COMPLEX_FLOAT;
         FUNC_CHECK_RETURN(
-            create_image_ID(out_name, naxis, naxes, datatype_out, sharedmem,
-                            data.NBKEYWORD_DFT, 0, &IDout)
-        );
+            create_image_ID(out_name, naxis, naxes, datatype_out, sharedmem, data.NBKEYWORD_DFT, 0, &IDout));
 
         data.image[IDout].md[0].write = 1;
-# ifdef _OPENMP
-        #pragma omp parallel if (nelement>OMP_NELEMENT_LIMIT)
+#ifdef _OPENMP
+#pragma omp parallel if (nelement > OMP_NELEMENT_LIMIT)
         {
-            #pragma omp for
-# endif
-            for(uint64_t ii = 0; ii < nelement; ii++)
+#pragma omp for
+#endif
+            for (uint64_t ii = 0; ii < nelement; ii++)
             {
-                data.image[IDout].array.CF[ii].re = data.image[IDam].array.F[ii] * ((float) cos(
-                                                        data.image[IDph].array.F[ii]));
-                data.image[IDout].array.CF[ii].im = data.image[IDam].array.F[ii] * ((float) sin(
-                                                        data.image[IDph].array.F[ii]));
+                data.image[IDout].array.CF[ii].re =
+                    data.image[IDam].array.F[ii] * ((float)cos(data.image[IDph].array.F[ii]));
+                data.image[IDout].array.CF[ii].im =
+                    data.image[IDam].array.F[ii] * ((float)sin(data.image[IDph].array.F[ii]));
             }
-# ifdef _OPENMP
+#ifdef _OPENMP
         }
-# endif
+#endif
         data.image[IDout].md[0].cnt0++;
         data.image[IDout].md[0].write = 0;
-
     }
-    else if((datatype_am == _DATATYPE_FLOAT) && (datatype_ph == _DATATYPE_DOUBLE))
+    else if ((datatype_am == _DATATYPE_FLOAT) && (datatype_ph == _DATATYPE_DOUBLE))
     {
         datatype_out = _DATATYPE_COMPLEX_DOUBLE;
         FUNC_CHECK_RETURN(
-            create_image_ID(out_name, naxis, naxes, datatype_out, sharedmem,
-                            data.NBKEYWORD_DFT, 0, &IDout)
-        );
+            create_image_ID(out_name, naxis, naxes, datatype_out, sharedmem, data.NBKEYWORD_DFT, 0, &IDout));
         data.image[IDout].md[0].write = 1;
-# ifdef _OPENMP
-        #pragma omp parallel if (nelement>OMP_NELEMENT_LIMIT)
+#ifdef _OPENMP
+#pragma omp parallel if (nelement > OMP_NELEMENT_LIMIT)
         {
-            #pragma omp for
-# endif
-            for(uint64_t ii = 0; ii < nelement; ii++)
+#pragma omp for
+#endif
+            for (uint64_t ii = 0; ii < nelement; ii++)
             {
-                data.image[IDout].array.CD[ii].re = data.image[IDam].array.F[ii] * cos(
-                                                        data.image[IDph].array.D[ii]);
-                data.image[IDout].array.CD[ii].im = data.image[IDam].array.F[ii] * sin(
-                                                        data.image[IDph].array.D[ii]);
+                data.image[IDout].array.CD[ii].re = data.image[IDam].array.F[ii] * cos(data.image[IDph].array.D[ii]);
+                data.image[IDout].array.CD[ii].im = data.image[IDam].array.F[ii] * sin(data.image[IDph].array.D[ii]);
             }
-# ifdef _OPENMP
+#ifdef _OPENMP
         }
-# endif
+#endif
         data.image[IDout].md[0].cnt0++;
         data.image[IDout].md[0].write = 0;
     }
-    else if((datatype_am == _DATATYPE_DOUBLE) && (datatype_ph == _DATATYPE_FLOAT))
+    else if ((datatype_am == _DATATYPE_DOUBLE) && (datatype_ph == _DATATYPE_FLOAT))
     {
         datatype_out = _DATATYPE_COMPLEX_DOUBLE;
         FUNC_CHECK_RETURN(
-            create_image_ID(out_name, naxis, naxes, datatype_out, sharedmem,
-                            data.NBKEYWORD_DFT, 0, &IDout)
-        );
+            create_image_ID(out_name, naxis, naxes, datatype_out, sharedmem, data.NBKEYWORD_DFT, 0, &IDout));
         data.image[IDout].md[0].write = 1;
-# ifdef _OPENMP
-        #pragma omp parallel if (nelement>OMP_NELEMENT_LIMIT)
+#ifdef _OPENMP
+#pragma omp parallel if (nelement > OMP_NELEMENT_LIMIT)
         {
-            #pragma omp for
-# endif
-            for(uint64_t ii = 0; ii < nelement; ii++)
+#pragma omp for
+#endif
+            for (uint64_t ii = 0; ii < nelement; ii++)
             {
-                data.image[IDout].array.CD[ii].re = data.image[IDam].array.D[ii] * cos(
-                                                        data.image[IDph].array.F[ii]);
-                data.image[IDout].array.CD[ii].im = data.image[IDam].array.D[ii] * sin(
-                                                        data.image[IDph].array.F[ii]);
+                data.image[IDout].array.CD[ii].re = data.image[IDam].array.D[ii] * cos(data.image[IDph].array.F[ii]);
+                data.image[IDout].array.CD[ii].im = data.image[IDam].array.D[ii] * sin(data.image[IDph].array.F[ii]);
             }
-# ifdef _OPENMP
+#ifdef _OPENMP
         }
-# endif
+#endif
         data.image[IDout].md[0].cnt0++;
         data.image[IDout].md[0].write = 0;
-
     }
-    else if((datatype_am == _DATATYPE_DOUBLE) && (datatype_ph == _DATATYPE_DOUBLE))
+    else if ((datatype_am == _DATATYPE_DOUBLE) && (datatype_ph == _DATATYPE_DOUBLE))
     {
         datatype_out = _DATATYPE_COMPLEX_DOUBLE;
         FUNC_CHECK_RETURN(
-            create_image_ID(out_name, naxis, naxes, datatype_out, sharedmem,
-                            data.NBKEYWORD_DFT, 0, &IDout)
-        );
+            create_image_ID(out_name, naxis, naxes, datatype_out, sharedmem, data.NBKEYWORD_DFT, 0, &IDout));
         data.image[IDout].md[0].write = 1;
-# ifdef _OPENMP
-        #pragma omp parallel if (nelement>OMP_NELEMENT_LIMIT)
+#ifdef _OPENMP
+#pragma omp parallel if (nelement > OMP_NELEMENT_LIMIT)
         {
-            #pragma omp for
-# endif
-            for(uint64_t ii = 0; ii < nelement; ii++)
+#pragma omp for
+#endif
+            for (uint64_t ii = 0; ii < nelement; ii++)
             {
-                data.image[IDout].array.CD[ii].re = data.image[IDam].array.D[ii] * cos(
-                                                        data.image[IDph].array.D[ii]);
-                data.image[IDout].array.CD[ii].im = data.image[IDam].array.D[ii] * sin(
-                                                        data.image[IDph].array.D[ii]);
+                data.image[IDout].array.CD[ii].re = data.image[IDam].array.D[ii] * cos(data.image[IDph].array.D[ii]);
+                data.image[IDout].array.CD[ii].im = data.image[IDam].array.D[ii] * sin(data.image[IDph].array.D[ii]);
             }
-# ifdef _OPENMP
+#ifdef _OPENMP
         }
-# endif
+#endif
         data.image[IDout].md[0].cnt0++;
         data.image[IDout].md[0].write = 0;
     }
@@ -200,21 +145,13 @@ errno_t mk_complex_from_amph(
     return RETURN_SUCCESS;
 }
 
-
-
 static errno_t compute_function()
 {
     DEBUG_TRACE_FSTART();
 
-
     INSERT_STD_PROCINFO_COMPUTEFUNC_START
 
-    mk_complex_from_amph(
-        inampimname,
-        inphaimname,
-        outimname,
-        0
-    );
+    mk_complex_from_amph(inampimname, inphaimname, outimname, 0);
 
     INSERT_STD_PROCINFO_COMPUTEFUNC_END
 
@@ -222,15 +159,12 @@ static errno_t compute_function()
     return RETURN_SUCCESS;
 }
 
-
-
-
 INSERT_STD_FPSCLIfunctions
 
-// Register function in CLI
-errno_t CLIADDCMD_COREMOD__mk_complex_from_amph()
+    // Register function in CLI
+    errno_t
+    CLIADDCMD_COREMOD__mk_complex_from_amph()
 {
     INSERT_STD_CLIREGISTERFUNC
     return RETURN_SUCCESS;
 }
-
diff --git a/src/COREMOD_memory/image_mk_complex_from_amph.h b/src/COREMOD_memory/image_mk_complex_from_amph.h
index a5e425f5..5849e268 100644
--- a/src/COREMOD_memory/image_mk_complex_from_amph.h
+++ b/src/COREMOD_memory/image_mk_complex_from_amph.h
@@ -1,12 +1,7 @@
 #ifndef COREMOD_MEMORY_IMAGE_MK_COMPLEX_FROM_AMPH_H
 #define COREMOD_MEMORY_IMAGE_MK_COMPLEX_FROM_AMPH_H
 
-errno_t mk_complex_from_amph(
-    const char *amp_name,
-    const char *pha_name,
-    const char *out_name,
-    int         sharedmem
-);
+errno_t mk_complex_from_amph(const char *amp_name, const char *pha_name, const char *out_name, int sharedmem);
 
 errno_t CLIADDCMD_COREMOD__mk_complex_from_amph();
 
diff --git a/src/COREMOD_memory/image_mk_complex_from_reim.c b/src/COREMOD_memory/image_mk_complex_from_reim.c
index 3005186e..47ad8423 100644
--- a/src/COREMOD_memory/image_mk_complex_from_reim.c
+++ b/src/COREMOD_memory/image_mk_complex_from_reim.c
@@ -2,71 +2,33 @@
 
 #include "CommandLineInterface/CLIcore.h"
 
-
 // Local variables pointers
 static char *inreimname;
 static char *inimimname;
 static char *outimname;
 
+static CLICMDARGDEF farg[] = {
+    {CLIARG_IMG, ".imre_name", "real image", "imre", CLIARG_VISIBLE_DEFAULT, (void **)&inreimname, NULL},
+    {CLIARG_IMG, ".imim_name", "imaginary image", "imim", CLIARG_VISIBLE_DEFAULT, (void **)&inimimname, NULL},
+    {CLIARG_STR, ".out_name", "output complex image", "outim", CLIARG_VISIBLE_DEFAULT, (void **)&outimname, NULL}};
 
-
-
-
-static CLICMDARGDEF farg[] =
-{
-    {
-        CLIARG_IMG, ".imre_name", "real image", "imre",
-        CLIARG_VISIBLE_DEFAULT,
-        (void **) &inreimname, NULL
-    },
-    {
-        CLIARG_IMG, ".imim_name", "imaginary image", "imim",
-        CLIARG_VISIBLE_DEFAULT,
-        (void **) &inimimname, NULL
-    },
-    {
-        CLIARG_STR, ".out_name", "output complex image", "outim",
-        CLIARG_VISIBLE_DEFAULT,
-        (void **) &outimname, NULL
-    }
-};
-
-static CLICMDDATA CLIcmddata =
-{
-    "ri2c",
-    "real, imaginary -> complex",
-    CLICMD_FIELDS_DEFAULTS
-};
-
+static CLICMDDATA CLIcmddata = {"ri2c", "real, imaginary -> complex", CLICMD_FIELDS_DEFAULTS};
 
 // detailed help
-static errno_t help_function()
-{
-    return RETURN_SUCCESS;
-}
-
-
-
+static errno_t help_function() { return RETURN_SUCCESS; }
 
-
-
-errno_t mk_complex_from_reim(
-    const char *re_name,
-    const char *im_name,
-    const char *out_name,
-    int         sharedmem
-)
+errno_t mk_complex_from_reim(const char *re_name, const char *im_name, const char *out_name, int sharedmem)
 {
     DEBUG_TRACE_FSTART();
 
-    imageID     IDre;
-    imageID     IDim;
-    imageID     IDout;
-    uint32_t   *naxes = NULL;
-    int8_t      naxis;
-    uint8_t     datatype_re;
-    uint8_t     datatype_im;
-    uint8_t     datatype_out;
+    imageID IDre;
+    imageID IDim;
+    imageID IDout;
+    uint32_t *naxes = NULL;
+    int8_t naxis;
+    uint8_t datatype_re;
+    uint8_t datatype_im;
+    uint8_t datatype_out;
 
     IDre = image_ID(re_name);
     IDim = image_ID(im_name);
@@ -75,67 +37,58 @@ errno_t mk_complex_from_reim(
     datatype_im = data.image[IDim].md[0].datatype;
     naxis = data.image[IDre].md[0].naxis;
 
-    naxes = (uint32_t *) malloc(sizeof(uint32_t) * naxis);
-    if(naxes == NULL)
+    naxes = (uint32_t *)malloc(sizeof(uint32_t) * naxis);
+    if (naxes == NULL)
     {
         PRINT_ERROR("malloc error");
         abort();
     }
 
-    for(int8_t i = 0; i < naxis; i++)
+    for (int8_t i = 0; i < naxis; i++)
     {
         naxes[i] = data.image[IDre].md[0].size[i];
     }
     uint64_t nelement = data.image[IDre].md[0].nelement;
 
-
-    if((datatype_re == _DATATYPE_FLOAT) && (datatype_im == _DATATYPE_FLOAT))
+    if ((datatype_re == _DATATYPE_FLOAT) && (datatype_im == _DATATYPE_FLOAT))
     {
         datatype_out = _DATATYPE_COMPLEX_FLOAT;
         FUNC_CHECK_RETURN(
-            create_image_ID(out_name, naxis, naxes, datatype_out, sharedmem,
-                            data.NBKEYWORD_DFT, 0, &IDout)
-        );
-        for(uint64_t ii = 0; ii < nelement; ii++)
+            create_image_ID(out_name, naxis, naxes, datatype_out, sharedmem, data.NBKEYWORD_DFT, 0, &IDout));
+        for (uint64_t ii = 0; ii < nelement; ii++)
         {
             data.image[IDout].array.CF[ii].re = data.image[IDre].array.F[ii];
             data.image[IDout].array.CF[ii].im = data.image[IDim].array.F[ii];
         }
     }
-    else if((datatype_re == _DATATYPE_FLOAT) && (datatype_im == _DATATYPE_DOUBLE))
+    else if ((datatype_re == _DATATYPE_FLOAT) && (datatype_im == _DATATYPE_DOUBLE))
     {
         datatype_out = _DATATYPE_COMPLEX_DOUBLE;
         FUNC_CHECK_RETURN(
-            create_image_ID(out_name, naxis, naxes, datatype_out, sharedmem,
-                            data.NBKEYWORD_DFT, 0, &IDout)
-        );
-        for(uint64_t ii = 0; ii < nelement; ii++)
+            create_image_ID(out_name, naxis, naxes, datatype_out, sharedmem, data.NBKEYWORD_DFT, 0, &IDout));
+        for (uint64_t ii = 0; ii < nelement; ii++)
         {
             data.image[IDout].array.CD[ii].re = data.image[IDre].array.F[ii];
             data.image[IDout].array.CD[ii].im = data.image[IDim].array.D[ii];
         }
     }
-    else if((datatype_re == _DATATYPE_DOUBLE) && (datatype_im == _DATATYPE_FLOAT))
+    else if ((datatype_re == _DATATYPE_DOUBLE) && (datatype_im == _DATATYPE_FLOAT))
     {
         datatype_out = _DATATYPE_COMPLEX_DOUBLE;
         FUNC_CHECK_RETURN(
-            create_image_ID(out_name, naxis, naxes, datatype_out, sharedmem,
-                            data.NBKEYWORD_DFT, 0, &IDout)
-        );
-        for(uint64_t ii = 0; ii < nelement; ii++)
+            create_image_ID(out_name, naxis, naxes, datatype_out, sharedmem, data.NBKEYWORD_DFT, 0, &IDout));
+        for (uint64_t ii = 0; ii < nelement; ii++)
         {
             data.image[IDout].array.CD[ii].re = data.image[IDre].array.D[ii];
             data.image[IDout].array.CD[ii].im = data.image[IDim].array.F[ii];
         }
     }
-    else if((datatype_re == _DATATYPE_DOUBLE) && (datatype_im == _DATATYPE_DOUBLE))
+    else if ((datatype_re == _DATATYPE_DOUBLE) && (datatype_im == _DATATYPE_DOUBLE))
     {
         datatype_out = _DATATYPE_COMPLEX_DOUBLE;
         FUNC_CHECK_RETURN(
-            create_image_ID(out_name, naxis, naxes, datatype_out, sharedmem,
-                            data.NBKEYWORD_DFT, 0, &IDout)
-        );
-        for(uint64_t ii = 0; ii < nelement; ii++)
+            create_image_ID(out_name, naxis, naxes, datatype_out, sharedmem, data.NBKEYWORD_DFT, 0, &IDout));
+        for (uint64_t ii = 0; ii < nelement; ii++)
         {
             data.image[IDout].array.CD[ii].re = data.image[IDre].array.D[ii];
             data.image[IDout].array.CD[ii].im = data.image[IDim].array.D[ii];
@@ -154,21 +107,13 @@ errno_t mk_complex_from_reim(
     return RETURN_SUCCESS;
 }
 
-
-
 static errno_t compute_function()
 {
     DEBUG_TRACE_FSTART();
 
-
     INSERT_STD_PROCINFO_COMPUTEFUNC_START
 
-    mk_complex_from_reim(
-        inreimname,
-        inimimname,
-        outimname,
-        0
-    );
+    mk_complex_from_reim(inreimname, inimimname, outimname, 0);
 
     INSERT_STD_PROCINFO_COMPUTEFUNC_END
 
@@ -176,15 +121,12 @@ static errno_t compute_function()
     return RETURN_SUCCESS;
 }
 
-
-
-
 INSERT_STD_FPSCLIfunctions
 
-// Register function in CLI
-errno_t CLIADDCMD_COREMOD__mk_complex_from_reim()
+    // Register function in CLI
+    errno_t
+    CLIADDCMD_COREMOD__mk_complex_from_reim()
 {
     INSERT_STD_CLIREGISTERFUNC
     return RETURN_SUCCESS;
 }
-
diff --git a/src/COREMOD_memory/image_mk_complex_from_reim.h b/src/COREMOD_memory/image_mk_complex_from_reim.h
index 61c1e184..8cc59985 100644
--- a/src/COREMOD_memory/image_mk_complex_from_reim.h
+++ b/src/COREMOD_memory/image_mk_complex_from_reim.h
@@ -1,12 +1,7 @@
 #ifndef COREMOD_MEMORY_IMAGE_MK_COMPLEX_FROM_REIM_H
 #define COREMOD_MEMORY_IMAGE_MK_COMPLEX_FROM_REIM_H
 
-errno_t mk_complex_from_reim(
-    const char *re_name,
-    const char *im_name,
-    const char *out_name,
-    int         sharedmem
-);
+errno_t mk_complex_from_reim(const char *re_name, const char *im_name, const char *out_name, int sharedmem);
 
 errno_t CLIADDCMD_COREMOD__mk_complex_from_reim();
 
diff --git a/src/COREMOD_memory/image_mk_reim_from_complex.c b/src/COREMOD_memory/image_mk_reim_from_complex.c
index 4b899be8..d84abe58 100644
--- a/src/COREMOD_memory/image_mk_reim_from_complex.c
+++ b/src/COREMOD_memory/image_mk_reim_from_complex.c
@@ -2,109 +2,67 @@
 
 #include "CommandLineInterface/CLIcore.h"
 
-
 // Local variables pointers
 static char *inimname;
 static char *outreimname;
 static char *outimimname;
 
+static CLICMDARGDEF farg[] = {
+    {CLIARG_IMG, ".imre_name", "input imaginary image", "imC", CLIARG_VISIBLE_DEFAULT, (void **)&inimname, NULL},
+    {CLIARG_STR, ".imim_name", "output real image", "outre", CLIARG_VISIBLE_DEFAULT, (void **)&outreimname, NULL},
+    {CLIARG_STR, ".out_name", "output imaginary image", "outim", CLIARG_VISIBLE_DEFAULT, (void **)&outimimname, NULL}};
 
-
-
-
-static CLICMDARGDEF farg[] =
-{
-    {
-        CLIARG_IMG, ".imre_name", "input imaginary image", "imC",
-        CLIARG_VISIBLE_DEFAULT,
-        (void **) &inimname, NULL
-    },
-    {
-        CLIARG_STR, ".imim_name", "output real image", "outre",
-        CLIARG_VISIBLE_DEFAULT,
-        (void **) &outreimname, NULL
-    },
-    {
-        CLIARG_STR, ".out_name", "output imaginary image", "outim",
-        CLIARG_VISIBLE_DEFAULT,
-        (void **) &outimimname, NULL
-    }
-};
-
-static CLICMDDATA CLIcmddata =
-{
-    "c2ap",
-    "complex -> re, im",
-    CLICMD_FIELDS_DEFAULTS
-};
-
+static CLICMDDATA CLIcmddata = {"c2ap", "complex -> re, im", CLICMD_FIELDS_DEFAULTS};
 
 // detailed help
-static errno_t help_function()
-{
-    return RETURN_SUCCESS;
-}
-
+static errno_t help_function() { return RETURN_SUCCESS; }
 
-
-
-
-
-errno_t mk_reim_from_complex(
-    const char *in_name,
-    const char *re_name,
-    const char *im_name,
-    int         sharedmem
-)
+errno_t mk_reim_from_complex(const char *in_name, const char *re_name, const char *im_name, int sharedmem)
 {
     DEBUG_TRACE_FSTART();
 
-    imageID     IDre;
-    imageID     IDim;
-    imageID     IDin;
-    uint32_t    naxes[3];
-    long        naxis;
-    uint64_t        nelement;
-    long        i;
-    uint8_t     datatype;
+    imageID IDre;
+    imageID IDim;
+    imageID IDin;
+    uint32_t naxes[3];
+    long naxis;
+    uint64_t nelement;
+    long i;
+    uint8_t datatype;
 
     IDin = image_ID(in_name);
     datatype = data.image[IDin].md[0].datatype;
     naxis = data.image[IDin].md[0].naxis;
-    for(i = 0; i < naxis; i++)
+    for (i = 0; i < naxis; i++)
     {
         naxes[i] = data.image[IDin].md[0].size[i];
     }
     nelement = data.image[IDin].md[0].nelement;
 
-    if(datatype == _DATATYPE_COMPLEX_FLOAT) // single precision
+    if (datatype == _DATATYPE_COMPLEX_FLOAT) // single precision
     {
         FUNC_CHECK_RETURN(
-            create_image_ID(re_name, naxis, naxes, _DATATYPE_FLOAT, sharedmem,
-                            data.NBKEYWORD_DFT, 0, &IDre)
-        );
+            create_image_ID(re_name, naxis, naxes, _DATATYPE_FLOAT, sharedmem, data.NBKEYWORD_DFT, 0, &IDre));
 
         FUNC_CHECK_RETURN(
-            create_image_ID(im_name, naxis, naxes, _DATATYPE_FLOAT, sharedmem,
-                            data.NBKEYWORD_DFT, 0, &IDim)
-        );
+            create_image_ID(im_name, naxis, naxes, _DATATYPE_FLOAT, sharedmem, data.NBKEYWORD_DFT, 0, &IDim));
 
         data.image[IDre].md[0].write = 1;
         data.image[IDim].md[0].write = 1;
-# ifdef _OPENMP
-        #pragma omp parallel if (nelement>OMP_NELEMENT_LIMIT)
+#ifdef _OPENMP
+#pragma omp parallel if (nelement > OMP_NELEMENT_LIMIT)
         {
-            #pragma omp for
-# endif
-            for(uint64_t ii = 0; ii < nelement; ii++)
+#pragma omp for
+#endif
+            for (uint64_t ii = 0; ii < nelement; ii++)
             {
                 data.image[IDre].array.F[ii] = data.image[IDin].array.CF[ii].re;
                 data.image[IDim].array.F[ii] = data.image[IDin].array.CF[ii].im;
             }
-# ifdef _OPENMP
+#ifdef _OPENMP
         }
-# endif
-        if(sharedmem == 1)
+#endif
+        if (sharedmem == 1)
         {
             COREMOD_MEMORY_image_set_sempost_byID(IDre, -1);
             COREMOD_MEMORY_image_set_sempost_byID(IDim, -1);
@@ -114,33 +72,29 @@ errno_t mk_reim_from_complex(
         data.image[IDre].md[0].write = 0;
         data.image[IDim].md[0].write = 0;
     }
-    else if(datatype == _DATATYPE_COMPLEX_DOUBLE) // double precision
+    else if (datatype == _DATATYPE_COMPLEX_DOUBLE) // double precision
     {
         FUNC_CHECK_RETURN(
-            create_image_ID(re_name, naxis, naxes, _DATATYPE_DOUBLE, sharedmem,
-                            data.NBKEYWORD_DFT, 0, &IDre)
-        );
+            create_image_ID(re_name, naxis, naxes, _DATATYPE_DOUBLE, sharedmem, data.NBKEYWORD_DFT, 0, &IDre));
 
         FUNC_CHECK_RETURN(
-            create_image_ID(im_name, naxis, naxes, _DATATYPE_DOUBLE, sharedmem,
-                            data.NBKEYWORD_DFT, 0, &IDim)
-        );
+            create_image_ID(im_name, naxis, naxes, _DATATYPE_DOUBLE, sharedmem, data.NBKEYWORD_DFT, 0, &IDim));
         data.image[IDre].md[0].write = 1;
         data.image[IDim].md[0].write = 1;
-# ifdef _OPENMP
-        #pragma omp parallel if (nelement>OMP_NELEMENT_LIMIT)
+#ifdef _OPENMP
+#pragma omp parallel if (nelement > OMP_NELEMENT_LIMIT)
         {
-            #pragma omp for
-# endif
-            for(uint64_t ii = 0; ii < nelement; ii++)
+#pragma omp for
+#endif
+            for (uint64_t ii = 0; ii < nelement; ii++)
             {
                 data.image[IDre].array.D[ii] = data.image[IDin].array.CD[ii].re;
                 data.image[IDim].array.D[ii] = data.image[IDin].array.CD[ii].im;
             }
-# ifdef _OPENMP
+#ifdef _OPENMP
         }
-# endif
-        if(sharedmem == 1)
+#endif
+        if (sharedmem == 1)
         {
             COREMOD_MEMORY_image_set_sempost_byID(IDre, -1);
             COREMOD_MEMORY_image_set_sempost_byID(IDim, -1);
@@ -149,7 +103,6 @@ errno_t mk_reim_from_complex(
         data.image[IDim].md[0].cnt0++;
         data.image[IDre].md[0].write = 0;
         data.image[IDim].md[0].write = 0;
-
     }
     else
     {
@@ -161,25 +114,13 @@ errno_t mk_reim_from_complex(
     return RETURN_SUCCESS;
 }
 
-
-
-
-
-
-
 static errno_t compute_function()
 {
     DEBUG_TRACE_FSTART();
 
-
     INSERT_STD_PROCINFO_COMPUTEFUNC_START
 
-    mk_reim_from_complex(
-        inimname,
-        outreimname,
-        outimimname,
-        0
-    );
+    mk_reim_from_complex(inimname, outreimname, outimimname, 0);
 
     INSERT_STD_PROCINFO_COMPUTEFUNC_END
 
@@ -187,15 +128,12 @@ static errno_t compute_function()
     return RETURN_SUCCESS;
 }
 
-
-
-
 INSERT_STD_FPSCLIfunctions
 
-// Register function in CLI
-errno_t CLIADDCMD_COREMOD__mk_reim_from_complex()
+    // Register function in CLI
+    errno_t
+    CLIADDCMD_COREMOD__mk_reim_from_complex()
 {
     INSERT_STD_CLIREGISTERFUNC
     return RETURN_SUCCESS;
 }
-
diff --git a/src/COREMOD_memory/image_mk_reim_from_complex.h b/src/COREMOD_memory/image_mk_reim_from_complex.h
index 6564ac8c..fa0f1109 100644
--- a/src/COREMOD_memory/image_mk_reim_from_complex.h
+++ b/src/COREMOD_memory/image_mk_reim_from_complex.h
@@ -1,12 +1,7 @@
 #ifndef COREMOD_MEMORY_IMAGE_MK_REIM_FROM_COMPLEX_H
 #define COREMOD_MEMORY_IMAGE_MK_REIM_FROM_COMPLEX_H
 
-errno_t mk_reim_from_complex(
-    const char *in_name,
-    const char *re_name,
-    const char *im_name,
-    int         sharedmem
-);
+errno_t mk_reim_from_complex(const char *in_name, const char *re_name, const char *im_name, int sharedmem);
 
 errno_t CLIADDCMD_COREMOD__mk_reim_from_complex();
 
diff --git a/src/COREMOD_memory/image_set_counters.c b/src/COREMOD_memory/image_set_counters.c
index 64801c69..0a0f3793 100644
--- a/src/COREMOD_memory/image_set_counters.c
+++ b/src/COREMOD_memory/image_set_counters.c
@@ -1,53 +1,30 @@
 /**
  * @file    image_set_couters.c
- * @brief   SET IMAGE FLAGS / COUNTERS        
+ * @brief   SET IMAGE FLAGS / COUNTERS
  */
 
 #include "CommandLineInterface/CLIcore.h"
 #include "image_ID.h"
 
-
-
-
-
 // ==========================================
 // Forward declaration(s)
 // ==========================================
 
+errno_t COREMOD_MEMORY_image_set_status(const char *IDname, int status);
 
-errno_t COREMOD_MEMORY_image_set_status(
-    const char *IDname,
-    int         status
-);
-
-errno_t COREMOD_MEMORY_image_set_cnt0(
-    const char *IDname,
-    int         cnt0
-);
-
-errno_t COREMOD_MEMORY_image_set_cnt1(
-    const char *IDname,
-    int         cnt1
-);
-
+errno_t COREMOD_MEMORY_image_set_cnt0(const char *IDname, int cnt0);
 
+errno_t COREMOD_MEMORY_image_set_cnt1(const char *IDname, int cnt1);
 
 // ==========================================
 // Command line interface wrapper function(s)
 // ==========================================
 
-
 static errno_t COREMOD_MEMORY_image_set_status__cli()
 {
-    if(0
-            + CLI_checkarg(1, CLIARG_IMG)
-            + CLI_checkarg(2, CLIARG_LONG)
-            == 0)
+    if (0 + CLI_checkarg(1, CLIARG_IMG) + CLI_checkarg(2, CLIARG_LONG) == 0)
     {
-        COREMOD_MEMORY_image_set_status(
-            data.cmdargtoken[1].val.string,
-            (int) data.cmdargtoken[2].val.numl
-        );
+        COREMOD_MEMORY_image_set_status(data.cmdargtoken[1].val.string, (int)data.cmdargtoken[2].val.numl);
         return CLICMD_SUCCESS;
     }
     else
@@ -56,18 +33,11 @@ static errno_t COREMOD_MEMORY_image_set_status__cli()
     }
 }
 
-
 static errno_t COREMOD_MEMORY_image_set_cnt0__cli()
 {
-    if(0
-            + CLI_checkarg(1, CLIARG_IMG)
-            + CLI_checkarg(2, CLIARG_LONG)
-            == 0)
+    if (0 + CLI_checkarg(1, CLIARG_IMG) + CLI_checkarg(2, CLIARG_LONG) == 0)
     {
-        COREMOD_MEMORY_image_set_cnt0(
-            data.cmdargtoken[1].val.string,
-            (int) data.cmdargtoken[2].val.numl
-        );
+        COREMOD_MEMORY_image_set_cnt0(data.cmdargtoken[1].val.string, (int)data.cmdargtoken[2].val.numl);
         return CLICMD_SUCCESS;
     }
     else
@@ -76,18 +46,11 @@ static errno_t COREMOD_MEMORY_image_set_cnt0__cli()
     }
 }
 
-
 static errno_t COREMOD_MEMORY_image_set_cnt1__cli()
 {
-    if(0
-            + CLI_checkarg(1, CLIARG_IMG)
-            + CLI_checkarg(2, CLIARG_LONG)
-            == 0)
+    if (0 + CLI_checkarg(1, CLIARG_IMG) + CLI_checkarg(2, CLIARG_LONG) == 0)
     {
-        COREMOD_MEMORY_image_set_cnt1(
-            data.cmdargtoken[1].val.string,
-            (int) data.cmdargtoken[2].val.numl
-        );
+        COREMOD_MEMORY_image_set_cnt1(data.cmdargtoken[1].val.string, (int)data.cmdargtoken[2].val.numl);
         return CLICMD_SUCCESS;
     }
     else
@@ -96,51 +59,28 @@ static errno_t COREMOD_MEMORY_image_set_cnt1__cli()
     }
 }
 
-
-
-
 // ==========================================
 // Register CLI command(s)
 // ==========================================
 
 errno_t image_set_counters_addCLIcmd()
 {
-    RegisterCLIcommand(
-        "imsetstatus",
-        __FILE__,
-        COREMOD_MEMORY_image_set_status__cli,
-        "set image status variable", "<image> <value [long]>",
-        "imsetstatus im1 2",
-        "long COREMOD_MEMORY_image_set_status(const char *IDname, int status)");
-
-    RegisterCLIcommand(
-        "imsetcnt0",
-        __FILE__,
-        COREMOD_MEMORY_image_set_cnt0__cli,
-        "set image cnt0 variable", "<image> <value [long]>",
-        "imsetcnt0 im1 2",
-        "long COREMOD_MEMORY_image_set_cnt0(const char *IDname, int status)");
-
-    RegisterCLIcommand(
-        "imsetcnt1",
-        __FILE__,
-        COREMOD_MEMORY_image_set_cnt1__cli,
-        "set image cnt1 variable", "<image> <value [long]>",
-        "imsetcnt1 im1 2",
-        "long COREMOD_MEMORY_image_set_cnt1(const char *IDname, int status)");   
-
-    return RETURN_SUCCESS;
-}
-
-
+    RegisterCLIcommand("imsetstatus", __FILE__, COREMOD_MEMORY_image_set_status__cli, "set image status variable",
+                       "<image> <value [long]>", "imsetstatus im1 2",
+                       "long COREMOD_MEMORY_image_set_status(const char *IDname, int status)");
 
+    RegisterCLIcommand("imsetcnt0", __FILE__, COREMOD_MEMORY_image_set_cnt0__cli, "set image cnt0 variable",
+                       "<image> <value [long]>", "imsetcnt0 im1 2",
+                       "long COREMOD_MEMORY_image_set_cnt0(const char *IDname, int status)");
 
+    RegisterCLIcommand("imsetcnt1", __FILE__, COREMOD_MEMORY_image_set_cnt1__cli, "set image cnt1 variable",
+                       "<image> <value [long]>", "imsetcnt1 im1 2",
+                       "long COREMOD_MEMORY_image_set_cnt1(const char *IDname, int status)");
 
+    return RETURN_SUCCESS;
+}
 
-errno_t COREMOD_MEMORY_image_set_status(
-    const char *IDname,
-    int         status
-)
+errno_t COREMOD_MEMORY_image_set_status(const char *IDname, int status)
 {
     imageID ID;
 
@@ -150,11 +90,7 @@ errno_t COREMOD_MEMORY_image_set_status(
     return RETURN_SUCCESS;
 }
 
-
-errno_t COREMOD_MEMORY_image_set_cnt0(
-    const char *IDname,
-    int         cnt0
-)
+errno_t COREMOD_MEMORY_image_set_cnt0(const char *IDname, int cnt0)
 {
     imageID ID;
 
@@ -164,11 +100,7 @@ errno_t COREMOD_MEMORY_image_set_cnt0(
     return RETURN_SUCCESS;
 }
 
-
-errno_t COREMOD_MEMORY_image_set_cnt1(
-    const char *IDname,
-    int         cnt1
-)
+errno_t COREMOD_MEMORY_image_set_cnt1(const char *IDname, int cnt1)
 {
     imageID ID;
 
@@ -177,6 +109,3 @@ errno_t COREMOD_MEMORY_image_set_cnt1(
 
     return RETURN_SUCCESS;
 }
-
-
-
diff --git a/src/COREMOD_memory/image_set_counters.h b/src/COREMOD_memory/image_set_counters.h
index 02f4c5ba..6ea6b92f 100644
--- a/src/COREMOD_memory/image_set_counters.h
+++ b/src/COREMOD_memory/image_set_counters.h
@@ -2,24 +2,10 @@
  * @file    image_set_couters.h
  */
 
-
-
 errno_t image_set_counters_addCLIcmd();
 
+errno_t COREMOD_MEMORY_image_set_status(const char *IDname, int status);
 
+errno_t COREMOD_MEMORY_image_set_cnt0(const char *IDname, int cnt0);
 
-
-errno_t COREMOD_MEMORY_image_set_status(
-    const char *IDname,
-    int         status
-);
-
-errno_t COREMOD_MEMORY_image_set_cnt0(
-    const char *IDname,
-    int         cnt0
-);
-
-errno_t COREMOD_MEMORY_image_set_cnt1(
-    const char *IDname,
-    int         cnt1
-);
+errno_t COREMOD_MEMORY_image_set_cnt1(const char *IDname, int cnt1);
diff --git a/src/COREMOD_memory/list_image.c b/src/COREMOD_memory/list_image.c
index f68efddc..27d9bb15 100644
--- a/src/COREMOD_memory/list_image.c
+++ b/src/COREMOD_memory/list_image.c
@@ -3,18 +3,15 @@
  * @brief   list images
  */
 
-
 #include <ncurses.h>
 
 #include "CommandLineInterface/CLIcore.h"
-#include "image_ID.h"
-#include "compute_nb_image.h"
 #include "compute_image_memory.h"
-
+#include "compute_nb_image.h"
+#include "image_ID.h"
 
 #define STYPESIZE 10
 
-
 // MEMORY MONITOR
 static FILE *listim_scr_fpo;
 static FILE *listim_scr_fpi;
@@ -23,101 +20,58 @@ static SCREEN *listim_scr; // for memory monitoring
 static int listim_scr_wrow;
 static int listim_scr_wcol;
 
-
-
-
-
 // ==========================================
 // Forward declaration(s)
 // ==========================================
 
-errno_t    memory_monitor(
-    const char *termttyname
-);
-
+errno_t memory_monitor(const char *termttyname);
 
-errno_t init_list_image_ID_ncurses(
-    const char *termttyname
-);
+errno_t init_list_image_ID_ncurses(const char *termttyname);
 
 void close_list_image_ID_ncurses();
 
 errno_t list_image_ID_ncurses();
 
-errno_t list_image_ID_ofp(
-    FILE *fo
-);
+errno_t list_image_ID_ofp(FILE *fo);
 
-errno_t list_image_ID_ofp_simple(
-    FILE *fo
-);
+errno_t list_image_ID_ofp_simple(FILE *fo);
 
 errno_t list_image_ID();
 
-errno_t list_image_ID_file(
-    const char *fname
-);
+errno_t list_image_ID_file(const char *fname);
 
 errno_t list_variable_ID();
 
-errno_t list_variable_ID_file(
-    const char *fname
-);
-
-
+errno_t list_variable_ID_file(const char *fname);
 
 // ==========================================
 // Command line interface wrapper function(s)
 // ==========================================
 
-
 static errno_t memory_monitor__cli()
 {
     memory_monitor(data.cmdargtoken[1].val.string);
     return CLICMD_SUCCESS;
 }
 
-
-
-
 // ==========================================
 // Register CLI command(s)
 // ==========================================
 
 errno_t list_image_addCLIcmd()
 {
-	 RegisterCLIcommand(
-        "mmon",
-        __FILE__,
-        memory_monitor__cli,
-        "Monitor memory content",
-        "terminal tty name",
-        "mmon /dev/pts/4",
-        "int memory_monitor(const char *ttyname)");
-
-    RegisterCLIcommand(
-        "listim",
-        __FILE__,
-        list_image_ID,
-        "list images in memory",
-        "no argument",
-        "listim", "errno_t list_image_ID()");
+    RegisterCLIcommand("mmon", __FILE__, memory_monitor__cli, "Monitor memory content", "terminal tty name",
+                       "mmon /dev/pts/4", "int memory_monitor(const char *ttyname)");
+
+    RegisterCLIcommand("listim", __FILE__, list_image_ID, "list images in memory", "no argument", "listim",
+                       "errno_t list_image_ID()");
 
     return RETURN_SUCCESS;
 }
 
-
-
-
-
-
-
-
-errno_t init_list_image_ID_ncurses(
-    const char *termttyname
-)
+errno_t init_list_image_ID_ncurses(const char *termttyname)
 {
-//    int wrow, wcol;
+    //    int wrow, wcol;
 
     listim_scr_fpi = fopen(termttyname, "r");
     listim_scr_fpo = fopen(termttyname, "w");
@@ -138,26 +92,20 @@ errno_t init_list_image_ID_ncurses(
     return RETURN_SUCCESS;
 }
 
-
-
-
-
-
-
 errno_t list_image_ID_ncurses()
 {
-    char      str[300];
-    char      str1[500];
-    char      str2[512];
-    long      i, j;
+    char str[300];
+    char str1[500];
+    char str2[512];
+    long i, j;
     long long tmp_long;
-    char      type[STYPESIZE];
-    uint8_t   datatype;
-    int       n;
-    uint64_t  sizeb, sizeKb, sizeMb, sizeGb;
+    char type[STYPESIZE];
+    uint8_t datatype;
+    int n;
+    uint64_t sizeb, sizeKb, sizeMb, sizeGb;
 
-    struct    timespec timenow;
-    double    timediff;
+    struct timespec timenow;
+    double timediff;
 
     clock_gettime(CLOCK_REALTIME, &timenow);
 
@@ -165,21 +113,19 @@ errno_t list_image_ID_ncurses()
 
     clear();
 
-
     sizeb = compute_image_memory();
 
-
     printw("INDEX    NAME         SIZE                    TYPE        SIZE  [percent]    LAST ACCESS\n");
     printw("\n");
 
-    for(i = 0; i < data.NB_MAX_IMAGE; i++)
+    for (i = 0; i < data.NB_MAX_IMAGE; i++)
     {
-        if(data.image[i].used == 1)
+        if (data.image[i].used == 1)
         {
             datatype = data.image[i].md[0].datatype;
             tmp_long = ((long long)(data.image[i].md[0].nelement)) * ImageStreamIO_typesize(datatype);
 
-            if(data.image[i].md[0].shared == 1)
+            if (data.image[i].md[0].shared == 1)
             {
                 printw("%4ldS", i);
             }
@@ -188,7 +134,7 @@ errno_t list_image_ID_ncurses()
                 printw("%4ld ", i);
             }
 
-            if(data.image[i].md[0].shared == 1)
+            if (data.image[i].md[0].shared == 1)
             {
                 attron(A_BOLD | COLOR_PAIR(9));
             }
@@ -199,7 +145,7 @@ errno_t list_image_ID_ncurses()
             sprintf(str, "%10s ", data.image[i].name);
             printw(str);
 
-            if(data.image[i].md[0].shared == 1)
+            if (data.image[i].md[0].shared == 1)
             {
                 attroff(A_BOLD | COLOR_PAIR(9));
             }
@@ -208,11 +154,11 @@ errno_t list_image_ID_ncurses()
                 attroff(A_BOLD | COLOR_PAIR(6));
             }
 
-            sprintf(str, "[ %6ld", (long) data.image[i].md[0].size[0]);
+            sprintf(str, "[ %6ld", (long)data.image[i].md[0].size[0]);
 
-            for(j = 1; j < data.image[i].md[0].naxis; j++)
+            for (j = 1; j < data.image[i].md[0].naxis; j++)
             {
-                sprintf(str1, "%s x %6ld", str, (long) data.image[i].md[0].size[j]);
+                sprintf(str1, "%s x %6ld", str, (long)data.image[i].md[0].size[j]);
             }
             sprintf(str2, "%s]", str1);
 
@@ -221,51 +167,51 @@ errno_t list_image_ID_ncurses()
             attron(COLOR_PAIR(3));
             n = 0;
 
-            if(datatype == _DATATYPE_UINT8)
+            if (datatype == _DATATYPE_UINT8)
             {
                 n = snprintf(type, STYPESIZE, "UINT8  ");
             }
-            if(datatype == _DATATYPE_INT8)
+            if (datatype == _DATATYPE_INT8)
             {
                 n = snprintf(type, STYPESIZE, "INT8   ");
             }
-            if(datatype == _DATATYPE_UINT16)
+            if (datatype == _DATATYPE_UINT16)
             {
                 n = snprintf(type, STYPESIZE, "UINT16 ");
             }
-            if(datatype == _DATATYPE_INT16)
+            if (datatype == _DATATYPE_INT16)
             {
                 n = snprintf(type, STYPESIZE, "INT16  ");
             }
-            if(datatype == _DATATYPE_UINT32)
+            if (datatype == _DATATYPE_UINT32)
             {
                 n = snprintf(type, STYPESIZE, "UINT32 ");
             }
-            if(datatype == _DATATYPE_INT32)
+            if (datatype == _DATATYPE_INT32)
             {
                 n = snprintf(type, STYPESIZE, "INT32  ");
             }
-            if(datatype == _DATATYPE_UINT64)
+            if (datatype == _DATATYPE_UINT64)
             {
                 n = snprintf(type, STYPESIZE, "UINT64 ");
             }
-            if(datatype == _DATATYPE_INT64)
+            if (datatype == _DATATYPE_INT64)
             {
                 n = snprintf(type, STYPESIZE, "INT64  ");
             }
-            if(datatype == _DATATYPE_FLOAT)
+            if (datatype == _DATATYPE_FLOAT)
             {
                 n = snprintf(type, STYPESIZE, "FLOAT  ");
             }
-            if(datatype == _DATATYPE_DOUBLE)
+            if (datatype == _DATATYPE_DOUBLE)
             {
                 n = snprintf(type, STYPESIZE, "DOUBLE ");
             }
-            if(datatype == _DATATYPE_COMPLEX_FLOAT)
+            if (datatype == _DATATYPE_COMPLEX_FLOAT)
             {
                 n = snprintf(type, STYPESIZE, "CFLOAT ");
             }
-            if(datatype == _DATATYPE_COMPLEX_DOUBLE)
+            if (datatype == _DATATYPE_COMPLEX_DOUBLE)
             {
                 n = snprintf(type, STYPESIZE, "CDOUBLE");
             }
@@ -274,18 +220,18 @@ errno_t list_image_ID_ncurses()
 
             attroff(COLOR_PAIR(3));
 
-            if(n >= STYPESIZE) {
+            if (n >= STYPESIZE)
+            {
                 PRINT_ERROR("Attempted to write string buffer with too many characters");
-			}
+            }
 
-            printw("%10ld Kb %6.2f   ", (long)(tmp_long / 1024),
-                   (float)(100.0 * tmp_long / sizeb));
+            printw("%10ld Kb %6.2f   ", (long)(tmp_long / 1024), (float)(100.0 * tmp_long / sizeb));
 
             timediff = (1.0 * timenow.tv_sec + 0.000000001 * timenow.tv_nsec) -
-                       (1.0 * data.image[i].md[0].lastaccesstime.tv_sec + 0.000000001 *
-                        data.image[i].md[0].lastaccesstime.tv_nsec);
+                       (1.0 * data.image[i].md[0].lastaccesstime.tv_sec +
+                        0.000000001 * data.image[i].md[0].lastaccesstime.tv_nsec);
 
-            if(timediff < 0.01)
+            if (timediff < 0.01)
             {
                 attron(COLOR_PAIR(4));
                 printw("%15.9f\n", timediff);
@@ -307,17 +253,17 @@ errno_t list_image_ID_ncurses()
     sizeKb = 0;
     sizeb = compute_image_memory();
 
-    if(sizeb > 1024 - 1)
+    if (sizeb > 1024 - 1)
     {
         sizeKb = sizeb / 1024;
         sizeb = sizeb - 1024 * sizeKb;
     }
-    if(sizeKb > 1024 - 1)
+    if (sizeKb > 1024 - 1)
     {
         sizeMb = sizeKb / 1024;
         sizeKb = sizeKb - 1024 * sizeMb;
     }
-    if(sizeMb > 1024 - 1)
+    if (sizeMb > 1024 - 1)
     {
         sizeGb = sizeMb / 1024;
         sizeMb = sizeMb - 1024 * sizeGb;
@@ -326,25 +272,25 @@ errno_t list_image_ID_ncurses()
     //attron(A_BOLD);
 
     sprintf(str, "%ld image(s)      ", compute_nb_image());
-    if(sizeGb > 0)
+    if (sizeGb > 0)
     {
         sprintf(str1, "%s %ld GB", str, (long)(sizeGb));
         strcpy(str, str1);
     }
 
-    if(sizeMb > 0)
+    if (sizeMb > 0)
     {
         sprintf(str1, "%s %ld MB", str, (long)(sizeMb));
         strcpy(str, str1);
     }
 
-    if(sizeKb > 0)
+    if (sizeKb > 0)
     {
         sprintf(str1, "%s %ld KB", str, (long)(sizeKb));
         strcpy(str, str1);
     }
 
-    if(sizeb > 0)
+    if (sizeb > 0)
     {
         sprintf(str1, "%s %ld B", str, (long)(sizeb));
         strcpy(str, str1);
@@ -355,13 +301,9 @@ errno_t list_image_ID_ncurses()
 
     refresh();
 
-
     return RETURN_SUCCESS;
 }
 
-
-
-
 void close_list_image_ID_ncurses(void)
 {
     printf("Closing monitor cleanly\n");
@@ -372,27 +314,19 @@ void close_list_image_ID_ncurses(void)
     data.MEM_MONITOR = 0;
 }
 
-
-
-
-
-
-
-errno_t list_image_ID_ofp(
-    FILE *fo
-)
+errno_t list_image_ID_ofp(FILE *fo)
 {
-    long        i;
-    long        j;
-    long long   tmp_long;
-    char        type[STYPESIZE];
-    uint8_t     datatype;
-    int         n;
+    long i;
+    long j;
+    long long tmp_long;
+    char type[STYPESIZE];
+    uint8_t datatype;
+    int n;
     unsigned long long sizeb, sizeKb, sizeMb, sizeGb;
-    char        str[500];
-    char        str1[512];
-    struct      timespec timenow;
-    double      timediff;
+    char str[500];
+    char str1[512];
+    struct timespec timenow;
+    double timediff;
     //struct mallinfo minfo;
 
     sizeb = compute_image_memory();
@@ -401,36 +335,31 @@ errno_t list_image_ID_ofp(
     clock_gettime(CLOCK_REALTIME, &timenow);
     //fprintf(fo, "time:  %ld.%09ld\n", timenow.tv_sec % 60, timenow.tv_nsec);
 
-
-
     fprintf(fo, "\n");
-    fprintf(fo,
-            "INDEX    NAME         SIZE                    TYPE        SIZE  [percent]    LAST ACCESS\n");
+    fprintf(fo, "INDEX    NAME         SIZE                    TYPE        SIZE  [percent]    LAST ACCESS\n");
     fprintf(fo, "\n");
 
-    for(i = 0; i < data.NB_MAX_IMAGE; i++)
-        if(data.image[i].used == 1)
+    for (i = 0; i < data.NB_MAX_IMAGE; i++)
+        if (data.image[i].used == 1)
         {
             datatype = data.image[i].md[0].datatype;
             tmp_long = ((long long)(data.image[i].md[0].nelement)) * ImageStreamIO_typesize(datatype);
 
-            if(data.image[i].md[0].shared == 1)
+            if (data.image[i].md[0].shared == 1)
             {
-                fprintf(fo, "%4ld %c[%d;%dm%14s%c[%d;m ", i, (char) 27, 1, 34,
-                        data.image[i].name, (char) 27, 0);
+                fprintf(fo, "%4ld %c[%d;%dm%14s%c[%d;m ", i, (char)27, 1, 34, data.image[i].name, (char)27, 0);
             }
             else
             {
-                fprintf(fo, "%4ld %c[%d;%dm%14s%c[%d;m ", i, (char) 27, 1, 33,
-                        data.image[i].name, (char) 27, 0);
+                fprintf(fo, "%4ld %c[%d;%dm%14s%c[%d;m ", i, (char)27, 1, 33, data.image[i].name, (char)27, 0);
             }
             //fprintf(fo, "%s", str);
 
-            sprintf(str, "[ %6ld", (long) data.image[i].md[0].size[0]);
+            sprintf(str, "[ %6ld", (long)data.image[i].md[0].size[0]);
 
-            for(j = 1; j < data.image[i].md[0].naxis; j++)
+            for (j = 1; j < data.image[i].md[0].naxis; j++)
             {
-                sprintf(str1, "%s x %6ld", str, (long) data.image[i].md[0].size[j]);
+                sprintf(str1, "%s x %6ld", str, (long)data.image[i].md[0].size[j]);
                 strcpy(str, str1);
             }
             sprintf(str1, "%s]", str);
@@ -438,112 +367,108 @@ errno_t list_image_ID_ofp(
 
             fprintf(fo, "%-32s", str);
 
-
             n = 0;
-            if(datatype == _DATATYPE_UINT8)
+            if (datatype == _DATATYPE_UINT8)
             {
                 n = snprintf(type, STYPESIZE, "UINT8  ");
             }
-            if(datatype == _DATATYPE_INT8)
+            if (datatype == _DATATYPE_INT8)
             {
                 n = snprintf(type, STYPESIZE, "INT8   ");
             }
-            if(datatype == _DATATYPE_UINT16)
+            if (datatype == _DATATYPE_UINT16)
             {
                 n = snprintf(type, STYPESIZE, "UINT16 ");
             }
-            if(datatype == _DATATYPE_INT16)
+            if (datatype == _DATATYPE_INT16)
             {
                 n = snprintf(type, STYPESIZE, "INT16  ");
             }
-            if(datatype == _DATATYPE_UINT32)
+            if (datatype == _DATATYPE_UINT32)
             {
                 n = snprintf(type, STYPESIZE, "UINT32 ");
             }
-            if(datatype == _DATATYPE_INT32)
+            if (datatype == _DATATYPE_INT32)
             {
                 n = snprintf(type, STYPESIZE, "INT32  ");
             }
-            if(datatype == _DATATYPE_UINT64)
+            if (datatype == _DATATYPE_UINT64)
             {
                 n = snprintf(type, STYPESIZE, "UINT64 ");
             }
-            if(datatype == _DATATYPE_INT64)
+            if (datatype == _DATATYPE_INT64)
             {
                 n = snprintf(type, STYPESIZE, "INT64  ");
             }
-            if(datatype == _DATATYPE_FLOAT)
+            if (datatype == _DATATYPE_FLOAT)
             {
                 n = snprintf(type, STYPESIZE, "FLOAT  ");
             }
-            if(datatype == _DATATYPE_DOUBLE)
+            if (datatype == _DATATYPE_DOUBLE)
             {
                 n = snprintf(type, STYPESIZE, "DOUBLE ");
             }
-            if(datatype == _DATATYPE_COMPLEX_FLOAT)
+            if (datatype == _DATATYPE_COMPLEX_FLOAT)
             {
                 n = snprintf(type, STYPESIZE, "CFLOAT ");
             }
-            if(datatype == _DATATYPE_COMPLEX_DOUBLE)
+            if (datatype == _DATATYPE_COMPLEX_DOUBLE)
             {
                 n = snprintf(type, STYPESIZE, "CDOUBLE");
             }
 
             fprintf(fo, "%7s ", type);
 
-
-            if(n >= STYPESIZE)
+            if (n >= STYPESIZE)
             {
                 PRINT_ERROR("Attempted to write string buffer with too many characters");
             }
 
-            fprintf(fo, "%10ld Kb %6.2f   ", (long)(tmp_long / 1024),
-                    (float)(100.0 * tmp_long / sizeb));
+            fprintf(fo, "%10ld Kb %6.2f   ", (long)(tmp_long / 1024), (float)(100.0 * tmp_long / sizeb));
 
             timediff = (1.0 * timenow.tv_sec + 0.000000001 * timenow.tv_nsec) -
-                       (1.0 * data.image[i].md[0].lastaccesstime.tv_sec + 0.000000001 *
-                        data.image[i].md[0].lastaccesstime.tv_nsec);
+                       (1.0 * data.image[i].md[0].lastaccesstime.tv_sec +
+                        0.000000001 * data.image[i].md[0].lastaccesstime.tv_nsec);
 
             fprintf(fo, "%15.9f\n", timediff);
         }
     fprintf(fo, "\n");
 
-
     sizeGb = 0;
     sizeMb = 0;
     sizeKb = 0;
     sizeb = compute_image_memory();
 
-    if(sizeb > 1024 - 1)
+    if (sizeb > 1024 - 1)
     {
         sizeKb = sizeb / 1024;
         sizeb = sizeb - 1024 * sizeKb;
     }
-    if(sizeKb > 1024 - 1)
+    if (sizeKb > 1024 - 1)
     {
         sizeMb = sizeKb / 1024;
         sizeKb = sizeKb - 1024 * sizeMb;
     }
-    if(sizeMb > 1024 - 1)
+    if (sizeMb > 1024 - 1)
     {
         sizeGb = sizeMb / 1024;
         sizeMb = sizeMb - 1024 * sizeGb;
     }
 
     fprintf(fo, "%ld image(s)   ", compute_nb_image());
-    if(sizeGb > 0)
+    if (sizeGb > 0)
     {
         fprintf(fo, " %ld Gb", (long)(sizeGb));
     }
-    if(sizeMb > 0)
+    if (sizeMb > 0)
     {
         fprintf(fo, " %ld Mb", (long)(sizeMb));
     }
-    if(sizeKb > 0)
+    if (sizeKb > 0)
     {
         fprintf(fo, " %ld Kb", (long)(sizeKb));
     }
-    if(sizeb > 0)
+    if (sizeb > 0)
     {
         fprintf(fo, " %ld", (long)(sizeb));
     }
@@ -551,34 +476,27 @@ errno_t list_image_ID_ofp(
 
     fflush(fo);
 
-
     return RETURN_SUCCESS;
 }
 
-
-
-
-errno_t list_image_ID_ofp_simple(
-    FILE *fo
-)
+errno_t list_image_ID_ofp_simple(FILE *fo)
 {
-    long        i, j;
+    long i, j;
     //long long   tmp_long;
-    uint8_t     datatype;
+    uint8_t datatype;
 
-    for(i = 0; i < data.NB_MAX_IMAGE; i++)
-        if(data.image[i].used == 1)
+    for (i = 0; i < data.NB_MAX_IMAGE; i++)
+        if (data.image[i].used == 1)
         {
             datatype = data.image[i].md[0].datatype;
             //tmp_long = ((long long) (data.image[i].md[0].nelement)) * ImageStreamIO_typesize(datatype);
 
-            fprintf(fo, "%20s %d %ld %d %4ld", data.image[i].name, datatype,
-                    (long) data.image[i].md[0].naxis, data.image[i].md[0].shared,
-                    (long) data.image[i].md[0].size[0]);
+            fprintf(fo, "%20s %d %ld %d %4ld", data.image[i].name, datatype, (long)data.image[i].md[0].naxis,
+                    data.image[i].md[0].shared, (long)data.image[i].md[0].size[0]);
 
-            for(j = 1; j < data.image[i].md[0].naxis; j++)
+            for (j = 1; j < data.image[i].md[0].naxis; j++)
             {
-                fprintf(fo, " %4ld", (long) data.image[i].md[0].size[j]);
+                fprintf(fo, " %4ld", (long)data.image[i].md[0].size[j]);
             }
             fprintf(fo, "\n");
         }
@@ -587,9 +505,6 @@ errno_t list_image_ID_ofp_simple(
     return RETURN_SUCCESS;
 }
 
-
-
-
 errno_t list_image_ID()
 {
     list_image_ID_ofp(stdout);
@@ -597,8 +512,6 @@ errno_t list_image_ID()
     return RETURN_SUCCESS;
 }
 
-
-
 /* list all images in memory
    output is written in ASCII file
    only basic info is listed
@@ -608,9 +521,7 @@ errno_t list_image_ID()
    type
  */
 
-errno_t list_image_ID_file(
-    const char *fname
-)
+errno_t list_image_ID_file(const char *fname)
 {
     FILE *fp;
     long i, j;
@@ -619,76 +530,75 @@ errno_t list_image_ID_file(
     int n;
 
     fp = fopen(fname, "w");
-    if(fp == NULL)
+    if (fp == NULL)
     {
         PRINT_ERROR("Cannot create file %s", fname);
         abort();
     }
 
-    for(i = 0; i < data.NB_MAX_IMAGE; i++)
-        if(data.image[i].used == 1)
+    for (i = 0; i < data.NB_MAX_IMAGE; i++)
+        if (data.image[i].used == 1)
         {
             datatype = data.image[i].md[0].datatype;
             fprintf(fp, "%ld %s", i, data.image[i].name);
-            fprintf(fp, " %ld", (long) data.image[i].md[0].naxis);
-            for(j = 0; j < data.image[i].md[0].naxis; j++)
+            fprintf(fp, " %ld", (long)data.image[i].md[0].naxis);
+            for (j = 0; j < data.image[i].md[0].naxis; j++)
             {
-                fprintf(fp, " %ld", (long) data.image[i].md[0].size[j]);
+                fprintf(fp, " %ld", (long)data.image[i].md[0].size[j]);
             }
 
             n = 0;
 
-            if(datatype == _DATATYPE_UINT8)
+            if (datatype == _DATATYPE_UINT8)
             {
                 n = snprintf(type, STYPESIZE, "UINT8  ");
             }
-            if(datatype == _DATATYPE_INT8)
+            if (datatype == _DATATYPE_INT8)
             {
                 n = snprintf(type, STYPESIZE, "INT8   ");
             }
-            if(datatype == _DATATYPE_UINT16)
+            if (datatype == _DATATYPE_UINT16)
             {
                 n = snprintf(type, STYPESIZE, "UINT16 ");
             }
-            if(datatype == _DATATYPE_INT16)
+            if (datatype == _DATATYPE_INT16)
             {
                 n = snprintf(type, STYPESIZE, "INT16  ");
             }
-            if(datatype == _DATATYPE_UINT32)
+            if (datatype == _DATATYPE_UINT32)
             {
                 n = snprintf(type, STYPESIZE, "UINT32 ");
             }
-            if(datatype == _DATATYPE_INT32)
+            if (datatype == _DATATYPE_INT32)
             {
                 n = snprintf(type, STYPESIZE, "INT32  ");
             }
-            if(datatype == _DATATYPE_UINT64)
+            if (datatype == _DATATYPE_UINT64)
             {
                 n = snprintf(type, STYPESIZE, "UINT64 ");
             }
-            if(datatype == _DATATYPE_INT64)
+            if (datatype == _DATATYPE_INT64)
             {
                 n = snprintf(type, STYPESIZE, "INT64  ");
             }
-            if(datatype == _DATATYPE_FLOAT)
+            if (datatype == _DATATYPE_FLOAT)
             {
                 n = snprintf(type, STYPESIZE, "FLOAT  ");
             }
-            if(datatype == _DATATYPE_DOUBLE)
+            if (datatype == _DATATYPE_DOUBLE)
             {
                 n = snprintf(type, STYPESIZE, "DOUBLE ");
             }
-            if(datatype == _DATATYPE_COMPLEX_FLOAT)
+            if (datatype == _DATATYPE_COMPLEX_FLOAT)
             {
                 n = snprintf(type, STYPESIZE, "CFLOAT ");
             }
-            if(datatype == _DATATYPE_COMPLEX_DOUBLE)
+            if (datatype == _DATATYPE_COMPLEX_DOUBLE)
             {
                 n = snprintf(type, STYPESIZE, "CDOUBLE");
             }
 
-
-            if(n >= STYPESIZE)
+            if (n >= STYPESIZE)
             {
                 PRINT_ERROR("Attempted to write string buffer with too many characters");
             }
@@ -700,15 +610,9 @@ errno_t list_image_ID_file(
     return RETURN_SUCCESS;
 }
 
-
-
-
-
-errno_t memory_monitor(
-    const char *termttyname
-)
+errno_t memory_monitor(const char *termttyname)
 {
-    if(data.Debug > 0)
+    if (data.Debug > 0)
     {
         printf("starting memory_monitor on \"%s\"\n", termttyname);
     }
@@ -720,6 +624,3 @@ errno_t memory_monitor(
 
     return RETURN_SUCCESS;
 }
-
-
-
diff --git a/src/COREMOD_memory/list_image.h b/src/COREMOD_memory/list_image.h
index 50b82f09..4e580578 100644
--- a/src/COREMOD_memory/list_image.h
+++ b/src/COREMOD_memory/list_image.h
@@ -2,37 +2,20 @@
  * @file    list_image.h
  */
 
-
-
 errno_t list_image_addCLIcmd();
 
+errno_t memory_monitor(const char *termttyname);
 
-
-errno_t    memory_monitor(
-    const char *termttyname
-);
-
-
-
-errno_t init_list_image_ID_ncurses(
-    const char *termttyname
-);
+errno_t init_list_image_ID_ncurses(const char *termttyname);
 
 void close_list_image_ID_ncurses();
 
 errno_t list_image_ID_ncurses();
 
-errno_t list_image_ID_ofp(
-    FILE *fo
-);
+errno_t list_image_ID_ofp(FILE *fo);
 
-errno_t list_image_ID_ofp_simple(
-    FILE *fo
-);
+errno_t list_image_ID_ofp_simple(FILE *fo);
 
 errno_t list_image_ID();
 
-errno_t list_image_ID_file(
-    const char *fname
-);
-
+errno_t list_image_ID_file(const char *fname);
diff --git a/src/COREMOD_memory/list_variable.c b/src/COREMOD_memory/list_variable.c
index eed2f842..e0fa28fe 100644
--- a/src/COREMOD_memory/list_variable.c
+++ b/src/COREMOD_memory/list_variable.c
@@ -3,33 +3,23 @@
  * @brief   list variables
  */
 
-
 #include "CommandLineInterface/CLIcore.h"
 
-
-
-
-
 // ==========================================
 // Forward declaration(s)
 // ==========================================
 
 errno_t list_variable_ID();
 
-errno_t list_variable_ID_file(
-    const char *fname
-);
-
-
+errno_t list_variable_ID_file(const char *fname);
 
 // ==========================================
 // Command line interface wrapper function(s)
 // ==========================================
 
-
 static errno_t list_variable_ID_file__cli()
 {
-    if(CLI_checkarg(1, CLIARG_STR_NOT_IMG) == 0)
+    if (CLI_checkarg(1, CLIARG_STR_NOT_IMG) == 0)
     {
         list_variable_ID_file(data.cmdargtoken[1].val.string);
         return CLICMD_SUCCESS;
@@ -40,9 +30,6 @@ static errno_t list_variable_ID_file__cli()
     }
 }
 
-
-
-
 // ==========================================
 // Register CLI command(s)
 // ==========================================
@@ -50,56 +37,36 @@ static errno_t list_variable_ID_file__cli()
 errno_t list_variable_addCLIcmd()
 {
 
-    RegisterCLIcommand(
-        "listvar",
-        __FILE__,
-        list_variable_ID,
-        "list variables in memory",
-        "no argument",
-        "listvar",
-        "int list_variable_ID()");
-
-    RegisterCLIcommand(
-        "listvarf",
-        __FILE__,
-        list_variable_ID_file__cli,
-        "list variables in memory, write to file",
-        "<file name>",
-        "listvarf var.txt",
-        "int list_variable_ID_file()");	
+    RegisterCLIcommand("listvar", __FILE__, list_variable_ID, "list variables in memory", "no argument", "listvar",
+                       "int list_variable_ID()");
 
+    RegisterCLIcommand("listvarf", __FILE__, list_variable_ID_file__cli, "list variables in memory, write to file",
+                       "<file name>", "listvarf var.txt", "int list_variable_ID_file()");
 
     return RETURN_SUCCESS;
 }
 
-
-
-
-
-
 errno_t list_variable_ID()
 {
     variableID i;
 
-    for(i = 0; i < data.NB_MAX_VARIABLE; i++)
-        if(data.variable[i].used == 1)
+    for (i = 0; i < data.NB_MAX_VARIABLE; i++)
+        if (data.variable[i].used == 1)
         {
-            printf("%4ld %16s %25.18g\n", i, data.variable[i].name,
-                   data.variable[i].value.f);
+            printf("%4ld %16s %25.18g\n", i, data.variable[i].name, data.variable[i].value.f);
         }
 
     return RETURN_SUCCESS;
 }
 
-
 errno_t list_variable_ID_file(const char *fname)
 {
     imageID i;
     FILE *fp;
 
     fp = fopen(fname, "w");
-    for(i = 0; i < data.NB_MAX_VARIABLE; i++)
-        if(data.variable[i].used == 1)
+    for (i = 0; i < data.NB_MAX_VARIABLE; i++)
+        if (data.variable[i].used == 1)
         {
             fprintf(fp, "%s=%.18g\n", data.variable[i].name, data.variable[i].value.f);
         }
@@ -108,6 +75,3 @@ errno_t list_variable_ID_file(const char *fname)
 
     return RETURN_SUCCESS;
 }
-
-
-
diff --git a/src/COREMOD_memory/list_variable.h b/src/COREMOD_memory/list_variable.h
index 61abd172..b3630dcf 100644
--- a/src/COREMOD_memory/list_variable.h
+++ b/src/COREMOD_memory/list_variable.h
@@ -2,13 +2,8 @@
  * @file    list_variable.h
  */
 
-
-
 errno_t list_variable_addCLIcmd();
 
-
 errno_t list_variable_ID();
 
-errno_t list_variable_ID_file(
-    const char *fname
-);
+errno_t list_variable_ID_file(const char *fname);
diff --git a/src/COREMOD_memory/logshmim.c b/src/COREMOD_memory/logshmim.c
index f96dcd4d..d682a134 100644
--- a/src/COREMOD_memory/logshmim.c
+++ b/src/COREMOD_memory/logshmim.c
@@ -3,96 +3,61 @@
  * @brief   Save telemetry stream data
  */
 
-
 #define _GNU_SOURCE
 
-#include <sched.h>
-#include <pthread.h>
 #include <fcntl.h>
+#include <pthread.h>
+#include <sched.h>
+#include <string.h>
 #include <sys/mman.h>
-#include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/types.h>
 #include <unistd.h>
-#include <pthread.h>
-#include <string.h>
-
 
 #include "CommandLineInterface/CLIcore.h"
 #include "CommandLineInterface/timeutils.h"
 
-
 #include "COREMOD_iofits/COREMOD_iofits.h"
 
-#include "COREMOD_memory/image_keyword_addS.h"
 #include "COREMOD_memory/image_keyword_addD.h"
+#include "COREMOD_memory/image_keyword_addS.h"
 
-#include "image_ID.h"
-#include "list_image.h"
 #include "create_image.h"
 #include "delete_image.h"
+#include "image_ID.h"
+#include "list_image.h"
 #include "read_shmim.h"
 #include "stream_sem.h"
 
 #include "shmimlog_types.h"
 
-
-
-
-#define likely(x)	__builtin_expect(!!(x), 1)
-#define unlikely(x)	__builtin_expect(!!(x), 0)
-
+#define likely(x) __builtin_expect(!!(x), 1)
+#define unlikely(x) __builtin_expect(!!(x), 0)
 
 static long tret; // thread return value
 
-
-
-
-
-
-
-
-
 // ==========================================
 // Forward declaration(s)
 // ==========================================
 
-errno_t COREMOD_MEMORY_logshim_printstatus(
-    const char *IDname
-);
+errno_t COREMOD_MEMORY_logshim_printstatus(const char *IDname);
 
-errno_t COREMOD_MEMORY_logshim_set_on(
-    const char *IDname,
-    int         setv
-);
-
-errno_t COREMOD_MEMORY_logshim_set_logexit(
-    const char *IDname,
-    int setv
-);
-
-errno_t COREMOD_MEMORY_sharedMem_2Dim_log(
-    const char  *IDname,
-    uint32_t     zsize,
-    const char  *logdir,
-    const char  *IDlogdata_name
-);
+errno_t COREMOD_MEMORY_logshim_set_on(const char *IDname, int setv);
 
+errno_t COREMOD_MEMORY_logshim_set_logexit(const char *IDname, int setv);
 
+errno_t COREMOD_MEMORY_sharedMem_2Dim_log(const char *IDname, uint32_t zsize, const char *logdir,
+                                          const char *IDlogdata_name);
 
 // ==========================================
 // Command line interface wrapper function(s)
 // ==========================================
 
-
 static errno_t COREMOD_MEMORY_logshim_printstatus__cli()
 {
-    if(0
-            + CLI_checkarg(1, CLIARG_STR_NOT_IMG)
-            == 0)
+    if (0 + CLI_checkarg(1, CLIARG_STR_NOT_IMG) == 0)
     {
-        COREMOD_MEMORY_logshim_printstatus(
-            data.cmdargtoken[1].val.string
-        );
+        COREMOD_MEMORY_logshim_printstatus(data.cmdargtoken[1].val.string);
         return CLICMD_SUCCESS;
     }
     else
@@ -101,19 +66,12 @@ static errno_t COREMOD_MEMORY_logshim_printstatus__cli()
     }
 }
 
-
 static errno_t COREMOD_MEMORY_logshim_set_on__cli()
 {
-    if(0
-            + CLI_checkarg(1, CLIARG_STR_NOT_IMG)
-            + CLI_checkarg(2, CLIARG_LONG)
-            == 0)
+    if (0 + CLI_checkarg(1, CLIARG_STR_NOT_IMG) + CLI_checkarg(2, CLIARG_LONG) == 0)
     {
         printf("logshim_set_on ----------------------\n");
-        COREMOD_MEMORY_logshim_set_on(
-            data.cmdargtoken[1].val.string,
-            data.cmdargtoken[2].val.numl
-        );
+        COREMOD_MEMORY_logshim_set_on(data.cmdargtoken[1].val.string, data.cmdargtoken[2].val.numl);
         return CLICMD_SUCCESS;
     }
     else
@@ -122,18 +80,11 @@ static errno_t COREMOD_MEMORY_logshim_set_on__cli()
     }
 }
 
-
 static errno_t COREMOD_MEMORY_logshim_set_logexit__cli()
 {
-    if(0
-            + CLI_checkarg(1, CLIARG_STR_NOT_IMG)
-            + CLI_checkarg(2, CLIARG_LONG)
-            == 0)
+    if (0 + CLI_checkarg(1, CLIARG_STR_NOT_IMG) + CLI_checkarg(2, CLIARG_LONG) == 0)
     {
-        COREMOD_MEMORY_logshim_set_logexit(
-            data.cmdargtoken[1].val.string,
-            data.cmdargtoken[2].val.numl
-        );
+        COREMOD_MEMORY_logshim_set_logexit(data.cmdargtoken[1].val.string, data.cmdargtoken[2].val.numl);
         return CLICMD_SUCCESS;
     }
     else
@@ -142,27 +93,18 @@ static errno_t COREMOD_MEMORY_logshim_set_logexit__cli()
     }
 }
 
-
 static errno_t COREMOD_MEMORY_sharedMem_2Dim_log__cli()
 {
 
-    if(CLI_checkarg_noerrmsg(4, CLIARG_STR_NOT_IMG) != 0)
+    if (CLI_checkarg_noerrmsg(4, CLIARG_STR_NOT_IMG) != 0)
     {
         sprintf(data.cmdargtoken[4].val.string, "null");
     }
 
-    if(0
-            + CLI_checkarg(1, 3)
-            + CLI_checkarg(2, CLIARG_LONG)
-            + CLI_checkarg(3, 3)
-            == 0)
+    if (0 + CLI_checkarg(1, 3) + CLI_checkarg(2, CLIARG_LONG) + CLI_checkarg(3, 3) == 0)
     {
-        COREMOD_MEMORY_sharedMem_2Dim_log(
-            data.cmdargtoken[1].val.string,
-            data.cmdargtoken[2].val.numl,
-            data.cmdargtoken[3].val.string,
-            data.cmdargtoken[4].val.string
-        );
+        COREMOD_MEMORY_sharedMem_2Dim_log(data.cmdargtoken[1].val.string, data.cmdargtoken[2].val.numl,
+                                          data.cmdargtoken[3].val.string, data.cmdargtoken[4].val.string);
         return CLICMD_SUCCESS;
     }
     else
@@ -171,11 +113,6 @@ static errno_t COREMOD_MEMORY_sharedMem_2Dim_log__cli()
     }
 }
 
-
-
-
-
-
 // ==========================================
 // Register CLI command(s)
 // ==========================================
@@ -183,60 +120,27 @@ static errno_t COREMOD_MEMORY_sharedMem_2Dim_log__cli()
 errno_t logshmim_addCLIcmd()
 {
 
-    RegisterCLIcommand(
-        "shmimstreamlog",
-        __FILE__,
-        COREMOD_MEMORY_sharedMem_2Dim_log__cli,
-        "logs shared memory stream (run in current directory)",
-        "<shm image> <cubesize [long]> <logdir>",
-        "shmimstreamlog wfscamim 10000 /media/data \"\"",
-        "long COREMOD_MEMORY_sharedMem_2Dim_log(const char *IDname, uint32_t zsize, const char *logdir, const char *IDlogdata_name");
-
-    RegisterCLIcommand(
-        "shmimslogstat",
-        __FILE__,
-        COREMOD_MEMORY_logshim_printstatus__cli,
-        "print log shared memory stream status",
-        "<shm image>", "shmimslogstat wfscamim",
-        "int COREMOD_MEMORY_logshim_printstatus(const char *IDname)");
-
-    RegisterCLIcommand(
-        "shmimslogonset", __FILE__,
-        COREMOD_MEMORY_logshim_set_on__cli,
-        "set on variable in log shared memory stream",
-        "<shm image> <setv [long]>",
-        "shmimslogonset imwfs 1",
-        "int COREMOD_MEMORY_logshim_set_on(const char *IDname, int setv)");
-
-    RegisterCLIcommand(
-        "shmimslogexitset",
-        __FILE__,
-        COREMOD_MEMORY_logshim_set_logexit__cli,
-        "set exit variable in log shared memory stream",
-        "<shm image> <setv [long]>",
-        "shmimslogexitset imwfs 1",
-        "int COREMOD_MEMORY_logshim_set_logexit(const char *IDname, int setv)");
-
-
-    return RETURN_SUCCESS;
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
+    RegisterCLIcommand("shmimstreamlog", __FILE__, COREMOD_MEMORY_sharedMem_2Dim_log__cli,
+                       "logs shared memory stream (run in current directory)", "<shm image> <cubesize [long]> <logdir>",
+                       "shmimstreamlog wfscamim 10000 /media/data \"\"",
+                       "long COREMOD_MEMORY_sharedMem_2Dim_log(const char *IDname, uint32_t zsize, const char *logdir, "
+                       "const char *IDlogdata_name");
 
+    RegisterCLIcommand("shmimslogstat", __FILE__, COREMOD_MEMORY_logshim_printstatus__cli,
+                       "print log shared memory stream status", "<shm image>", "shmimslogstat wfscamim",
+                       "int COREMOD_MEMORY_logshim_printstatus(const char *IDname)");
 
+    RegisterCLIcommand("shmimslogonset", __FILE__, COREMOD_MEMORY_logshim_set_on__cli,
+                       "set on variable in log shared memory stream", "<shm image> <setv [long]>",
+                       "shmimslogonset imwfs 1", "int COREMOD_MEMORY_logshim_set_on(const char *IDname, int setv)");
 
+    RegisterCLIcommand("shmimslogexitset", __FILE__, COREMOD_MEMORY_logshim_set_logexit__cli,
+                       "set exit variable in log shared memory stream", "<shm image> <setv [long]>",
+                       "shmimslogexitset imwfs 1",
+                       "int COREMOD_MEMORY_logshim_set_logexit(const char *IDname, int setv)");
 
+    return RETURN_SUCCESS;
+}
 
 /**
  * ## Purpose
@@ -244,28 +148,23 @@ errno_t logshmim_addCLIcmd()
  * Save telemetry stream data
  *
  */
-void *save_fits_function(
-    void *ptr
-)
+void *save_fits_function(void *ptr)
 {
-    imageID  ID;
-
+    imageID ID;
 
     //struct savethreadmsg *tmsg; // = malloc(sizeof(struct savethreadmsg));
     STREAMSAVE_THREAD_MESSAGE *tmsg;
 
-    uint32_t     *imsizearray;
-    uint32_t      xsize, ysize;
-    uint8_t       datatype;
-
-
-    imageID       IDc;
-    long          framesize;  // in bytes
-    char         *ptr0;       // source pointer
-    char         *ptr1;       // destination pointer
-    long          k;
-    FILE         *fp;
+    uint32_t *imsizearray;
+    uint32_t xsize, ysize;
+    uint8_t datatype;
 
+    imageID IDc;
+    long framesize; // in bytes
+    char *ptr0;     // source pointer
+    char *ptr1;     // destination pointer
+    long k;
+    FILE *fp;
 
     // Set save function to RT priority 0
     // This is meant to be lower priority than the data collection into buffers
@@ -274,72 +173,58 @@ void *save_fits_function(
     struct sched_param schedpar;
 
     schedpar.sched_priority = RT_priority;
-    if(seteuid(data.euid) != 0)     //This goes up to maximum privileges
+    if (seteuid(data.euid) != 0) //This goes up to maximum privileges
     {
         PRINT_ERROR("seteuid error");
     }
     sched_setscheduler(0, SCHED_FIFO,
                        &schedpar); //other option is SCHED_RR, might be faster
-    if(seteuid(data.ruid) != 0)     //Go back to normal privileges
+    if (seteuid(data.ruid) != 0)   //Go back to normal privileges
     {
         PRINT_ERROR("seteuid error");
     }
 
-
     printf("===================== START SAVE THREAD =====================\n");
     fflush(stdout);
 
-
-
-    imsizearray = (uint32_t *) malloc(sizeof(uint32_t) * 3);
-    if(imsizearray == NULL)
+    imsizearray = (uint32_t *)malloc(sizeof(uint32_t) * 3);
+    if (imsizearray == NULL)
     {
         PRINT_ERROR("malloc error");
         abort();
     }
 
     //    tmsg = (struct savethreadmsg*) ptr;
-    tmsg = (STREAMSAVE_THREAD_MESSAGE *) ptr;
-
+    tmsg = (STREAMSAVE_THREAD_MESSAGE *)ptr;
 
     // Add custom keywords
     int NBcustomKW = 9;
-    IMAGE_KEYWORD *imkwarray = (IMAGE_KEYWORD *) malloc(sizeof(
-                                   IMAGE_KEYWORD) * NBcustomKW);
-
-
-
-
+    IMAGE_KEYWORD *imkwarray = (IMAGE_KEYWORD *)malloc(sizeof(IMAGE_KEYWORD) * NBcustomKW);
 
     // UT time
 
     strcpy(imkwarray[0].name, "UT");
     imkwarray[0].type = 'S';
     strcpy(imkwarray[0].value.valstr,
-           timedouble_to_UTC_timeofdaystring(0.5 * tmsg->arraytime[0] + 0.5 *
-                   tmsg->arraytime[tmsg->cubesize - 1]));
+           timedouble_to_UTC_timeofdaystring(0.5 * tmsg->arraytime[0] + 0.5 * tmsg->arraytime[tmsg->cubesize - 1]));
     strcpy(imkwarray[0].comment, "HH:MM:SS.SS typical UTC at exposure");
 
     strcpy(imkwarray[1].name, "UT-STR");
     imkwarray[1].type = 'S';
-    strcpy(imkwarray[1].value.valstr,
-           timedouble_to_UTC_timeofdaystring(tmsg->arraytime[0]));
+    strcpy(imkwarray[1].value.valstr, timedouble_to_UTC_timeofdaystring(tmsg->arraytime[0]));
     strcpy(imkwarray[1].comment, "HH:MM:SS.SS UTC at exposure start");
 
     strcpy(imkwarray[2].name, "UT-END");
     imkwarray[2].type = 'S';
-    strcpy(imkwarray[2].value.valstr,
-           timedouble_to_UTC_timeofdaystring(tmsg->arraytime[tmsg->cubesize - 1]));
+    strcpy(imkwarray[2].value.valstr, timedouble_to_UTC_timeofdaystring(tmsg->arraytime[tmsg->cubesize - 1]));
     strcpy(imkwarray[2].comment, "HH:MM:SS.SS UTC at exposure start");
 
-
-
     // Modified Julian Date (MJD)
 
     strcpy(imkwarray[3].name, "MJD");
     imkwarray[3].type = 'D';
-    imkwarray[3].value.numf = (0.5 * tmsg->arraytime[0] + 0.5 *
-                               tmsg->arraytime[tmsg->cubesize - 1]) / 86400.0 + 40587.0;
+    imkwarray[3].value.numf =
+        (0.5 * tmsg->arraytime[0] + 0.5 * tmsg->arraytime[tmsg->cubesize - 1]) / 86400.0 + 40587.0;
     strcpy(imkwarray[3].comment, "Modified Julian Day at exposure");
 
     strcpy(imkwarray[4].name, "MJD-STR");
@@ -349,11 +234,9 @@ void *save_fits_function(
 
     strcpy(imkwarray[5].name, "MJD-END");
     imkwarray[5].type = 'D';
-    imkwarray[5].value.numf = (tmsg->arraytime[tmsg->cubesize - 1] / 86400.0) +
-                              40587.0;
+    imkwarray[5].value.numf = (tmsg->arraytime[tmsg->cubesize - 1] / 86400.0) + 40587.0;
     strcpy(imkwarray[5].comment, "Modified Julian Day at exposure start");
 
-
     // Local time
 
     // get time zone
@@ -366,44 +249,26 @@ void *save_fits_function(
     sprintf(imkwarray[6].name, "%s", lt.tm_zone);
     imkwarray[6].type = 'S';
     strcpy(imkwarray[6].value.valstr,
-           timedouble_to_UTC_timeofdaystring(
-               (0.5 * tmsg->arraytime[0] + 0.5 * tmsg->arraytime[tmsg->cubesize - 1]) +
-               lt.tm_gmtoff
-           ));
+           timedouble_to_UTC_timeofdaystring((0.5 * tmsg->arraytime[0] + 0.5 * tmsg->arraytime[tmsg->cubesize - 1]) +
+                                             lt.tm_gmtoff));
     sprintf(imkwarray[6].comment, "HH:MM:SS.SS typical %s at exposure", lt.tm_zone);
 
     sprintf(imkwarray[7].name, "%s-STR", lt.tm_zone);
     imkwarray[7].type = 'S';
-    strcpy(imkwarray[7].value.valstr,
-           timedouble_to_UTC_timeofdaystring(
-               tmsg->arraytime[0] + lt.tm_gmtoff
-           ));
+    strcpy(imkwarray[7].value.valstr, timedouble_to_UTC_timeofdaystring(tmsg->arraytime[0] + lt.tm_gmtoff));
     sprintf(imkwarray[7].comment, "HH:MM:SS.SS typical %s at exposure", lt.tm_zone);
 
     sprintf(imkwarray[8].name, "%s-END", lt.tm_zone);
     imkwarray[8].type = 'S';
     strcpy(imkwarray[8].value.valstr,
-           timedouble_to_UTC_timeofdaystring(
-               tmsg->arraytime[tmsg->cubesize - 1] + lt.tm_gmtoff
-           ));
+           timedouble_to_UTC_timeofdaystring(tmsg->arraytime[tmsg->cubesize - 1] + lt.tm_gmtoff));
     sprintf(imkwarray[8].comment, "HH:MM:SS.SS typical %s at exposure", lt.tm_zone);
 
-
-
-
-
-    if(tmsg->partial == 0) // full image
+    if (tmsg->partial == 0) // full image
     {
         printf("auxFITSheader = \"%s\"\n", tmsg->fname_auxFITSheader);
 
-        saveFITS(
-            tmsg->iname,
-            tmsg->fname,
-            0,
-            tmsg->fname_auxFITSheader,
-            imkwarray,
-            NBcustomKW
-        );
+        saveFITS(tmsg->iname, tmsg->fname, 0, tmsg->fname_auxFITSheader, imkwarray, NBcustomKW);
     }
     else
     {
@@ -412,105 +277,98 @@ void *save_fits_function(
         xsize = data.image[ID].md[0].size[0];
         ysize = data.image[ID].md[0].size[1];
 
-
         imsizearray[0] = xsize;
         imsizearray[1] = ysize;
         imsizearray[2] = tmsg->cubesize;
 
-
         create_image_ID("tmpsavecube", 3, imsizearray, datatype, 0, 10, 0, &IDc);
 
-
-        switch(datatype)
+        switch (datatype)
         {
 
-            case _DATATYPE_UINT8:
-                framesize = SIZEOF_DATATYPE_UINT8 * xsize * ysize;
-                ptr0 = (char *) data.image[ID].array.UI8; // source
-                ptr1 = (char *) data.image[IDc].array.UI8; // destination
-                break;
-            case _DATATYPE_INT8:
-                framesize = SIZEOF_DATATYPE_INT8 * xsize * ysize;
-                ptr0 = (char *) data.image[ID].array.SI8; // source
-                ptr1 = (char *) data.image[IDc].array.SI8; // destination
-                break;
+        case _DATATYPE_UINT8:
+            framesize = SIZEOF_DATATYPE_UINT8 * xsize * ysize;
+            ptr0 = (char *)data.image[ID].array.UI8;  // source
+            ptr1 = (char *)data.image[IDc].array.UI8; // destination
+            break;
+        case _DATATYPE_INT8:
+            framesize = SIZEOF_DATATYPE_INT8 * xsize * ysize;
+            ptr0 = (char *)data.image[ID].array.SI8;  // source
+            ptr1 = (char *)data.image[IDc].array.SI8; // destination
+            break;
 
-            case _DATATYPE_UINT16:
-                framesize = SIZEOF_DATATYPE_UINT16 * xsize * ysize;
-                ptr0 = (char *) data.image[ID].array.UI16; // source
-                ptr1 = (char *) data.image[IDc].array.UI16; // destination
-                break;
-            case _DATATYPE_INT16:
-                framesize = SIZEOF_DATATYPE_INT16 * xsize * ysize;
-                ptr0 = (char *) data.image[ID].array.SI16; // source
-                ptr1 = (char *) data.image[IDc].array.SI16; // destination
-                break;
+        case _DATATYPE_UINT16:
+            framesize = SIZEOF_DATATYPE_UINT16 * xsize * ysize;
+            ptr0 = (char *)data.image[ID].array.UI16;  // source
+            ptr1 = (char *)data.image[IDc].array.UI16; // destination
+            break;
+        case _DATATYPE_INT16:
+            framesize = SIZEOF_DATATYPE_INT16 * xsize * ysize;
+            ptr0 = (char *)data.image[ID].array.SI16;  // source
+            ptr1 = (char *)data.image[IDc].array.SI16; // destination
+            break;
 
-            case _DATATYPE_UINT32:
-                framesize = SIZEOF_DATATYPE_UINT32 * xsize * ysize;
-                ptr0 = (char *) data.image[ID].array.UI32; // source
-                ptr1 = (char *) data.image[IDc].array.UI32; // destination
-                break;
-            case _DATATYPE_INT32:
-                framesize = SIZEOF_DATATYPE_INT32 * xsize * ysize;
-                ptr0 = (char *) data.image[ID].array.SI32; // source
-                ptr1 = (char *) data.image[IDc].array.SI32; // destination
-                break;
+        case _DATATYPE_UINT32:
+            framesize = SIZEOF_DATATYPE_UINT32 * xsize * ysize;
+            ptr0 = (char *)data.image[ID].array.UI32;  // source
+            ptr1 = (char *)data.image[IDc].array.UI32; // destination
+            break;
+        case _DATATYPE_INT32:
+            framesize = SIZEOF_DATATYPE_INT32 * xsize * ysize;
+            ptr0 = (char *)data.image[ID].array.SI32;  // source
+            ptr1 = (char *)data.image[IDc].array.SI32; // destination
+            break;
 
-            case _DATATYPE_UINT64:
-                framesize = SIZEOF_DATATYPE_UINT64 * xsize * ysize;
-                ptr0 = (char *) data.image[ID].array.UI64; // source
-                ptr1 = (char *) data.image[IDc].array.UI64; // destination
-                break;
-            case _DATATYPE_INT64:
-                framesize = SIZEOF_DATATYPE_INT64 * xsize * ysize;
-                ptr0 = (char *) data.image[ID].array.SI64; // source
-                ptr1 = (char *) data.image[IDc].array.SI64; // destination
-                break;
+        case _DATATYPE_UINT64:
+            framesize = SIZEOF_DATATYPE_UINT64 * xsize * ysize;
+            ptr0 = (char *)data.image[ID].array.UI64;  // source
+            ptr1 = (char *)data.image[IDc].array.UI64; // destination
+            break;
+        case _DATATYPE_INT64:
+            framesize = SIZEOF_DATATYPE_INT64 * xsize * ysize;
+            ptr0 = (char *)data.image[ID].array.SI64;  // source
+            ptr1 = (char *)data.image[IDc].array.SI64; // destination
+            break;
 
-            case _DATATYPE_FLOAT:
-                framesize = SIZEOF_DATATYPE_FLOAT * xsize * ysize;
-                ptr0 = (char *) data.image[ID].array.F; // source
-                ptr1 = (char *) data.image[IDc].array.F; // destination
-                break;
-            case _DATATYPE_DOUBLE:
-                framesize = SIZEOF_DATATYPE_DOUBLE * xsize * ysize;
-                ptr0 = (char *) data.image[ID].array.D; // source
-                ptr1 = (char *) data.image[IDc].array.D; // destination
-                break;
+        case _DATATYPE_FLOAT:
+            framesize = SIZEOF_DATATYPE_FLOAT * xsize * ysize;
+            ptr0 = (char *)data.image[ID].array.F;  // source
+            ptr1 = (char *)data.image[IDc].array.F; // destination
+            break;
+        case _DATATYPE_DOUBLE:
+            framesize = SIZEOF_DATATYPE_DOUBLE * xsize * ysize;
+            ptr0 = (char *)data.image[ID].array.D;  // source
+            ptr1 = (char *)data.image[IDc].array.D; // destination
+            break;
 
-            default:
-                printf("ERROR: WRONG DATA TYPE\n");
-                free(imsizearray);
-                free(tmsg);
-                exit(0);
-                break;
+        default:
+            printf("ERROR: WRONG DATA TYPE\n");
+            free(imsizearray);
+            free(tmsg);
+            exit(0);
+            break;
         }
 
-
-        memcpy((void *) ptr1, (void *) ptr0, framesize * tmsg->cubesize);
+        memcpy((void *)ptr1, (void *)ptr0, framesize * tmsg->cubesize);
 
         printf("auxFITSheader = \"%s\"\n", tmsg->fname_auxFITSheader);
-        saveFITS("tmpsavecube", tmsg->fname, 0, tmsg->fname_auxFITSheader, imkwarray,
-                 NBcustomKW);
-
+        saveFITS("tmpsavecube", tmsg->fname, 0, tmsg->fname_auxFITSheader, imkwarray, NBcustomKW);
 
         delete_image_ID("tmpsavecube", DELETE_IMAGE_ERRMODE_WARNING);
     }
 
     free(imkwarray);
 
-    if(tmsg->saveascii == 1)
+    if (tmsg->saveascii == 1)
     {
-        if((fp = fopen(tmsg->fnameascii, "w")) == NULL)
+        if ((fp = fopen(tmsg->fnameascii, "w")) == NULL)
         {
             printf("ERROR: cannot create file \"%s\"\n", tmsg->fnameascii);
             exit(0);
         }
 
         fprintf(fp, "# Telemetry stream timing data \n");
-        fprintf(fp, "# File written by function %s in file %s\n", __FUNCTION__,
-                __FILE__);
+        fprintf(fp, "# File written by function %s in file %s\n", __FUNCTION__, __FILE__);
         fprintf(fp, "# \n");
         fprintf(fp, "# col1 : datacube frame index\n");
         fprintf(fp, "# col2 : Main index\n");
@@ -522,7 +380,7 @@ void *save_fits_function(
 
         double t0; // time reference
         t0 = tmsg->arraytime[0];
-        for(k = 0; k < tmsg->cubesize; k++)
+        for (k = 0; k < tmsg->cubesize; k++)
         {
             //fprintf(fp, "%6ld   %10lu  %10lu   %15.9lf\n", k, tmsg->arraycnt0[k], tmsg->arraycnt1[k], tmsg->arraytime[k]);
 
@@ -534,14 +392,12 @@ void *save_fits_function(
             // - cnt0
             // - cnt1
 
-            fprintf(fp, "%10ld  %10lu  %15.9lf   %20.9lf  %10ld   %10ld\n", k,
-                    tmsg->arrayindex[k], tmsg->arraytime[k] - t0, tmsg->arraytime[k],
-                    tmsg->arraycnt0[k], tmsg->arraycnt1[k]);
+            fprintf(fp, "%10ld  %10lu  %15.9lf   %20.9lf  %10ld   %10ld\n", k, tmsg->arrayindex[k],
+                    tmsg->arraytime[k] - t0, tmsg->arraytime[k], tmsg->arraycnt0[k], tmsg->arraycnt1[k]);
         }
         fclose(fp);
     }
 
-
     ID = image_ID(tmsg->iname);
     tret = ID;
     free(imsizearray);
@@ -549,31 +405,26 @@ void *save_fits_function(
     printf("===================== END SAVE THREAD =====================\n");
     fflush(stdout);
 
-
     pthread_exit(&tret);
 }
 
-
-
 /** @brief creates logshimconf shared memory and loads it
  *
  */
-LOGSHIM_CONF *COREMOD_MEMORY_logshim_create_SHMconf(
-    const char *logshimname
-)
+LOGSHIM_CONF *COREMOD_MEMORY_logshim_create_SHMconf(const char *logshimname)
 {
-    int             SM_fd;
-    size_t          sharedsize = 0; // shared memory size in bytes
-    char            SM_fname[STRINGMAXLEN_FULLFILENAME];
-    int             result;
-    LOGSHIM_CONF   *map;
+    int SM_fd;
+    size_t sharedsize = 0; // shared memory size in bytes
+    char SM_fname[STRINGMAXLEN_FULLFILENAME];
+    int result;
+    LOGSHIM_CONF *map;
 
     sharedsize = sizeof(LOGSHIM_CONF);
 
     WRITE_FULLFILENAME(SM_fname, "%s/%s.logshimconf.shm", data.shmdir, logshimname);
 
     SM_fd = open(SM_fname, O_RDWR | O_CREAT | O_TRUNC, (mode_t)0600);
-    if(SM_fd == -1)
+    if (SM_fd == -1)
     {
         printf("File \"%s\"\n", SM_fname);
         fflush(stdout);
@@ -582,7 +433,7 @@ LOGSHIM_CONF *COREMOD_MEMORY_logshim_create_SHMconf(
     }
 
     result = lseek(SM_fd, sharedsize - 1, SEEK_SET);
-    if(result == -1)
+    if (result == -1)
     {
         close(SM_fd);
         PRINT_ERROR("Error calling lseek() to 'stretch' the file");
@@ -590,16 +441,15 @@ LOGSHIM_CONF *COREMOD_MEMORY_logshim_create_SHMconf(
     }
 
     result = write(SM_fd, "", 1);
-    if(result != 1)
+    if (result != 1)
     {
         close(SM_fd);
         perror("Error writing last byte of the file");
         exit(0);
     }
 
-    map = (LOGSHIM_CONF *) mmap(0, sharedsize, PROT_READ | PROT_WRITE, MAP_SHARED,
-                                SM_fd, 0);
-    if(map == MAP_FAILED)
+    map = (LOGSHIM_CONF *)mmap(0, sharedsize, PROT_READ | PROT_WRITE, MAP_SHARED, SM_fd, 0);
+    if (map == MAP_FAILED)
     {
         close(SM_fd);
         perror("Error mmapping the file");
@@ -616,27 +466,20 @@ LOGSHIM_CONF *COREMOD_MEMORY_logshim_create_SHMconf(
     return map;
 }
 
-
-
-
-
-
 // IDname is name of image logged
-errno_t COREMOD_MEMORY_logshim_printstatus(
-    const char *IDname
-)
+errno_t COREMOD_MEMORY_logshim_printstatus(const char *IDname)
 {
     LOGSHIM_CONF *map;
-    char          SM_fname[STRINGMAXLEN_FULLFILENAME];
-    int           SM_fd;
-    struct        stat file_stat;
+    char SM_fname[STRINGMAXLEN_FULLFILENAME];
+    int SM_fd;
+    struct stat file_stat;
 
     // read shared mem
     WRITE_FULLFILENAME(SM_fname, "%s/%s.logshimconf.shm", data.shmdir, IDname);
     printf("Importing mmap file \"%s\"\n", SM_fname);
 
     SM_fd = open(SM_fname, O_RDWR);
-    if(SM_fd == -1)
+    if (SM_fd == -1)
     {
         printf("Cannot import file - continuing\n");
         exit(0);
@@ -646,9 +489,8 @@ errno_t COREMOD_MEMORY_logshim_printstatus(
         fstat(SM_fd, &file_stat);
         printf("File %s size: %zd\n", SM_fname, file_stat.st_size);
 
-        map = (LOGSHIM_CONF *) mmap(0, file_stat.st_size, PROT_READ | PROT_WRITE,
-                                    MAP_SHARED, SM_fd, 0);
-        if(map == MAP_FAILED)
+        map = (LOGSHIM_CONF *)mmap(0, file_stat.st_size, PROT_READ | PROT_WRITE, MAP_SHARED, SM_fd, 0);
+        if (map == MAP_FAILED)
         {
             close(SM_fd);
             perror("Error mmapping the file");
@@ -661,7 +503,7 @@ errno_t COREMOD_MEMORY_logshim_printstatus(
         printf("interval = %ld\n", map[0].interval);
         printf("logexit  = %d\n", map[0].logexit);
 
-        if(munmap(map, sizeof(LOGSHIM_CONF)) == -1)
+        if (munmap(map, sizeof(LOGSHIM_CONF)) == -1)
         {
             printf("unmapping %s\n", SM_fname);
             perror("Error un-mmapping the file");
@@ -671,29 +513,21 @@ errno_t COREMOD_MEMORY_logshim_printstatus(
     return RETURN_SUCCESS;
 }
 
-
-
-
-
-
 // set the on field in logshim
 // IDname is name of image logged
-errno_t COREMOD_MEMORY_logshim_set_on(
-    const char *IDname,
-    int         setv
-)
+errno_t COREMOD_MEMORY_logshim_set_on(const char *IDname, int setv)
 {
-    LOGSHIM_CONF  *map;
-    char           SM_fname[STRINGMAXLEN_FULLFILENAME];
-    int            SM_fd;
-    struct stat    file_stat;
+    LOGSHIM_CONF *map;
+    char SM_fname[STRINGMAXLEN_FULLFILENAME];
+    int SM_fd;
+    struct stat file_stat;
 
     // read shared mem
     WRITE_FULLFILENAME(SM_fname, "%s/%s.logshimconf.shm", data.shmdir, IDname);
     printf("Importing mmap file \"%s\"\n", SM_fname);
 
     SM_fd = open(SM_fname, O_RDWR);
-    if(SM_fd == -1)
+    if (SM_fd == -1)
     {
         printf("Cannot import file - continuing\n");
         exit(0);
@@ -703,9 +537,8 @@ errno_t COREMOD_MEMORY_logshim_set_on(
         fstat(SM_fd, &file_stat);
         printf("File %s size: %zd\n", SM_fname, file_stat.st_size);
 
-        map = (LOGSHIM_CONF *) mmap(0, file_stat.st_size, PROT_READ | PROT_WRITE,
-                                    MAP_SHARED, SM_fd, 0);
-        if(map == MAP_FAILED)
+        map = (LOGSHIM_CONF *)mmap(0, file_stat.st_size, PROT_READ | PROT_WRITE, MAP_SHARED, SM_fd, 0);
+        if (map == MAP_FAILED)
         {
             close(SM_fd);
             perror("Error mmapping the file");
@@ -714,7 +547,7 @@ errno_t COREMOD_MEMORY_logshim_set_on(
 
         map[0].on = setv;
 
-        if(munmap(map, sizeof(LOGSHIM_CONF)) == -1)
+        if (munmap(map, sizeof(LOGSHIM_CONF)) == -1)
         {
             printf("unmapping %s\n", SM_fname);
             perror("Error un-mmapping the file");
@@ -724,28 +557,21 @@ errno_t COREMOD_MEMORY_logshim_set_on(
     return RETURN_SUCCESS;
 }
 
-
-
-
-
 // set the on field in logshim
 // IDname is name of image logged
-errno_t COREMOD_MEMORY_logshim_set_logexit(
-    const char *IDname,
-    int         setv
-)
+errno_t COREMOD_MEMORY_logshim_set_logexit(const char *IDname, int setv)
 {
-    LOGSHIM_CONF  *map;
-    char           SM_fname[STRINGMAXLEN_FULLFILENAME];
-    int            SM_fd;
-    struct stat    file_stat;
+    LOGSHIM_CONF *map;
+    char SM_fname[STRINGMAXLEN_FULLFILENAME];
+    int SM_fd;
+    struct stat file_stat;
 
     // read shared mem
     WRITE_FULLFILENAME(SM_fname, "%s/%s.logshimconf.shm", data.shmdir, IDname);
     printf("Importing mmap file \"%s\"\n", SM_fname);
 
     SM_fd = open(SM_fname, O_RDWR);
-    if(SM_fd == -1)
+    if (SM_fd == -1)
     {
         printf("Cannot import file - continuing\n");
         exit(0);
@@ -755,9 +581,8 @@ errno_t COREMOD_MEMORY_logshim_set_logexit(
         fstat(SM_fd, &file_stat);
         printf("File %s size: %zd\n", SM_fname, file_stat.st_size);
 
-        map = (LOGSHIM_CONF *) mmap(0, file_stat.st_size, PROT_READ | PROT_WRITE,
-                                    MAP_SHARED, SM_fd, 0);
-        if(map == MAP_FAILED)
+        map = (LOGSHIM_CONF *)mmap(0, file_stat.st_size, PROT_READ | PROT_WRITE, MAP_SHARED, SM_fd, 0);
+        if (map == MAP_FAILED)
         {
             close(SM_fd);
             perror("Error mmapping the file");
@@ -766,7 +591,7 @@ errno_t COREMOD_MEMORY_logshim_set_logexit(
 
         map[0].logexit = setv;
 
-        if(munmap(map, sizeof(LOGSHIM_CONF)) == -1)
+        if (munmap(map, sizeof(LOGSHIM_CONF)) == -1)
         {
             printf("unmapping %s\n", SM_fname);
             perror("Error un-mmapping the file");
@@ -776,11 +601,6 @@ errno_t COREMOD_MEMORY_logshim_set_logexit(
     return RETURN_SUCCESS;
 }
 
-
-
-
-
-
 /** @brief Logs a shared memory stream onto disk
  *
  * uses semlog semaphore
@@ -789,62 +609,56 @@ errno_t COREMOD_MEMORY_logshim_set_logexit(
  * if an image name logdata exists (should ideally be in shared mem),
  * then this will be included in the timing txt file
  */
-errno_t __attribute__((hot)) COREMOD_MEMORY_sharedMem_2Dim_log(
-    const char *IDname,
-    uint32_t    zsize,
-    const char *logdir,
-    const char *IDlogdata_name
-)
+errno_t __attribute__((hot))
+COREMOD_MEMORY_sharedMem_2Dim_log(const char *IDname, uint32_t zsize, const char *logdir, const char *IDlogdata_name)
 {
     // WAIT time. If no new frame during this time, save existing cube
-    int        WaitSec = 5;
-
-    imageID    ID;
-    uint32_t   xsize;
-    uint32_t   ysize;
-    imageID    IDb;
-    imageID    IDb0;
-    imageID    IDb1;
-    long       index = 0;
-    unsigned long long       cnt = 0;
-    int        buffer;
-    uint8_t    datatype;
-    uint32_t  *imsizearray;
-    char       fname[STRINGMAXLEN_FILENAME];
-    char       iname[STRINGMAXLEN_IMGNAME];
-
-    time_t          t;
-    struct tm      *uttimeStart;
+    int WaitSec = 5;
+
+    imageID ID;
+    uint32_t xsize;
+    uint32_t ysize;
+    imageID IDb;
+    imageID IDb0;
+    imageID IDb1;
+    long index = 0;
+    unsigned long long cnt = 0;
+    int buffer;
+    uint8_t datatype;
+    uint32_t *imsizearray;
+    char fname[STRINGMAXLEN_FILENAME];
+    char iname[STRINGMAXLEN_IMGNAME];
+
+    time_t t;
+    struct tm *uttimeStart;
     struct timespec ts;
     struct timespec timenow;
     struct timespec timenowStart;
-    int             ret;
-    imageID         IDlogdata;
+    int ret;
+    imageID IDlogdata;
 
     char *ptr0_0; // source image data
     char *ptr1_0; // destination image data
-    char *ptr0; // source image data, after offset
-    char *ptr1; // destination image data, after offset
+    char *ptr0;   // source image data, after offset
+    char *ptr1;   // destination image data, after offset
 
     long framesize; // in bytes
 
     char fnameascii[200];
 
-    pthread_t  thread_savefits;
-    int        tOK = 0;
-    int        iret_savefits;
+    pthread_t thread_savefits;
+    int tOK = 0;
+    int iret_savefits;
     STREAMSAVE_THREAD_MESSAGE *tmsg = malloc(sizeof(STREAMSAVE_THREAD_MESSAGE));
 
-
     long NBfiles = -1; // run forever
 
     long long cntwait;
-    long waitdelayus = 50;  // max speed = 20 kHz
+    long waitdelayus = 50;        // max speed = 20 kHz
     long long cntwaitlim = 10000; // 5 sec
     int wOK;
     int noframe;
 
-
     char logb0name[500];
     char logb1name[500];
 
@@ -868,7 +682,6 @@ errno_t __attribute__((hot)) COREMOD_MEMORY_sharedMem_2Dim_log(
     int use_semlog;
     int semval;
 
-
     int VERBOSE = 0;
     // 0: don't print
     // 1: print statements outside fast loop
@@ -877,48 +690,38 @@ errno_t __attribute__((hot)) COREMOD_MEMORY_sharedMem_2Dim_log(
     // convert wait time into number of couunter steps (counter mode only)
     cntwaitlim = (long)(WaitSec * 1000000 / waitdelayus);
 
-
-
     schedpar.sched_priority = RT_priority;
 
-    if(seteuid(data.euid) != 0)     //This goes up to maximum privileges
+    if (seteuid(data.euid) != 0) //This goes up to maximum privileges
     {
         PRINT_ERROR("seteuid error");
     }
     sched_setscheduler(0, SCHED_FIFO,
                        &schedpar); //other option is SCHED_RR, might be faster
-    if(seteuid(data.ruid) != 0)     //Go back to normal privileges
+    if (seteuid(data.ruid) != 0)   //Go back to normal privileges
     {
         PRINT_ERROR("seteuid error");
     }
 
-
-
     IDlogdata = image_ID(IDlogdata_name);
-    if(IDlogdata != -1)
+    if (IDlogdata != -1)
     {
-        if(data.image[IDlogdata].md[0].datatype != _DATATYPE_FLOAT)
+        if (data.image[IDlogdata].md[0].datatype != _DATATYPE_FLOAT)
         {
             IDlogdata = -1;
         }
     }
     printf("log data name = %s\n", IDlogdata_name);
 
-
     logshimconf = COREMOD_MEMORY_logshim_create_SHMconf(IDname);
 
-
     logshimconf[0].on = 1;
     logshimconf[0].cnt = 0;
     logshimconf[0].filecnt = 0;
     logshimconf[0].logexit = 0;
     logshimconf[0].interval = 1;
 
-
-
-    imsizearray = (uint32_t *) malloc(sizeof(uint32_t) * 3);
-
-
+    imsizearray = (uint32_t *)malloc(sizeof(uint32_t) * 3);
 
     read_sharedmem_image(IDname);
     ID = image_ID(IDname);
@@ -926,7 +729,7 @@ errno_t __attribute__((hot)) COREMOD_MEMORY_sharedMem_2Dim_log(
     xsize = data.image[ID].md[0].size[0];
     ysize = data.image[ID].md[0].size[1];
 
-    if(data.image[ID].md[0].naxis == 3)
+    if (data.image[ID].md[0].naxis == 3)
     {
         is3Dcube = 1;
     }
@@ -940,146 +743,131 @@ errno_t __attribute__((hot)) COREMOD_MEMORY_sharedMem_2Dim_log(
     sprintf(logb0name, "%s_logbuff0", IDname);
     sprintf(logb1name, "%s_logbuff1", IDname);
 
-
-    create_image_ID(logb0name, 3, imsizearray, datatype, 1,
-                    data.image[ID].md[0].NBkw, 0, &IDb0);
-    create_image_ID(logb1name, 3, imsizearray, datatype, 1,
-                    data.image[ID].md[0].NBkw, 0, &IDb1);
+    create_image_ID(logb0name, 3, imsizearray, datatype, 1, data.image[ID].md[0].NBkw, 0, &IDb0);
+    create_image_ID(logb1name, 3, imsizearray, datatype, 1, data.image[ID].md[0].NBkw, 0, &IDb1);
 
     // copy keywords
     {
-        memcpy(data.image[IDb0].kw, data.image[ID].kw,
-               sizeof(IMAGE_KEYWORD)*data.image[ID].md[0].NBkw);
-        memcpy(data.image[IDb1].kw, data.image[ID].kw,
-               sizeof(IMAGE_KEYWORD)*data.image[ID].md[0].NBkw);
+        memcpy(data.image[IDb0].kw, data.image[ID].kw, sizeof(IMAGE_KEYWORD) * data.image[ID].md[0].NBkw);
+        memcpy(data.image[IDb1].kw, data.image[ID].kw, sizeof(IMAGE_KEYWORD) * data.image[ID].md[0].NBkw);
     }
 
-
     COREMOD_MEMORY_image_set_semflush(logb0name, -1);
     COREMOD_MEMORY_image_set_semflush(logb1name, -1);
 
+    array_time = (double *)malloc(sizeof(double) * zsize);
+    array_cnt0 = (uint64_t *)malloc(sizeof(uint64_t) * zsize);
+    array_cnt1 = (uint64_t *)malloc(sizeof(uint64_t) * zsize);
 
-    array_time = (double *) malloc(sizeof(double) * zsize);
-    array_cnt0 = (uint64_t *) malloc(sizeof(uint64_t) * zsize);
-    array_cnt1 = (uint64_t *) malloc(sizeof(uint64_t) * zsize);
-
-    array_time_cp = (double *) malloc(sizeof(double) * zsize);
-    array_cnt0_cp = (uint64_t *) malloc(sizeof(uint64_t) * zsize);
-    array_cnt1_cp = (uint64_t *) malloc(sizeof(uint64_t) * zsize);
-
+    array_time_cp = (double *)malloc(sizeof(double) * zsize);
+    array_cnt0_cp = (uint64_t *)malloc(sizeof(uint64_t) * zsize);
+    array_cnt1_cp = (uint64_t *)malloc(sizeof(uint64_t) * zsize);
 
     IDb = IDb0;
 
-    switch(datatype)
+    switch (datatype)
     {
 
-        case _DATATYPE_FLOAT:
-            framesize = SIZEOF_DATATYPE_FLOAT * xsize * ysize;
-            ptr0_0 = (char *) data.image[ID].array.F;
-            break;
-
-        case _DATATYPE_INT8:
-            framesize = SIZEOF_DATATYPE_INT8 * xsize * ysize;
-            ptr0_0 = (char *) data.image[ID].array.SI8;
-            break;
-
-        case _DATATYPE_UINT8:
-            framesize = SIZEOF_DATATYPE_UINT8 * xsize * ysize;
-            ptr0_0 = (char *) data.image[ID].array.UI8;
-            break;
-
-        case _DATATYPE_INT16:
-            framesize = SIZEOF_DATATYPE_INT16 * xsize * ysize;
-            ptr0_0 = (char *) data.image[ID].array.SI16;
-            break;
-
-        case _DATATYPE_UINT16:
-            framesize = SIZEOF_DATATYPE_UINT16 * xsize * ysize;
-            ptr0_0 = (char *) data.image[ID].array.UI16;
-            break;
-
-        case _DATATYPE_INT32:
-            framesize = SIZEOF_DATATYPE_INT32 * xsize * ysize;
-            ptr0_0 = (char *) data.image[ID].array.SI32;
-            break;
-
-        case _DATATYPE_UINT32:
-            framesize = SIZEOF_DATATYPE_UINT32 * xsize * ysize;
-            ptr0_0 = (char *) data.image[ID].array.UI32;
-            break;
-
-        case _DATATYPE_INT64:
-            framesize = SIZEOF_DATATYPE_INT64 * xsize * ysize;
-            ptr0_0 = (char *) data.image[ID].array.SI64;
-            break;
-
-        case _DATATYPE_UINT64:
-            framesize = SIZEOF_DATATYPE_UINT64 * xsize * ysize;
-            ptr0_0 = (char *) data.image[ID].array.UI64;
-            break;
-
-
-        case _DATATYPE_DOUBLE:
-            framesize = SIZEOF_DATATYPE_DOUBLE * xsize * ysize;
-            ptr0_0 = (char *) data.image[ID].array.D;
-            break;
-
-        default:
-            printf("ERROR: WRONG DATA TYPE\n");
-            exit(0);
-            break;
+    case _DATATYPE_FLOAT:
+        framesize = SIZEOF_DATATYPE_FLOAT * xsize * ysize;
+        ptr0_0 = (char *)data.image[ID].array.F;
+        break;
+
+    case _DATATYPE_INT8:
+        framesize = SIZEOF_DATATYPE_INT8 * xsize * ysize;
+        ptr0_0 = (char *)data.image[ID].array.SI8;
+        break;
+
+    case _DATATYPE_UINT8:
+        framesize = SIZEOF_DATATYPE_UINT8 * xsize * ysize;
+        ptr0_0 = (char *)data.image[ID].array.UI8;
+        break;
+
+    case _DATATYPE_INT16:
+        framesize = SIZEOF_DATATYPE_INT16 * xsize * ysize;
+        ptr0_0 = (char *)data.image[ID].array.SI16;
+        break;
+
+    case _DATATYPE_UINT16:
+        framesize = SIZEOF_DATATYPE_UINT16 * xsize * ysize;
+        ptr0_0 = (char *)data.image[ID].array.UI16;
+        break;
+
+    case _DATATYPE_INT32:
+        framesize = SIZEOF_DATATYPE_INT32 * xsize * ysize;
+        ptr0_0 = (char *)data.image[ID].array.SI32;
+        break;
+
+    case _DATATYPE_UINT32:
+        framesize = SIZEOF_DATATYPE_UINT32 * xsize * ysize;
+        ptr0_0 = (char *)data.image[ID].array.UI32;
+        break;
+
+    case _DATATYPE_INT64:
+        framesize = SIZEOF_DATATYPE_INT64 * xsize * ysize;
+        ptr0_0 = (char *)data.image[ID].array.SI64;
+        break;
+
+    case _DATATYPE_UINT64:
+        framesize = SIZEOF_DATATYPE_UINT64 * xsize * ysize;
+        ptr0_0 = (char *)data.image[ID].array.UI64;
+        break;
+
+    case _DATATYPE_DOUBLE:
+        framesize = SIZEOF_DATATYPE_DOUBLE * xsize * ysize;
+        ptr0_0 = (char *)data.image[ID].array.D;
+        break;
+
+    default:
+        printf("ERROR: WRONG DATA TYPE\n");
+        exit(0);
+        break;
     }
 
-
-
-    switch(datatype)
+    switch (datatype)
     {
 
-        case _DATATYPE_FLOAT:
-            ptr1_0 = (char *) data.image[IDb].array.F;
-            break;
-
-        case _DATATYPE_INT8:
-            ptr1_0 = (char *) data.image[IDb].array.SI8;
-            break;
+    case _DATATYPE_FLOAT:
+        ptr1_0 = (char *)data.image[IDb].array.F;
+        break;
 
-        case _DATATYPE_UINT8:
-            ptr1_0 = (char *) data.image[IDb].array.UI8;
-            break;
+    case _DATATYPE_INT8:
+        ptr1_0 = (char *)data.image[IDb].array.SI8;
+        break;
 
-        case _DATATYPE_INT16:
-            ptr1_0 = (char *) data.image[IDb].array.SI16;
-            break;
+    case _DATATYPE_UINT8:
+        ptr1_0 = (char *)data.image[IDb].array.UI8;
+        break;
 
-        case _DATATYPE_UINT16:
-            ptr1_0 = (char *) data.image[IDb].array.UI16;
-            break;
+    case _DATATYPE_INT16:
+        ptr1_0 = (char *)data.image[IDb].array.SI16;
+        break;
 
-        case _DATATYPE_INT32:
-            ptr1_0 = (char *) data.image[IDb].array.SI32;
-            break;
+    case _DATATYPE_UINT16:
+        ptr1_0 = (char *)data.image[IDb].array.UI16;
+        break;
 
-        case _DATATYPE_UINT32:
-            ptr1_0 = (char *) data.image[IDb].array.UI32;
-            break;
+    case _DATATYPE_INT32:
+        ptr1_0 = (char *)data.image[IDb].array.SI32;
+        break;
 
-        case _DATATYPE_INT64:
-            ptr1_0 = (char *) data.image[IDb].array.SI64;
-            break;
+    case _DATATYPE_UINT32:
+        ptr1_0 = (char *)data.image[IDb].array.UI32;
+        break;
 
-        case _DATATYPE_UINT64:
-            ptr1_0 = (char *) data.image[IDb].array.UI64;
-            break;
+    case _DATATYPE_INT64:
+        ptr1_0 = (char *)data.image[IDb].array.SI64;
+        break;
 
-        case _DATATYPE_DOUBLE:
-            ptr1_0 = (char *) data.image[IDb].array.D;
-            break;
+    case _DATATYPE_UINT64:
+        ptr1_0 = (char *)data.image[IDb].array.UI64;
+        break;
 
+    case _DATATYPE_DOUBLE:
+        ptr1_0 = (char *)data.image[IDb].array.D;
+        break;
     }
 
-
-
-
     cnt = data.image[ID].md[0].cnt0 - 1;
 
     buffer = 0;
@@ -1088,30 +876,26 @@ errno_t __attribute__((hot)) COREMOD_MEMORY_sharedMem_2Dim_log(
     printf("logdata ID = %ld\n", IDlogdata);
     list_image_ID();
 
-
-
     // using semlog ?
     use_semlog = 0;
-    if(data.image[ID].semlog != NULL)
+    if (data.image[ID].semlog != NULL)
     {
         use_semlog = 1;
         sem_getvalue(data.image[ID].semlog, &semval);
 
         // bring semaphore value to 1 to only save 1 frame
-        while(semval > 1)
+        while (semval > 1)
         {
             sem_wait(data.image[ID].semlog);
             sem_getvalue(data.image[ID].semlog, &semval);
         }
-        if(semval == 0)
+        if (semval == 0)
         {
             sem_post(data.image[ID].semlog);
         }
     }
 
-
-
-    while((logshimconf[0].filecnt != NBfiles) && (logshimconf[0].logexit == 0))
+    while ((logshimconf[0].filecnt != NBfiles) && (logshimconf[0].logexit == 0))
     {
         int timeout; // 1 if timeout has occurred
 
@@ -1119,20 +903,20 @@ errno_t __attribute__((hot)) COREMOD_MEMORY_sharedMem_2Dim_log(
         noframe = 0;
         wOK = 1;
 
-        if(VERBOSE > 1)
+        if (VERBOSE > 1)
         {
             printf("%5d  Entering wait loop   index = %ld %d\n", __LINE__, index, noframe);
         }
 
         timeout = 0;
-        if(likely(use_semlog == 1))
+        if (likely(use_semlog == 1))
         {
-            if(VERBOSE > 1)
+            if (VERBOSE > 1)
             {
                 printf("%5d  Waiting for semaphore\n", __LINE__);
             }
 
-            if(clock_gettime(CLOCK_REALTIME, &ts) == -1)
+            if (clock_gettime(CLOCK_REALTIME, &ts) == -1)
             {
                 perror("clock_gettime");
                 exit(EXIT_FAILURE);
@@ -1140,16 +924,14 @@ errno_t __attribute__((hot)) COREMOD_MEMORY_sharedMem_2Dim_log(
             ts.tv_sec += WaitSec;
 
             ret = sem_timedwait(data.image[ID].semlog, &ts);
-            if(ret == -1)
+            if (ret == -1)
             {
-                if(errno == ETIMEDOUT)
+                if (errno == ETIMEDOUT)
                 {
-                    printf("%5d  sem_timedwait() timed out (%d sec) -[index %ld]\n", __LINE__,
-                           WaitSec, index);
-                    if(VERBOSE > 0)
+                    printf("%5d  sem_timedwait() timed out (%d sec) -[index %ld]\n", __LINE__, WaitSec, index);
+                    if (VERBOSE > 0)
                     {
-                        printf("%5d  sem time elapsed -> Save current cube [index %ld]\n", __LINE__,
-                               index);
+                        printf("%5d  sem time elapsed -> Save current cube [index %ld]\n", __LINE__, index);
                     }
 
                     strcpy(tmsg->iname, iname);
@@ -1157,9 +939,9 @@ errno_t __attribute__((hot)) COREMOD_MEMORY_sharedMem_2Dim_log(
                     tmsg->partial = 1; // partial cube
                     tmsg->cubesize = index;
 
-                    memcpy(array_time_cp, array_time, sizeof(double)*index);
-                    memcpy(array_cnt0_cp, array_cnt0, sizeof(uint64_t)*index);
-                    memcpy(array_cnt1_cp, array_cnt1, sizeof(uint64_t)*index);
+                    memcpy(array_time_cp, array_time, sizeof(double) * index);
+                    memcpy(array_cnt0_cp, array_cnt0, sizeof(uint64_t) * index);
+                    memcpy(array_cnt1_cp, array_cnt1, sizeof(uint64_t) * index);
 
                     tmsg->arrayindex = array_cnt0_cp;
                     tmsg->arraycnt0 = array_cnt0_cp;
@@ -1168,28 +950,28 @@ errno_t __attribute__((hot)) COREMOD_MEMORY_sharedMem_2Dim_log(
 
                     timeout = 1;
                 }
-                if(errno == EINTR)
+                if (errno == EINTR)
                 {
-                    printf("%5d  sem_timedwait [index %ld]: The call was interrupted by a signal handler\n",
-                           __LINE__, index);
+                    printf("%5d  sem_timedwait [index %ld]: The call was interrupted by a signal handler\n", __LINE__,
+                           index);
                 }
 
-                if(errno == EINVAL)
+                if (errno == EINVAL)
                 {
-                    printf("%5d  sem_timedwait [index %ld]: Not a valid semaphore\n", __LINE__,
-                           index);
-                    printf("               The value of abs_timeout.tv_nsecs is less than 0, or greater than or equal to 1000 million\n");
+                    printf("%5d  sem_timedwait [index %ld]: Not a valid semaphore\n", __LINE__, index);
+                    printf("               The value of abs_timeout.tv_nsecs is less than 0, or greater than or equal "
+                           "to 1000 million\n");
                 }
 
-                if(errno == EAGAIN)
+                if (errno == EAGAIN)
                 {
-                    printf("%5d  sem_timedwait [index %ld]: The operation could not be performed without blocking (i.e., the semaphore currently has the value zero)\n",
+                    printf("%5d  sem_timedwait [index %ld]: The operation could not be performed without blocking "
+                           "(i.e., the semaphore currently has the value zero)\n",
                            __LINE__, index);
                 }
 
-
                 wOK = 0;
-                if(index == 0)
+                if (index == 0)
                 {
                     noframe = 1;
                 }
@@ -1198,19 +980,17 @@ errno_t __attribute__((hot)) COREMOD_MEMORY_sharedMem_2Dim_log(
                     noframe = 0;
                 }
             }
-
         }
         else
         {
-            if(VERBOSE > 1)
+            if (VERBOSE > 1)
             {
                 printf("%5d  Not using semaphore, watching counter\n", __LINE__);
             }
 
-            while(((cnt == data.image[ID].md[0].cnt0) || (logshimconf[0].on == 0))
-                    && (wOK == 1))
+            while (((cnt == data.image[ID].md[0].cnt0) || (logshimconf[0].on == 0)) && (wOK == 1))
             {
-                if(VERBOSE > 1)
+                if (VERBOSE > 1)
                 {
                     printf("%5d  waiting time step\n", __LINE__);
                 }
@@ -1218,28 +998,27 @@ errno_t __attribute__((hot)) COREMOD_MEMORY_sharedMem_2Dim_log(
                 usleep(waitdelayus);
                 cntwait++;
 
-                if(VERBOSE > 1)
+                if (VERBOSE > 1)
                 {
                     printf("%5d  cntwait = %lld\n", __LINE__, cntwait);
                     fflush(stdout);
                 }
 
-                if(cntwait > cntwaitlim) // save current cube
+                if (cntwait > cntwaitlim) // save current cube
                 {
-                    if(VERBOSE > 0)
+                    if (VERBOSE > 0)
                     {
                         printf("%5d  cnt time elapsed -> Save current cube\n", __LINE__);
                     }
 
-
                     strcpy(tmsg->iname, iname);
                     strcpy(tmsg->fname, fname);
                     tmsg->partial = 1; // partial cube
                     tmsg->cubesize = index;
 
-                    memcpy(array_time_cp, array_time, sizeof(double)*index);
-                    memcpy(array_cnt0_cp, array_cnt0, sizeof(uint64_t)*index);
-                    memcpy(array_cnt1_cp, array_cnt1, sizeof(uint64_t)*index);
+                    memcpy(array_time_cp, array_time, sizeof(double) * index);
+                    memcpy(array_cnt0_cp, array_cnt0, sizeof(uint64_t) * index);
+                    memcpy(array_cnt1_cp, array_cnt1, sizeof(uint64_t) * index);
 
                     tmsg->arrayindex = array_cnt0_cp;
                     tmsg->arraycnt0 = array_cnt0_cp;
@@ -1247,7 +1026,7 @@ errno_t __attribute__((hot)) COREMOD_MEMORY_sharedMem_2Dim_log(
                     tmsg->arraytime = array_time_cp;
 
                     wOK = 0;
-                    if(index == 0)
+                    if (index == 0)
                     {
                         noframe = 1;
                     }
@@ -1259,11 +1038,9 @@ errno_t __attribute__((hot)) COREMOD_MEMORY_sharedMem_2Dim_log(
             }
         }
 
-
-
-        if(index == 0)
+        if (index == 0)
         {
-            if(VERBOSE > 0)
+            if (VERBOSE > 0)
             {
                 printf("%5d  Setting cube start time [index %ld]\n", __LINE__, index);
             }
@@ -1277,18 +1054,16 @@ errno_t __attribute__((hot)) COREMOD_MEMORY_sharedMem_2Dim_log(
             //            sprintf(fnameascii,"%s/%s_%02d:%02d:%02ld.%09ld.txt", logdir, IDname, uttime->tm_hour, uttime->tm_min, timenow.tv_sec % 60, timenow.tv_nsec);
         }
 
-
-        if(VERBOSE > 1)
+        if (VERBOSE > 1)
         {
             printf("%5d  logshimconf[0].on = %d\n", __LINE__, logshimconf[0].on);
         }
 
-
-        if(likely(logshimconf[0].on == 1))
+        if (likely(logshimconf[0].on == 1))
         {
-            if(likely(wOK == 1)) // normal step: a frame has arrived
+            if (likely(wOK == 1)) // normal step: a frame has arrived
             {
-                if(VERBOSE > 1)
+                if (VERBOSE > 1)
                 {
                     printf("%5d  Frame has arrived [index %ld]\n", __LINE__, index);
                 }
@@ -1299,8 +1074,7 @@ errno_t __attribute__((hot)) COREMOD_MEMORY_sharedMem_2Dim_log(
 
                 clock_gettime(CLOCK_REALTIME, &timenow);
 
-
-                if(is3Dcube == 1)
+                if (is3Dcube == 1)
                 {
                     ptr0 = ptr0_0 + framesize * data.image[ID].md[0].cnt1;
                 }
@@ -1311,14 +1085,14 @@ errno_t __attribute__((hot)) COREMOD_MEMORY_sharedMem_2Dim_log(
 
                 ptr1 = ptr1_0 + framesize * index;
 
-                if(VERBOSE > 1)
+                if (VERBOSE > 1)
                 {
                     printf("%5d  memcpy framesize = %ld\n", __LINE__, framesize);
                 }
 
-                memcpy((void *) ptr1, (void *) ptr0, framesize);
+                memcpy((void *)ptr1, (void *)ptr0, framesize);
 
-                if(VERBOSE > 1)
+                if (VERBOSE > 1)
                 {
                     printf("%5d  memcpy done\n", __LINE__);
                 }
@@ -1336,33 +1110,30 @@ errno_t __attribute__((hot)) COREMOD_MEMORY_sharedMem_2Dim_log(
             // save partial if possible
             //if(index>0)
             wOK = 0;
-
         }
 
-
-        if(VERBOSE > 1)
+        if (VERBOSE > 1)
         {
             printf("%5d  index = %ld  wOK = %d\n", __LINE__, index, wOK);
         }
 
-
         // SAVE CUBE TO DISK
         /// cases:
         /// index>zsize-1  buffer full
         /// timeout==1 && index>0  : partial
-        if((index > zsize - 1)  || ((timeout == 1) && (index > 0)))
+        if ((index > zsize - 1) || ((timeout == 1) && (index > 0)))
         {
             long NBframemissing;
 
             /// save image
-            if(VERBOSE > 0)
+            if (VERBOSE > 0)
             {
-                printf("%5d  Save image   [index  %ld]  [timeout %d] [zsize %ld]\n", __LINE__,
-                       index, timeout, (long) zsize);
+                printf("%5d  Save image   [index  %ld]  [timeout %d] [zsize %ld]\n", __LINE__, index, timeout,
+                       (long)zsize);
             }
 
             sprintf(iname, "%s_logbuff%d", IDname, buffer);
-            if(buffer == 0)
+            if (buffer == 0)
             {
                 IDb = IDb0;
             }
@@ -1372,52 +1143,43 @@ errno_t __attribute__((hot)) COREMOD_MEMORY_sharedMem_2Dim_log(
             }
 
             // update buffer content
-            memcpy(data.image[IDb].kw, data.image[ID].kw,
-                   sizeof(IMAGE_KEYWORD)*data.image[ID].md[0].NBkw);
-
+            memcpy(data.image[IDb].kw, data.image[ID].kw, sizeof(IMAGE_KEYWORD) * data.image[ID].md[0].NBkw);
 
-            if(VERBOSE > 0)
+            if (VERBOSE > 0)
             {
                 printf("%5d  Building file name: ascii\n", __LINE__);
                 fflush(stdout);
             }
 
-            sprintf(fnameascii, "%s/%s_%02d:%02d:%02ld.%09ld.txt", logdir, IDname,
-                    uttimeStart->tm_hour, uttimeStart->tm_min, timenowStart.tv_sec % 60,
-                    timenowStart.tv_nsec);
+            sprintf(fnameascii, "%s/%s_%02d:%02d:%02ld.%09ld.txt", logdir, IDname, uttimeStart->tm_hour,
+                    uttimeStart->tm_min, timenowStart.tv_sec % 60, timenowStart.tv_nsec);
 
-
-            if(VERBOSE > 0)
+            if (VERBOSE > 0)
             {
                 printf("%5d  Building file name: fits\n", __LINE__);
                 fflush(stdout);
             }
-            sprintf(fname, "%s/%s_%02d:%02d:%02ld.%09ld.fits", logdir, IDname,
-                    uttimeStart->tm_hour, uttimeStart->tm_min, timenowStart.tv_sec % 60,
-                    timenowStart.tv_nsec);
-
-
+            sprintf(fname, "%s/%s_%02d:%02d:%02ld.%09ld.fits", logdir, IDname, uttimeStart->tm_hour,
+                    uttimeStart->tm_min, timenowStart.tv_sec % 60, timenowStart.tv_nsec);
 
             strcpy(tmsg->iname, iname);
             strcpy(tmsg->fname, fname);
             strcpy(tmsg->fnameascii, fnameascii);
             tmsg->saveascii = 1;
 
-
-            if(wOK == 1) // full cube
+            if (wOK == 1) // full cube
             {
                 tmsg->partial = 0; // full cube
-                if(VERBOSE > 0)
+                if (VERBOSE > 0)
                 {
                     printf("%5d  SAVING FULL CUBE\n", __LINE__);
                     fflush(stdout);
                 }
-
             }
             else // partial cube
             {
                 tmsg->partial = 1; // partial cube
-                if(VERBOSE > 0)
+                if (VERBOSE > 0)
                 {
                     printf("%5d  SAVING PARTIAL CUBE\n", __LINE__);
                     fflush(stdout);
@@ -1428,99 +1190,82 @@ errno_t __attribute__((hot)) COREMOD_MEMORY_sharedMem_2Dim_log(
                 long cnt0start = data.image[ID].md[0].cnt0;
 
                 // Wait for save thread to complete to launch next one
-                if(tOK == 1)
+                if (tOK == 1)
                 {
-                    if(pthread_tryjoin_np(thread_savefits, NULL) == EBUSY)
+                    if (pthread_tryjoin_np(thread_savefits, NULL) == EBUSY)
                     {
-                        if(VERBOSE > 0)
+                        if (VERBOSE > 0)
                         {
                             printf("%5d  PREVIOUS SAVE THREAD NOT TERMINATED -> waiting\n", __LINE__);
                         }
                         pthread_join(thread_savefits, NULL);
-                        if(VERBOSE > 0)
+                        if (VERBOSE > 0)
                         {
                             printf("%5d  PREVIOUS SAVE THREAD NOW COMPLETED -> continuing\n", __LINE__);
                         }
                     }
                     else
                     {
-                        if(VERBOSE > 0)
+                        if (VERBOSE > 0)
                         {
                             printf("%5d  PREVIOUS SAVE THREAD ALREADY COMPLETED -> OK\n", __LINE__);
                         }
                     }
                 }
 
-                printf("\n ************** MISSED = %ld\n",
-                       data.image[ID].md[0].cnt0 - cnt0start);
+                printf("\n ************** MISSED = %ld\n", data.image[ID].md[0].cnt0 - cnt0start);
             }
 
-
             COREMOD_MEMORY_image_set_sempost_byID(IDb, -1);
             data.image[IDb].md[0].cnt0++;
             data.image[IDb].md[0].write = 0;
 
-
-
             tmsg->cubesize = index;
             strcpy(tmsg->iname, iname);
 
+            memcpy(array_time_cp, array_time, sizeof(double) * index);
 
-            memcpy(array_time_cp, array_time, sizeof(double)*index);
-
-
-            memcpy(array_cnt0_cp, array_cnt0, sizeof(uint64_t)*index);
+            memcpy(array_cnt0_cp, array_cnt0, sizeof(uint64_t) * index);
 
-
-            memcpy(array_cnt1_cp, array_cnt1, sizeof(uint64_t)*index);
+            memcpy(array_cnt1_cp, array_cnt1, sizeof(uint64_t) * index);
 
             NBframemissing = (array_cnt0[index - 1] - array_cnt0[0]) - (index - 1);
 
-
             printf("=>=>=>=>= CUBE %8lld   Number of missed frames = %8ld  / %ld  / %8ld ====\n",
-                   logshimconf[0].filecnt, NBframemissing, index, (long) zsize);
+                   logshimconf[0].filecnt, NBframemissing, index, (long)zsize);
 
-            if(VERBOSE > 0)
+            if (VERBOSE > 0)
             {
                 printf("%5d  Starting image save thread\n", __LINE__);
                 fflush(stdout);
             }
 
-
-
             tmsg->arrayindex = array_cnt0_cp;
             tmsg->arraycnt0 = array_cnt0_cp;
             tmsg->arraycnt1 = array_cnt1_cp;
             tmsg->arraytime = array_time_cp;
-            WRITE_FILENAME(tmsg->fname_auxFITSheader,
-                           "%s/%s.auxFITSheader.shm",
-                           data.shmdir,
-                           IDname);
-
+            WRITE_FILENAME(tmsg->fname_auxFITSheader, "%s/%s.auxFITSheader.shm", data.shmdir, IDname);
 
-            iret_savefits = pthread_create(&thread_savefits, NULL, save_fits_function,
-                                           tmsg);
+            iret_savefits = pthread_create(&thread_savefits, NULL, save_fits_function, tmsg);
 
-
-            logshimconf[0].cnt ++;
+            logshimconf[0].cnt++;
 
             tOK = 1;
-            if(iret_savefits)
+            if (iret_savefits)
             {
                 fprintf(stderr, "Error - pthread_create() return code: %d\n", iret_savefits);
                 exit(EXIT_FAILURE);
             }
 
-
             index = 0;
             buffer++;
-            if(buffer == 2)
+            if (buffer == 2)
             {
                 buffer = 0;
             }
             //            printf("[%ld -> %d]", cnt, buffer);
             //           fflush(stdout);
-            if(buffer == 0)
+            if (buffer == 0)
             {
                 IDb = IDb0;
             }
@@ -1529,56 +1274,54 @@ errno_t __attribute__((hot)) COREMOD_MEMORY_sharedMem_2Dim_log(
                 IDb = IDb1;
             }
 
-            switch(datatype)
+            switch (datatype)
             {
 
-                case _DATATYPE_FLOAT:
-                    ptr1_0 = (char *) data.image[IDb].array.F;
-                    break;
-
-                case _DATATYPE_INT8:
-                    ptr1_0 = (char *) data.image[IDb].array.SI8;
-                    break;
+            case _DATATYPE_FLOAT:
+                ptr1_0 = (char *)data.image[IDb].array.F;
+                break;
 
-                case _DATATYPE_UINT8:
-                    ptr1_0 = (char *) data.image[IDb].array.UI8;
-                    break;
+            case _DATATYPE_INT8:
+                ptr1_0 = (char *)data.image[IDb].array.SI8;
+                break;
 
-                case _DATATYPE_INT16:
-                    ptr1_0 = (char *) data.image[IDb].array.SI16;
-                    break;
+            case _DATATYPE_UINT8:
+                ptr1_0 = (char *)data.image[IDb].array.UI8;
+                break;
 
-                case _DATATYPE_UINT16:
-                    ptr1_0 = (char *) data.image[IDb].array.UI16;
-                    break;
+            case _DATATYPE_INT16:
+                ptr1_0 = (char *)data.image[IDb].array.SI16;
+                break;
 
-                case _DATATYPE_INT32:
-                    ptr1_0 = (char *) data.image[IDb].array.SI32;
-                    break;
+            case _DATATYPE_UINT16:
+                ptr1_0 = (char *)data.image[IDb].array.UI16;
+                break;
 
-                case _DATATYPE_UINT32:
-                    ptr1_0 = (char *) data.image[IDb].array.UI32;
-                    break;
+            case _DATATYPE_INT32:
+                ptr1_0 = (char *)data.image[IDb].array.SI32;
+                break;
 
-                case _DATATYPE_INT64:
-                    ptr1_0 = (char *) data.image[IDb].array.SI64;
-                    break;
+            case _DATATYPE_UINT32:
+                ptr1_0 = (char *)data.image[IDb].array.UI32;
+                break;
 
-                case _DATATYPE_UINT64:
-                    ptr1_0 = (char *) data.image[IDb].array.UI64;
-                    break;
+            case _DATATYPE_INT64:
+                ptr1_0 = (char *)data.image[IDb].array.SI64;
+                break;
 
-                case _DATATYPE_DOUBLE:
-                    ptr1_0 = (char *) data.image[IDb].array.D;
-                    break;
+            case _DATATYPE_UINT64:
+                ptr1_0 = (char *)data.image[IDb].array.UI64;
+                break;
 
+            case _DATATYPE_DOUBLE:
+                ptr1_0 = (char *)data.image[IDb].array.D;
+                break;
             }
 
             data.image[IDb].md[0].write = 1;
-            logshimconf[0].filecnt ++;
+            logshimconf[0].filecnt++;
         }
 
-
         cnt = data.image[ID].md[0].cnt0;
     }
 
@@ -1595,11 +1338,3 @@ errno_t __attribute__((hot)) COREMOD_MEMORY_sharedMem_2Dim_log(
 
     return RETURN_SUCCESS;
 }
-
-
-
-
-
-
-
-
diff --git a/src/COREMOD_memory/logshmim.h b/src/COREMOD_memory/logshmim.h
index be1e647c..f64e7a7c 100644
--- a/src/COREMOD_memory/logshmim.h
+++ b/src/COREMOD_memory/logshmim.h
@@ -2,41 +2,20 @@
  * @file    logshmim.h
  */
 
-
-
 #ifndef CLICORE_MEMORY_LOGSHMIM_H
 #define CLICORE_MEMORY_LOGSHMIM_H
 
-
-
 errno_t logshmim_addCLIcmd();
 
+void *save_fits_function(void *ptr);
 
-void      *save_fits_function(
-    void *ptr
-);
-
-
-
-errno_t COREMOD_MEMORY_logshim_printstatus(
-    const char *IDname
-);
+errno_t COREMOD_MEMORY_logshim_printstatus(const char *IDname);
 
-errno_t COREMOD_MEMORY_logshim_set_on(
-    const char *IDname,
-    int         setv
-);
+errno_t COREMOD_MEMORY_logshim_set_on(const char *IDname, int setv);
 
-errno_t COREMOD_MEMORY_logshim_set_logexit(
-    const char *IDname,
-    int setv
-);
+errno_t COREMOD_MEMORY_logshim_set_logexit(const char *IDname, int setv);
 
-errno_t COREMOD_MEMORY_sharedMem_2Dim_log(
-    const char  *IDname,
-    uint32_t     zsize,
-    const char  *logdir,
-    const char  *IDlogdata_name
-);
+errno_t COREMOD_MEMORY_sharedMem_2Dim_log(const char *IDname, uint32_t zsize, const char *logdir,
+                                          const char *IDlogdata_name);
 
 #endif
diff --git a/src/COREMOD_memory/read_shmim.c b/src/COREMOD_memory/read_shmim.c
index 0efb4aea..7beef0f1 100644
--- a/src/COREMOD_memory/read_shmim.c
+++ b/src/COREMOD_memory/read_shmim.c
@@ -3,63 +3,36 @@
  * @brief   read shared memory stream
  */
 
+#include <fcntl.h>    // open
+#include <sys/mman.h> // mmap
 #include <sys/stat.h>
-#include <fcntl.h> // open
 #include <unistd.h> // close
-#include <sys/mman.h> // mmap
 
 #include "CommandLineInterface/CLIcore.h"
 #include "image_ID.h"
-#include "list_image.h"
 #include "image_keyword_list.h"
-
-
+#include "list_image.h"
 
 // Local variables pointers
 static char *insname;
 
-
 // List of arguments to function
-static CLICMDARGDEF farg[] =
-{
-    {
-        CLIARG_STR_NOT_IMG, ".in_sname", "input stream", "ims1",
-        CLIARG_VISIBLE_DEFAULT,
-        (void **) &insname, NULL
-    }
-};
-
-
-
+static CLICMDARGDEF farg[] = {
+    {CLIARG_STR_NOT_IMG, ".in_sname", "input stream", "ims1", CLIARG_VISIBLE_DEFAULT, (void **)&insname, NULL}};
 
 // flag CLICMDFLAG_FPS enabled FPS capability
-static CLICMDDATA CLIcmddata =
-{
-    "readshmim",
-    "read shared memory image",
-    CLICMD_FIELDS_DEFAULTS
-};
-
-
-
+static CLICMDDATA CLIcmddata = {"readshmim", "read shared memory image", CLICMD_FIELDS_DEFAULTS};
 
 // detailed help
-static errno_t help_function()
-{
-    return RETURN_SUCCESS;
-}
+static errno_t help_function() { return RETURN_SUCCESS; }
 
-
-
-imageID read_sharedmem_image(
-    const char *sname
-)
+imageID read_sharedmem_image(const char *sname)
 {
     imageID ID = -1;
     imageID IDmem = 0;
     IMAGE *image;
 
-    if(strlen(sname) != 0)
+    if (strlen(sname) != 0)
     {
         DEBUG_TRACEPOINT("looking for next ID");
         IDmem = next_avail_image_ID();
@@ -67,8 +40,7 @@ imageID read_sharedmem_image(
 
         image = &data.image[IDmem];
 
-        if(ImageStreamIO_read_sharedmem_image_toIMAGE(sname,
-                image) != IMAGESTREAMIO_SUCCESS)
+        if (ImageStreamIO_read_sharedmem_image_toIMAGE(sname, image) != IMAGESTREAMIO_SUCCESS)
         {
             printf("read shared mem image failed -> ID = -1\n");
             fflush(stdout);
@@ -89,7 +61,7 @@ imageID read_sharedmem_image(
             image_keywords_list(img);
         }
 
-        if(data.MEM_MONITOR == 1)
+        if (data.MEM_MONITOR == 1)
         {
             list_image_ID_ncurses();
         }
@@ -101,8 +73,6 @@ imageID read_sharedmem_image(
     }
 }
 
-
-
 // adding INSERT_STD_PROCINFO statements enables processinfo support
 static errno_t compute_function()
 {
@@ -118,17 +88,11 @@ static errno_t compute_function()
     return RETURN_SUCCESS;
 }
 
-
-
-
-
 INSERT_STD_FPSCLIfunctions
 
-errno_t CLIADDCMD_COREMOD_memory__read_sharedmem_image()
+    errno_t
+    CLIADDCMD_COREMOD_memory__read_sharedmem_image()
 {
     INSERT_STD_CLIREGISTERFUNC
     return RETURN_SUCCESS;
 }
-
-
-
diff --git a/src/COREMOD_memory/read_shmim.h b/src/COREMOD_memory/read_shmim.h
index fc75ca97..91781d96 100644
--- a/src/COREMOD_memory/read_shmim.h
+++ b/src/COREMOD_memory/read_shmim.h
@@ -2,14 +2,11 @@
  * @file    read_shmim.h
  */
 
-
 #ifndef COREMOD_MEMORY_READ_SHMIM_H
 #define COREMOD_MEMORY_READ_SHMIM_H
 
 errno_t CLIADDCMD_COREMOD_memory__read_sharedmem_image();
 
-imageID    read_sharedmem_image(
-    const char *name
-);
+imageID read_sharedmem_image(const char *name);
 
 #endif
diff --git a/src/COREMOD_memory/read_shmim_size.c b/src/COREMOD_memory/read_shmim_size.c
index 9c780de2..23e504fc 100644
--- a/src/COREMOD_memory/read_shmim_size.c
+++ b/src/COREMOD_memory/read_shmim_size.c
@@ -3,59 +3,30 @@
  * @brief   read shared memory stream
  */
 
+#include <fcntl.h>    // open
+#include <sys/mman.h> // mmap
 #include <sys/stat.h>
-#include <fcntl.h> // open
 #include <unistd.h> // close
-#include <sys/mman.h> // mmap
 
 #include "CommandLineInterface/CLIcore.h"
 #include "image_ID.h"
 #include "list_image.h"
 
-
-
-
 // Local variables pointers
 static char *insname;
 static char *outfname;
 
-
 // List of arguments to function
-static CLICMDARGDEF farg[] =
-{
-    {
-        CLIARG_STR, ".in_sname", "input stream", "ims1",
-        CLIARG_VISIBLE_DEFAULT,
-        (void **) &insname, NULL
-    },
-    {
-        CLIARG_STR_NOT_IMG, ".outfname", "output file name", "outsize.dat",
-        CLIARG_VISIBLE_DEFAULT,
-        (void **) &outfname, NULL
-    }
-};
-
-
-
+static CLICMDARGDEF farg[] = {
+    {CLIARG_STR, ".in_sname", "input stream", "ims1", CLIARG_VISIBLE_DEFAULT, (void **)&insname, NULL},
+    {CLIARG_STR_NOT_IMG, ".outfname", "output file name", "outsize.dat", CLIARG_VISIBLE_DEFAULT, (void **)&outfname,
+     NULL}};
 
 // flag CLICMDFLAG_FPS enabled FPS capability
-static CLICMDDATA CLIcmddata =
-{
-    "readshmimsize",
-    "read shared memory image size",
-    CLICMD_FIELDS_DEFAULTS
-};
-
-
+static CLICMDDATA CLIcmddata = {"readshmimsize", "read shared memory image size", CLICMD_FIELDS_DEFAULTS};
 
 // detailed help
-static errno_t help_function()
-{
-    return RETURN_SUCCESS;
-}
-
-
-
+static errno_t help_function() { return RETURN_SUCCESS; }
 
 /**
  *  ## Purpose
@@ -74,26 +45,22 @@ static errno_t help_function()
  * 			file name to write image name
  *
  */
-imageID read_sharedmem_image_size(
-    const char *name,
-    const char *fname
-)
+imageID read_sharedmem_image_size(const char *name, const char *fname)
 {
-    int             SM_fd;
-    struct          stat file_stat;
-    char            SM_fname[STRINGMAXLEN_FULLFILENAME];
+    int SM_fd;
+    struct stat file_stat;
+    char SM_fname[STRINGMAXLEN_FULLFILENAME];
     IMAGE_METADATA *map;
-    int             i;
-    FILE           *fp;
-    imageID         ID = -1;
+    int i;
+    FILE *fp;
+    imageID ID = -1;
 
-
-    if((ID = image_ID(name)) == -1)
+    if ((ID = image_ID(name)) == -1)
     {
         WRITE_FULLFILENAME(SM_fname, "%s/%s.im.shm", data.shmdir, name);
 
         SM_fd = open(SM_fname, O_RDWR);
-        if(SM_fd == -1)
+        if (SM_fd == -1)
         {
             printf("Cannot import file - continuing\n");
         }
@@ -102,9 +69,8 @@ imageID read_sharedmem_image_size(
             fstat(SM_fd, &file_stat);
             //        printf("File %s size: %zd\n", SM_fname, file_stat.st_size);
 
-            map = (IMAGE_METADATA *) mmap(0, sizeof(IMAGE_METADATA), PROT_READ | PROT_WRITE,
-                                          MAP_SHARED, SM_fd, 0);
-            if(map == MAP_FAILED)
+            map = (IMAGE_METADATA *)mmap(0, sizeof(IMAGE_METADATA), PROT_READ | PROT_WRITE, MAP_SHARED, SM_fd, 0);
+            if (map == MAP_FAILED)
             {
                 close(SM_fd);
                 perror("Error mmapping the file");
@@ -112,15 +78,14 @@ imageID read_sharedmem_image_size(
             }
 
             fp = fopen(fname, "w");
-            for(i = 0; i < map[0].naxis; i++)
+            for (i = 0; i < map[0].naxis; i++)
             {
-                fprintf(fp, "%ld ", (long) map[0].size[i]);
+                fprintf(fp, "%ld ", (long)map[0].size[i]);
             }
             fprintf(fp, "\n");
             fclose(fp);
 
-
-            if(munmap(map, sizeof(IMAGE_METADATA)) == -1)
+            if (munmap(map, sizeof(IMAGE_METADATA)) == -1)
             {
                 printf("unmapping %s\n", SM_fname);
                 perror("Error un-mmapping the file");
@@ -131,9 +96,9 @@ imageID read_sharedmem_image_size(
     else
     {
         fp = fopen(fname, "w");
-        for(i = 0; i < data.image[ID].md[0].naxis; i++)
+        for (i = 0; i < data.image[ID].md[0].naxis; i++)
         {
-            fprintf(fp, "%ld ", (long) data.image[ID].md[0].size[i]);
+            fprintf(fp, "%ld ", (long)data.image[ID].md[0].size[i]);
         }
         fprintf(fp, "\n");
         fclose(fp);
@@ -142,24 +107,13 @@ imageID read_sharedmem_image_size(
     return ID;
 }
 
-
-
-
-
-
-
-
-
 // adding INSERT_STD_PROCINFO statements enables processinfo support
 static errno_t compute_function()
 {
     DEBUG_TRACE_FSTART();
     INSERT_STD_PROCINFO_COMPUTEFUNC_START
 
-    read_sharedmem_image_size(
-        insname,
-        outfname
-    );
+    read_sharedmem_image_size(insname, outfname);
 
     INSERT_STD_PROCINFO_COMPUTEFUNC_END
 
@@ -167,12 +121,11 @@ static errno_t compute_function()
     return RETURN_SUCCESS;
 }
 
-
-
 INSERT_STD_FPSCLIfunctions
 
-// Register function in CLI
-errno_t CLIADDCMD_COREMOD_memory__read_sharedmem_image_size()
+    // Register function in CLI
+    errno_t
+    CLIADDCMD_COREMOD_memory__read_sharedmem_image_size()
 {
     INSERT_STD_CLIREGISTERFUNC
 
diff --git a/src/COREMOD_memory/read_shmim_size.h b/src/COREMOD_memory/read_shmim_size.h
index 7f4963d8..4d1a2dfa 100644
--- a/src/COREMOD_memory/read_shmim_size.h
+++ b/src/COREMOD_memory/read_shmim_size.h
@@ -3,9 +3,6 @@
 
 errno_t CLIADDCMD_COREMOD_memory__read_sharedmem_image_size();
 
-imageID    read_sharedmem_image_size(
-    const char *name,
-    const char *fname
-);
+imageID read_sharedmem_image_size(const char *name, const char *fname);
 
 #endif
diff --git a/src/COREMOD_memory/read_shmimall.c b/src/COREMOD_memory/read_shmimall.c
index d33f8f79..4c5c639d 100644
--- a/src/COREMOD_memory/read_shmimall.c
+++ b/src/COREMOD_memory/read_shmimall.c
@@ -3,42 +3,32 @@
  * @brief   read all shared memory stream
  */
 
+#include <fcntl.h>    // open
+#include <sys/mman.h> // mmap
 #include <sys/stat.h>
-#include <fcntl.h> // open
 #include <unistd.h> // close
-#include <sys/mman.h> // mmap
 
 #include "CommandLineInterface/CLIcore.h"
 #include "image_ID.h"
 #include "list_image.h"
 #include "read_shmim.h"
 
-
-
-
 // ==========================================
 // forward declaration
 // ==========================================
 
-errno_t read_sharedmem_image_all(
-    const char *name
-);
-
+errno_t read_sharedmem_image_all(const char *name);
 
 // ==========================================
 // command line interface wrapper functions
 // ==========================================
 
-
 static errno_t read_sharedmem_image_all__cli()
 {
-    if(0
-            + CLI_checkarg(1, CLIARG_STR)
-            == 0)
+    if (0 + CLI_checkarg(1, CLIARG_STR) == 0)
     {
 
-        read_sharedmem_image_all(
-            data.cmdargtoken[1].val.string);
+        read_sharedmem_image_all(data.cmdargtoken[1].val.string);
 
         return CLICMD_SUCCESS;
     }
@@ -48,13 +38,6 @@ static errno_t read_sharedmem_image_all__cli()
     }
 }
 
-
-
-
-
-
-
-
 // ==========================================
 // Register CLI command(s)
 // ==========================================
@@ -62,44 +45,29 @@ static errno_t read_sharedmem_image_all__cli()
 errno_t read_shmimall_addCLIcmd()
 {
 
-    RegisterCLIcommand(
-        "readshmimall",
-        __FILE__, 
-        read_sharedmem_image_all__cli,
-        "read all shared memory images",
-        "<string filter>",
-        "readshmimall aol_",
-        "read_sharedmem_image_all(const char *name)");    
+    RegisterCLIcommand("readshmimall", __FILE__, read_sharedmem_image_all__cli, "read all shared memory images",
+                       "<string filter>", "readshmimall aol_", "read_sharedmem_image_all(const char *name)");
 
     return RETURN_SUCCESS;
 }
 
-
-
-
-
-
-
-
-errno_t read_sharedmem_image_all(
-    const char *strfilter
-)
+errno_t read_sharedmem_image_all(const char *strfilter)
 {
     //printf("LOADING ALL STREAMS matching %s\n", strfilter);
 
     int NBstreamMAX = 10000;
     STREAMINFO *streaminfo;
 
-    streaminfo = (STREAMINFO *) malloc(sizeof(STREAMINFO) * NBstreamMAX);
+    streaminfo = (STREAMINFO *)malloc(sizeof(STREAMINFO) * NBstreamMAX);
 
     int NBstream = find_streams(streaminfo, 1, strfilter);
 
     //printf("%d streams found :\n", NBstream);
-    for(int sindex = 0; sindex < NBstream; sindex++)
+    for (int sindex = 0; sindex < NBstream; sindex++)
     {
         //printf(" %3d   %s\n", sindex, streaminfo[sindex].sname);
         imageID ID = image_ID(streaminfo[sindex].sname);
-        if(ID == -1)
+        if (ID == -1)
         {
             read_sharedmem_image(streaminfo[sindex].sname);
         }
@@ -109,5 +77,3 @@ errno_t read_sharedmem_image_all(
 
     return RETURN_SUCCESS;
 }
-
-
diff --git a/src/COREMOD_memory/read_shmimall.h b/src/COREMOD_memory/read_shmimall.h
index e50686e2..84cc4cec 100644
--- a/src/COREMOD_memory/read_shmimall.h
+++ b/src/COREMOD_memory/read_shmimall.h
@@ -2,16 +2,11 @@
  * @file    read_shmimall.h
  */
 
-
 #ifndef _READ_SHMIMALL_H
 #define _READ_SHMIMALL_H
 
-
 errno_t read_shmimall_addCLIcmd();
 
-
-imageID    read_sharedmem_image_all(
-    const char *strfilter
-);
+imageID read_sharedmem_image_all(const char *strfilter);
 
 #endif
diff --git a/src/COREMOD_memory/saveall.c b/src/COREMOD_memory/saveall.c
index 95405a45..3f6de44d 100644
--- a/src/COREMOD_memory/saveall.c
+++ b/src/COREMOD_memory/saveall.c
@@ -1,47 +1,30 @@
 /** @file saveall.c
  */
 
-
 #include "CommandLineInterface/CLIcore.h"
-#include "image_ID.h"
-#include "list_image.h"
 #include "create_image.h"
 #include "delete_image.h"
+#include "image_ID.h"
 #include "image_copy.h"
+#include "list_image.h"
 
 #include "COREMOD_iofits/COREMOD_iofits.h"
 
-
-
-
-
 // ==========================================
 // Forward declaration(s)
 // ==========================================
 
-errno_t COREMOD_MEMORY_SaveAll_snapshot(
-    const char *dirname
-);
-
-
-errno_t COREMOD_MEMORY_SaveAll_sequ(
-    const char *dirname,
-    const char *IDtrig_name,
-    long        semtrig,
-    long        NBframes
-);
-
+errno_t COREMOD_MEMORY_SaveAll_snapshot(const char *dirname);
 
+errno_t COREMOD_MEMORY_SaveAll_sequ(const char *dirname, const char *IDtrig_name, long semtrig, long NBframes);
 
 // ==========================================
 // Command line interface wrapper function(s)
 // ==========================================
 
-
 static errno_t COREMOD_MEMORY_SaveAll_snapshot__cli()
 {
-    if(0
-            + CLI_checkarg(1, 5) == 0)
+    if (0 + CLI_checkarg(1, 5) == 0)
     {
         COREMOD_MEMORY_SaveAll_snapshot(data.cmdargtoken[1].val.string);
         return CLICMD_SUCCESS;
@@ -52,22 +35,14 @@ static errno_t COREMOD_MEMORY_SaveAll_snapshot__cli()
     }
 }
 
-
 static errno_t COREMOD_MEMORY_SaveAll_sequ__cli()
 {
-    if(0
-            + CLI_checkarg(1, 5)
-            + CLI_checkarg(2, CLIARG_IMG)
-            + CLI_checkarg(3, CLIARG_LONG)
-            + CLI_checkarg(4, CLIARG_LONG)
-            == 0)
+    if (0 + CLI_checkarg(1, 5) + CLI_checkarg(2, CLIARG_IMG) + CLI_checkarg(3, CLIARG_LONG) +
+            CLI_checkarg(4, CLIARG_LONG) ==
+        0)
     {
-        COREMOD_MEMORY_SaveAll_sequ(
-            data.cmdargtoken[1].val.string,
-            data.cmdargtoken[2].val.string,
-            data.cmdargtoken[3].val.numl,
-            data.cmdargtoken[4].val.numl
-        );
+        COREMOD_MEMORY_SaveAll_sequ(data.cmdargtoken[1].val.string, data.cmdargtoken[2].val.string,
+                                    data.cmdargtoken[3].val.numl, data.cmdargtoken[4].val.numl);
         return CLICMD_SUCCESS;
     }
     else
@@ -76,10 +51,6 @@ static errno_t COREMOD_MEMORY_SaveAll_sequ__cli()
     }
 }
 
-
-
-
-
 // ==========================================
 // Register CLI command(s)
 // ==========================================
@@ -87,39 +58,22 @@ static errno_t COREMOD_MEMORY_SaveAll_sequ__cli()
 errno_t saveall_addCLIcmd()
 {
 
-    RegisterCLIcommand(
-        "imsaveallsnap",
-        __FILE__,
-        COREMOD_MEMORY_SaveAll_snapshot__cli, "save all images in directory",
-        "<directory>", "imsaveallsnap dir1",
-        "long COREMOD_MEMORY_SaveAll_snapshot(const char *dirname)");
+    RegisterCLIcommand("imsaveallsnap", __FILE__, COREMOD_MEMORY_SaveAll_snapshot__cli, "save all images in directory",
+                       "<directory>", "imsaveallsnap dir1",
+                       "long COREMOD_MEMORY_SaveAll_snapshot(const char *dirname)");
 
     RegisterCLIcommand(
-        "imsaveallseq",
-        __FILE__,
-        COREMOD_MEMORY_SaveAll_sequ__cli,
-        "save all images in directory - sequence",
-        "<directory> <trigger image name> <trigger semaphore> <NB frames>",
-        "imsaveallsequ dir1 im1 3 20",
+        "imsaveallseq", __FILE__, COREMOD_MEMORY_SaveAll_sequ__cli, "save all images in directory - sequence",
+        "<directory> <trigger image name> <trigger semaphore> <NB frames>", "imsaveallsequ dir1 im1 3 20",
         "long COREMOD_MEMORY_SaveAll_sequ(const char *dirname, const char *IDtrig_name, long semtrig, long NBframes)");
 
     return RETURN_SUCCESS;
 }
 
-
-
-
-
-
-
-
-
 //
 // save all current images/stream onto file
 //
-errno_t COREMOD_MEMORY_SaveAll_snapshot(
-    const char *dirname
-)
+errno_t COREMOD_MEMORY_SaveAll_snapshot(const char *dirname)
 {
     long *IDarray;
     long *IDarraycp;
@@ -129,20 +83,19 @@ errno_t COREMOD_MEMORY_SaveAll_snapshot(
     char fnamecp[STRINGMAXLEN_FULLFILENAME];
     long ID;
 
-
-    for(i = 0; i < data.NB_MAX_IMAGE; i++)
-        if(data.image[i].used == 1)
+    for (i = 0; i < data.NB_MAX_IMAGE; i++)
+        if (data.image[i].used == 1)
         {
             imcnt++;
         }
 
-    IDarray = (long *) malloc(sizeof(long) * imcnt);
-    IDarraycp = (long *) malloc(sizeof(long) * imcnt);
+    IDarray = (long *)malloc(sizeof(long) * imcnt);
+    IDarraycp = (long *)malloc(sizeof(long) * imcnt);
 
     imcnt = 0;
-    for(i = 0; i < data.NB_MAX_IMAGE; i++)
+    for (i = 0; i < data.NB_MAX_IMAGE; i++)
     {
-        if(data.image[i].used == 1)
+        if (data.image[i].used == 1)
         {
             IDarray[imcnt] = i;
             imcnt++;
@@ -152,7 +105,7 @@ errno_t COREMOD_MEMORY_SaveAll_snapshot(
     EXECUTE_SYSTEM_COMMAND("mkdir -p %s", dirname);
 
     // create array for each image
-    for(i = 0; i < imcnt; i++)
+    for (i = 0; i < imcnt; i++)
     {
         ID = IDarray[i];
         WRITE_IMAGENAME(imnamecp, "%s_cp", data.image[ID].name);
@@ -162,7 +115,7 @@ errno_t COREMOD_MEMORY_SaveAll_snapshot(
 
     list_image_ID();
 
-    for(i = 0; i < imcnt; i++)
+    for (i = 0; i < imcnt; i++)
     {
         ID = IDarray[i];
         WRITE_IMAGENAME(imnamecp, "%s_cp", data.image[ID].name);
@@ -173,22 +126,14 @@ errno_t COREMOD_MEMORY_SaveAll_snapshot(
     free(IDarray);
     free(IDarraycp);
 
-
     return RETURN_SUCCESS;
 }
 
-
-
 //
 // save all current images/stream onto file
 // only saves 2D float streams into 3D cubes
 //
-errno_t COREMOD_MEMORY_SaveAll_sequ(
-    const char *dirname,
-    const char *IDtrig_name,
-    long semtrig,
-    long NBframes
-)
+errno_t COREMOD_MEMORY_SaveAll_sequ(const char *dirname, const char *IDtrig_name, long semtrig, long NBframes)
 {
     long *IDarray;
     long *IDarrayout;
@@ -204,52 +149,41 @@ errno_t COREMOD_MEMORY_SaveAll_sequ(
     char *ptr1;
     uint32_t *imsizearray;
 
-
-
-
-    for(i = 0; i < data.NB_MAX_IMAGE; i++)
-        if(data.image[i].used == 1)
+    for (i = 0; i < data.NB_MAX_IMAGE; i++)
+        if (data.image[i].used == 1)
         {
             imcnt++;
         }
 
-    IDarray = (imageID *) malloc(sizeof(imageID) * imcnt);
-    IDarrayout = (imageID *) malloc(sizeof(imageID) * imcnt);
+    IDarray = (imageID *)malloc(sizeof(imageID) * imcnt);
+    IDarrayout = (imageID *)malloc(sizeof(imageID) * imcnt);
 
     imcnt = 0;
-    for(i = 0; i < data.NB_MAX_IMAGE; i++)
-        if(data.image[i].used == 1)
+    for (i = 0; i < data.NB_MAX_IMAGE; i++)
+        if (data.image[i].used == 1)
         {
             IDarray[imcnt] = i;
             imcnt++;
         }
-    imsizearray = (uint32_t *) malloc(sizeof(uint32_t) * imcnt);
-
-
+    imsizearray = (uint32_t *)malloc(sizeof(uint32_t) * imcnt);
 
     EXECUTE_SYSTEM_COMMAND("mkdir -p %s", dirname);
 
     IDtrig = image_ID(IDtrig_name);
 
-
     printf("Creating arrays\n");
     fflush(stdout);
 
     // create 3D arrays
-    for(i = 0; i < imcnt; i++)
+    for (i = 0; i < imcnt; i++)
     {
         sprintf(imnameout, "%s_out", data.image[IDarray[i]].name);
-        imsizearray[i] = sizeof(float) * data.image[IDarray[i]].md[0].size[0] *
-                         data.image[IDarray[i]].md[0].size[1];
-        printf("Creating image %s  size %d x %d x %ld\n", imnameout,
-               data.image[IDarray[i]].md[0].size[0], data.image[IDarray[i]].md[0].size[1],
-               NBframes);
+        imsizearray[i] = sizeof(float) * data.image[IDarray[i]].md[0].size[0] * data.image[IDarray[i]].md[0].size[1];
+        printf("Creating image %s  size %d x %d x %ld\n", imnameout, data.image[IDarray[i]].md[0].size[0],
+               data.image[IDarray[i]].md[0].size[1], NBframes);
         fflush(stdout);
-        create_3Dimage_ID(imnameout,
-                          data.image[IDarray[i]].md[0].size[0],
-                          data.image[IDarray[i]].md[0].size[1],
-                          NBframes,
-                          &(IDarrayout[i]));
+        create_3Dimage_ID(imnameout, data.image[IDarray[i]].md[0].size[0], data.image[IDarray[i]].md[0].size[1],
+                          NBframes, &(IDarrayout[i]));
     }
     list_image_ID();
 
@@ -257,30 +191,30 @@ errno_t COREMOD_MEMORY_SaveAll_sequ(
     fflush(stdout);
 
     // drive semaphore to zero
-    while(sem_trywait(data.image[IDtrig].semptr[semtrig]) == 0) {}
+    while (sem_trywait(data.image[IDtrig].semptr[semtrig]) == 0)
+    {
+    }
 
     frame = 0;
-    while(frame < NBframes)
+    while (frame < NBframes)
     {
         sem_wait(data.image[IDtrig].semptr[semtrig]);
-        for(i = 0; i < imcnt; i++)
+        for (i = 0; i < imcnt; i++)
         {
             ID = IDarray[i];
-            ptr0 = (char *) data.image[IDarrayout[i]].array.F;
+            ptr0 = (char *)data.image[IDarrayout[i]].array.F;
             ptr1 = ptr0 + imsizearray[i] * frame;
             memcpy(ptr1, data.image[ID].array.F, imsizearray[i]);
         }
         frame++;
     }
 
-
     printf("Saving images\n");
     fflush(stdout);
 
     list_image_ID();
 
-
-    for(i = 0; i < imcnt; i++)
+    for (i = 0; i < imcnt; i++)
     {
         ID = IDarray[i];
         sprintf(imnameout, "%s_out", data.image[ID].name);
@@ -294,8 +228,3 @@ errno_t COREMOD_MEMORY_SaveAll_sequ(
 
     return RETURN_SUCCESS;
 }
-
-
-
-
-
diff --git a/src/COREMOD_memory/saveall.h b/src/COREMOD_memory/saveall.h
index f2f55286..69e64454 100644
--- a/src/COREMOD_memory/saveall.h
+++ b/src/COREMOD_memory/saveall.h
@@ -1,23 +1,8 @@
 /** @file saveall.h
  */
 
-
-
-
 errno_t saveall_addCLIcmd();
 
+errno_t COREMOD_MEMORY_SaveAll_snapshot(const char *dirname);
 
-
-errno_t COREMOD_MEMORY_SaveAll_snapshot(
-    const char *dirname
-);
-
-
-errno_t COREMOD_MEMORY_SaveAll_sequ(
-    const char *dirname,
-    const char *IDtrig_name,
-    long        semtrig,
-    long        NBframes
-);
-
-
+errno_t COREMOD_MEMORY_SaveAll_sequ(const char *dirname, const char *IDtrig_name, long semtrig, long NBframes);
diff --git a/src/COREMOD_memory/scripts/milk-rmshmim b/src/COREMOD_memory/scripts/milk-rmshmim
index e2d99683..b30677b9 100755
--- a/src/COREMOD_memory/scripts/milk-rmshmim
+++ b/src/COREMOD_memory/scripts/milk-rmshmim
@@ -10,25 +10,25 @@ echo "pname = $pname"
 
 
 function printHELP {
-echo "------------------------------------------------------------------------"
-echo "$(tput bold) $pname : remove shmim and files $(tput sgr0)"
-echo "------------------------------------------------------------------------"
-echo "  Remove shared memory image (stream) and associated files"
-echo "  Multiple streams can be entered, separated by comma, no space"
-echo "   "
-echo " $(tput bold)USAGE:$(tput sgr0)"
-echo "     $0 [-h] <stream(s)>"
-echo ""
-echo " $(tput bold)OPTIONS:$(tput sgr0)"
-echo "     $(tput bold)-h$(tput sgr0)          (h)elp"
-echo ""
-echo "------------------------------------------------------------------------"
+    echo "------------------------------------------------------------------------"
+    echo "$(tput bold) $pname : remove shmim and files $(tput sgr0)"
+    echo "------------------------------------------------------------------------"
+    echo "  Remove shared memory image (stream) and associated files"
+    echo "  Multiple streams can be entered, separated by comma, no space"
+    echo "   "
+    echo " $(tput bold)USAGE:$(tput sgr0)"
+    echo "     $0 [-h] <stream(s)>"
+    echo ""
+    echo " $(tput bold)OPTIONS:$(tput sgr0)"
+    echo "     $(tput bold)-h$(tput sgr0)          (h)elp"
+    echo ""
+    echo "------------------------------------------------------------------------"
 }
 
 
 printHELP1 ()
 {
-	printf "%20s       Remove shared memory image (stream)\n" "$0" 
+    printf "%20s       Remove shared memory image (stream)\n" "$0"
 }
 
 
@@ -39,38 +39,38 @@ printHELP1 ()
 # Transform long options to short ones
 singlelinehelp=0
 for arg in "$@"; do
-  shift
-  case "$arg" in
-    "--help") set -- "$@" "-h" ;;
-    "--help1") 
-set -- "$@" "-h" 
-singlelinehelp=1;
-;;
-    *)        set -- "$@" "$arg"
-  esac
+    shift
+    case "$arg" in
+        "--help") set -- "$@" "-h" ;;
+        "--help1")
+            set -- "$@" "-h"
+            singlelinehelp=1;
+            ;;
+        *)        set -- "$@" "$arg"
+    esac
 done
 
 
 
 
 while getopts :h FLAG; do
-  case $FLAG in
-    h)  #show help
-      if [ "$singlelinehelp" -eq "0" ]; then
-      printHELP
-      else
-      printHELP1
-      fi
-      exit
-      ;;
-    \?) 
-      echo -e \\n"Option -${BOLD}$OPTARG${NORM} not allowed."
-      printHELP
-      ;;
-  esac
+    case $FLAG in
+        h)  #show help
+            if [ "$singlelinehelp" -eq "0" ]; then
+                printHELP
+            else
+                printHELP1
+            fi
+            exit
+            ;;
+        \?)
+            echo -e \\n"Option -${BOLD}$OPTARG${NORM} not allowed."
+            printHELP
+            ;;
+    esac
 done
 
-shift $((OPTIND-1))  
+shift $((OPTIND-1))
 
 ### End getopts code ###
 
@@ -80,11 +80,11 @@ shift $((OPTIND-1))
 
 
 if [ "$1" = "help" ] || [ "$#" -ne $NBARGS ]; then
-if [ "$#" -ne $NBARGS ]; then
-    echo "$(tput setaf 1)$(tput bold) Illegal number of parameters ($NBARGS params required, $# entered) $(tput sgr0)"
-fi
-printHELP
-        exit
+    if [ "$#" -ne $NBARGS ]; then
+        echo "$(tput setaf 1)$(tput bold) Illegal number of parameters ($NBARGS params required, $# entered) $(tput sgr0)"
+    fi
+    printHELP
+    exit
 fi
 
 
@@ -99,7 +99,7 @@ SF="milkCLIstartup.${pname}"
 echo "" > $SF
 for streamname in "${array[@]}"
 do
-	echo "readshmim ${streamname}" >> $SF
+    echo "readshmim ${streamname}" >> $SF
     echo "rmshmim ${streamname}" >> $SF
 done
 echo "exitCLI" >> $SF
@@ -107,5 +107,3 @@ echo "exitCLI" >> $SF
 milk -n ${pname} -f ${fifoname} -s ${SF}
 
 rm ${SF}
-
-
diff --git a/src/COREMOD_memory/scripts/milk-shmimlog b/src/COREMOD_memory/scripts/milk-shmimlog
index 82530d17..ae5df68a 100755
--- a/src/COREMOD_memory/scripts/milk-shmimlog
+++ b/src/COREMOD_memory/scripts/milk-shmimlog
@@ -12,33 +12,33 @@ pname="logshim-$1"
 
 
 function printHELP {
-echo "------------------------------------------------------------------------"
-echo "$(tput bold) $pname : Log image stream $(tput sgr0)"
-echo "------------------------------------------------------------------------"
-echo "  Start process to log image stream to disk"
-echo "   "
-echo " $(tput bold)USAGE:$(tput sgr0)"
-echo "     $0 [-h c <CPUset>] <stream> <blocksize> <directory>"
-echo ""
-echo " $(tput bold)OPTIONS:$(tput sgr0)"
-echo "     $(tput bold)-h$(tput sgr0)              help"
-echo "     $(tput bold)-c$(tput sgr0) <CPUset>     move process to CPUset"
-echo ""
-echo " $(tput bold)INPUT:$(tput sgr0)"
-echo "     <stream>            Shared memory stream name. Actual file is $MILK_SHM_DIR/<stream name>.im.shm"
-echo "     <blocksize>         Number of slices in each data cube saved"
-echo "     <directory>         Destination directory"
-echo ""
-echo " $(tput bold)EXAMPLE:$(tput sgr0)"
-echo "     logshim ircam2 10000 /media/data/20150222/ircamlog/"
-echo ""
-echo "------------------------------------------------------------------------"
+    echo "------------------------------------------------------------------------"
+    echo "$(tput bold) $pname : Log image stream $(tput sgr0)"
+    echo "------------------------------------------------------------------------"
+    echo "  Start process to log image stream to disk"
+    echo "   "
+    echo " $(tput bold)USAGE:$(tput sgr0)"
+    echo "     $0 [-h c <CPUset>] <stream> <blocksize> <directory>"
+    echo ""
+    echo " $(tput bold)OPTIONS:$(tput sgr0)"
+    echo "     $(tput bold)-h$(tput sgr0)              help"
+    echo "     $(tput bold)-c$(tput sgr0) <CPUset>     move process to CPUset"
+    echo ""
+    echo " $(tput bold)INPUT:$(tput sgr0)"
+    echo "     <stream>            Shared memory stream name. Actual file is $MILK_SHM_DIR/<stream name>.im.shm"
+    echo "     <blocksize>         Number of slices in each data cube saved"
+    echo "     <directory>         Destination directory"
+    echo ""
+    echo " $(tput bold)EXAMPLE:$(tput sgr0)"
+    echo "     logshim ircam2 10000 /media/data/20150222/ircamlog/"
+    echo ""
+    echo "------------------------------------------------------------------------"
 }
 
 
 printHELP1 ()
 {
-    printf "%20s       Start process to log image stream to disk\n" "$0" 
+    printf "%20s       Start process to log image stream to disk\n" "$0"
 }
 
 
@@ -50,38 +50,38 @@ EXITSTATUS=0
 
 
 function checkFile {
-if [ -f $1 ]
-  then
-    echo "[$(tput setaf 2)$(tput bold)   OK   $(tput sgr0)] File $(tput bold)$1$(tput sgr0) found"
-   else
-    echo "[$(tput setaf 1)$(tput bold) FAILED $(tput sgr0)] File $(tput bold)$1$(tput sgr0) not found"
-    EXITSTATUS=1
-fi
+    if [ -f $1 ]
+    then
+        echo "[$(tput setaf 2)$(tput bold)   OK   $(tput sgr0)] File $(tput bold)$1$(tput sgr0) found"
+    else
+        echo "[$(tput setaf 1)$(tput bold) FAILED $(tput sgr0)] File $(tput bold)$1$(tput sgr0) not found"
+        EXITSTATUS=1
+    fi
 }
 
 
 function checkDir {
-if [ -d $1 ]
-  then
-    echo "[$(tput setaf 2)$(tput bold)   OK   $(tput sgr0)] Directory $(tput bold)$1$(tput sgr0) found"
-   else
-    echo "[$(tput setaf 1)$(tput bold) FAILED $(tput sgr0)] Directory $(tput bold)$1$(tput sgr0) not found"
-    EXITSTATUS=1
-fi
+    if [ -d $1 ]
+    then
+        echo "[$(tput setaf 2)$(tput bold)   OK   $(tput sgr0)] Directory $(tput bold)$1$(tput sgr0) found"
+    else
+        echo "[$(tput setaf 1)$(tput bold) FAILED $(tput sgr0)] Directory $(tput bold)$1$(tput sgr0) not found"
+        EXITSTATUS=1
+    fi
 }
 
 function cmdexists()
 {
-  command -v "$1" >/dev/null 2>&1
+    command -v "$1" >/dev/null 2>&1
 }
 
 
 function checkCommand {
-if cmdexists $1; then
-    echo "[$(tput setaf 2)$(tput bold)   OK   $(tput sgr0)] Command $(tput bold)$1$(tput sgr0) found"
-else
-    echo "[$(tput setaf 1)$(tput bold) FAILED $(tput sgr0)] Command $(tput bold)$1$(tput sgr0) not installed.  Aborting."; EXITSTATUS=1;
-fi
+    if cmdexists $1; then
+        echo "[$(tput setaf 2)$(tput bold)   OK   $(tput sgr0)] Command $(tput bold)$1$(tput sgr0) found"
+    else
+        echo "[$(tput setaf 1)$(tput bold) FAILED $(tput sgr0)] Command $(tput bold)$1$(tput sgr0) not installed.  Aborting."; EXITSTATUS=1;
+    fi
 
 }
 
@@ -96,15 +96,15 @@ fi
 # Transform long options to short ones
 singlelinehelp=0
 for arg in "$@"; do
-  shift
-  case "$arg" in
-    "--help") set -- "$@" "-h" ;;
-    "--help1") 
-set -- "$@" "-h" 
-singlelinehelp=1;
-;;
-    *)        set -- "$@" "$arg"
-  esac
+    shift
+    case "$arg" in
+        "--help") set -- "$@" "-h" ;;
+        "--help1")
+            set -- "$@" "-h"
+            singlelinehelp=1;
+            ;;
+        *)        set -- "$@" "$arg"
+    esac
 done
 
 
@@ -113,23 +113,23 @@ done
 CPUset="NULL"
 
 while getopts :hc: FLAG; do
-  case $FLAG in
-    h)  #show help
-      if [ "$singlelinehelp" -eq "0" ]; then
-      printHELP
-      else
-      printHELP1
-      fi
-      exit
-      ;;
-    c) # CPU set
-    CPUset="$OPTARG"
-    ;;
-    \?) #unrecognized option - show help
-      echo -e \\n"Option -${BOLD}$OPTARG${NORM} not allowed."
-      printHELP
-      ;;
-  esac
+    case $FLAG in
+        h)  #show help
+            if [ "$singlelinehelp" -eq "0" ]; then
+                printHELP
+            else
+                printHELP1
+            fi
+            exit
+            ;;
+        c) # CPU set
+            CPUset="$OPTARG"
+            ;;
+        \?) #unrecognized option - show help
+            echo -e \\n"Option -${BOLD}$OPTARG${NORM} not allowed."
+            printHELP
+            ;;
+    esac
 done
 
 shift $((OPTIND-1))
@@ -142,11 +142,11 @@ shift $((OPTIND-1))
 
 
 if [ "$1" = "help" ] || [ "$#" -ne $NBARGS ]; then
-if [ "$#" -ne $NBARGS ]; then
-    echo "$(tput setaf 1)$(tput bold) Illegal number of parameters ($NBARGS params required, $# entered) $(tput sgr0)"
-fi
-printHELP
-        exit
+    if [ "$#" -ne $NBARGS ]; then
+        echo "$(tput setaf 1)$(tput bold) Illegal number of parameters ($NBARGS params required, $# entered) $(tput sgr0)"
+    fi
+    printHELP
+    exit
 fi
 
 
@@ -164,12 +164,12 @@ checkCommand milk
 
 
 if [ $EXITSTATUS -eq 1 ]; then
-echo ""
-echo "$(tput setaf 1)$(tput bold) REQUIRED FILES, COMMANDS NOT FOUND: EXITING $(tput sgr0)"
-echo ""
-exit
+    echo ""
+    echo "$(tput setaf 1)$(tput bold) REQUIRED FILES, COMMANDS NOT FOUND: EXITING $(tput sgr0)"
+    echo ""
+    exit
 else
-echo ""
+    echo ""
 fi
 
 
diff --git a/src/COREMOD_memory/scripts/milk-shmimpoke b/src/COREMOD_memory/scripts/milk-shmimpoke
index a0ee8cea..63b30a5b 100755
--- a/src/COREMOD_memory/scripts/milk-shmimpoke
+++ b/src/COREMOD_memory/scripts/milk-shmimpoke
@@ -71,4 +71,3 @@ shmimpoke ${streamname}
 listim
 exitCLI
 EOF
-
diff --git a/src/COREMOD_memory/scripts/milk-shmimpurge b/src/COREMOD_memory/scripts/milk-shmimpurge
index 4e7cb333..1c3fd3af 100755
--- a/src/COREMOD_memory/scripts/milk-shmimpurge
+++ b/src/COREMOD_memory/scripts/milk-shmimpurge
@@ -10,26 +10,26 @@ echo "pname = $pname"
 
 
 function printHELP {
-echo "------------------------------------------------------------------------"
-echo "$(tput bold) $pname : purge orphan streams $(tput sgr0)"
-echo "------------------------------------------------------------------------"
-echo "  Remove orphan shared memory image (stream) and associated files"
-echo "  Optional filter string to be matched can be specified" 
-echo "   "
-echo " $(tput bold)USAGE:$(tput sgr0)"
-echo "     $0 [-hf:]"
-echo ""
-echo " $(tput bold)OPTIONS:$(tput sgr0)"
-echo "     $(tput bold)-h$(tput sgr0)          (h)elp"
-echo "     $(tput bold)-f$(tput sgr0)          only purge streams matching (f)ilter"
-echo ""
-echo "------------------------------------------------------------------------"
+    echo "------------------------------------------------------------------------"
+    echo "$(tput bold) $pname : purge orphan streams $(tput sgr0)"
+    echo "------------------------------------------------------------------------"
+    echo "  Remove orphan shared memory image (stream) and associated files"
+    echo "  Optional filter string to be matched can be specified"
+    echo "   "
+    echo " $(tput bold)USAGE:$(tput sgr0)"
+    echo "     $0 [-hf:]"
+    echo ""
+    echo " $(tput bold)OPTIONS:$(tput sgr0)"
+    echo "     $(tput bold)-h$(tput sgr0)          (h)elp"
+    echo "     $(tput bold)-f$(tput sgr0)          only purge streams matching (f)ilter"
+    echo ""
+    echo "------------------------------------------------------------------------"
 }
 
 
 printHELP1 ()
 {
-	printf "%20s       Purge orphan streams\n" "$0" 
+    printf "%20s       Purge orphan streams\n" "$0"
 }
 
 
@@ -40,15 +40,15 @@ printHELP1 ()
 # Transform long options to short ones
 singlelinehelp=0
 for arg in "$@"; do
-  shift
-  case "$arg" in
-    "--help") set -- "$@" "-h" ;;
-    "--help1") 
-set -- "$@" "-h" 
-singlelinehelp=1;
-;;
-    *)        set -- "$@" "$arg"
-  esac
+    shift
+    case "$arg" in
+        "--help") set -- "$@" "-h" ;;
+        "--help1")
+            set -- "$@" "-h"
+            singlelinehelp=1;
+            ;;
+        *)        set -- "$@" "$arg"
+    esac
 done
 
 
@@ -56,27 +56,27 @@ done
 FILTERSTRING=""
 
 while getopts :hf: FLAG; do
-  case $FLAG in
-    h)  #show help
-      if [ "$singlelinehelp" -eq "0" ]; then
-      printHELP
-      else
-      printHELP1
-      fi
-      exit
-      ;;
-    f)
-    FILTERSTRING="${OPTARG}"
-    echo "using filter ${FILTERSTRING}"
-    ;;
-    \?) 
-      echo -e \\n"Option -${BOLD}$OPTARG${NORM} not allowed."
-      printHELP
-      ;;
-  esac
+    case $FLAG in
+        h)  #show help
+            if [ "$singlelinehelp" -eq "0" ]; then
+                printHELP
+            else
+                printHELP1
+            fi
+            exit
+            ;;
+        f)
+            FILTERSTRING="${OPTARG}"
+            echo "using filter ${FILTERSTRING}"
+            ;;
+        \?)
+            echo -e \\n"Option -${BOLD}$OPTARG${NORM} not allowed."
+            printHELP
+            ;;
+    esac
 done
 
-shift $((OPTIND-1))  
+shift $((OPTIND-1))
 
 ### End getopts code ###
 
@@ -86,11 +86,11 @@ shift $((OPTIND-1))
 
 
 if [ "$1" = "help" ] || [ "$#" -ne $NBARGS ]; then
-if [ "$#" -ne $NBARGS ]; then
-    echo "$(tput setaf 1)$(tput bold) Illegal number of parameters ($NBARGS params required, $# entered) $(tput sgr0)"
-fi
-printHELP
-        exit
+    if [ "$#" -ne $NBARGS ]; then
+        echo "$(tput setaf 1)$(tput bold) Illegal number of parameters ($NBARGS params required, $# entered) $(tput sgr0)"
+    fi
+    printHELP
+    exit
 fi
 
 
@@ -99,6 +99,3 @@ milk -n ${pname} << EOF
 shmimpurge "${FILTERSTRING}"
 exitCLI
 EOF
-
-
-
diff --git a/src/COREMOD_memory/shmim_purge.c b/src/COREMOD_memory/shmim_purge.c
index c663ee3d..a3f48d58 100644
--- a/src/COREMOD_memory/shmim_purge.c
+++ b/src/COREMOD_memory/shmim_purge.c
@@ -3,56 +3,31 @@
  * @brief   purge shared memory stream
  */
 
+#include <fcntl.h>    // open
+#include <sys/mman.h> // mmap
 #include <sys/stat.h>
-#include <fcntl.h> // open
 #include <unistd.h> // close
-#include <sys/mman.h> // mmap
 
 #include "CommandLineInterface/CLIcore.h"
 #include "image_ID.h"
 #include "read_shmim.h"
 
-
 // Local variables pointers
 static char *stringfilter;
 
+static CLICMDARGDEF farg[] = {
+    {CLIARG_STR, ".strfilter", "string filter", "im", CLIARG_VISIBLE_DEFAULT, (void **)&stringfilter, NULL}};
 
-static CLICMDARGDEF farg[] =
-{
-    {
-        CLIARG_STR, ".strfilter", "string filter", "im",
-        CLIARG_VISIBLE_DEFAULT,
-        (void **) &stringfilter, NULL
-    }
-};
-
-
-static CLICMDDATA CLIcmddata =
-{
-    "shmimpurge",
-    "purge orphan streams",
-    CLICMD_FIELDS_DEFAULTS
-};
-
-
+static CLICMDDATA CLIcmddata = {"shmimpurge", "purge orphan streams", CLICMD_FIELDS_DEFAULTS};
 
 // detailed help
-static errno_t help_function()
-{
-    return RETURN_SUCCESS;
-}
-
-
-
-
+static errno_t help_function() { return RETURN_SUCCESS; }
 
 /** @brief purge orphan share memory streams
  *
  *
  */
-errno_t    shmim_purge(
-    const char *strfilter
-)
+errno_t shmim_purge(const char *strfilter)
 {
     //printf("PURGING ORPHAN STREAMS (matching %s)\n", strfilter);
 
@@ -60,30 +35,29 @@ errno_t    shmim_purge(
     STREAMINFO *streaminfo;
 
     DEBUG_TRACEPOINT("Searching for streams");
-    streaminfo = (STREAMINFO *) malloc(sizeof(STREAMINFO) * NBstreamMAX);
+    streaminfo = (STREAMINFO *)malloc(sizeof(STREAMINFO) * NBstreamMAX);
     int NBstream = find_streams(streaminfo, 1, strfilter);
     printf("%d stream(s) found\n", NBstream);
 
     DEBUG_TRACEPOINT("scanning %d streams for purging", NBstream);
-    for(int sindex = 0; sindex < NBstream; sindex++)
+    for (int sindex = 0; sindex < NBstream; sindex++)
     {
         printf(" STREAM %3d   %s\n", sindex, streaminfo[sindex].sname);
         imageID ID = image_ID(streaminfo[sindex].sname);
-        if(ID == -1)
+        if (ID == -1)
         {
             ID = read_sharedmem_image(streaminfo[sindex].sname);
         }
-        DEBUG_TRACEPOINT("stream %s loaded ID %ld", streaminfo[sindex].sname,
-                         (long) ID);
+        DEBUG_TRACEPOINT("stream %s loaded ID %ld", streaminfo[sindex].sname, (long)ID);
 
         pid_t opid; // owner PID
         opid = data.image[ID].md[0].ownerPID;
-        DEBUG_TRACEPOINT("owner PID : %ld", (long) opid);
-        printf("owner PID : %ld\n", (long) opid);
+        DEBUG_TRACEPOINT("owner PID : %ld", (long)opid);
+        printf("owner PID : %ld\n", (long)opid);
 
-        if(opid != 0)
+        if (opid != 0)
         {
-            if(getpgid(opid) >= 0)
+            if (getpgid(opid) >= 0)
             {
                 printf("Keeping stream %s\n", streaminfo[sindex].sname);
             }
@@ -106,8 +80,6 @@ errno_t    shmim_purge(
     return RETURN_SUCCESS;
 }
 
-
-
 // adding INSERT_STD_PROCINFO statements enables processinfo support
 static errno_t compute_function()
 {
@@ -121,12 +93,11 @@ static errno_t compute_function()
     return RETURN_SUCCESS;
 }
 
-
-
 INSERT_STD_FPSCLIfunctions
 
-// Register function in CLI
-errno_t CLIADDCMD_COREMOD_memory__shmim_purge()
+    // Register function in CLI
+    errno_t
+    CLIADDCMD_COREMOD_memory__shmim_purge()
 {
     INSERT_STD_CLIREGISTERFUNC
 
diff --git a/src/COREMOD_memory/shmim_purge.h b/src/COREMOD_memory/shmim_purge.h
index bb1ad647..27985c93 100644
--- a/src/COREMOD_memory/shmim_purge.h
+++ b/src/COREMOD_memory/shmim_purge.h
@@ -1,12 +1,8 @@
 #ifndef COREMOD_MEMORY_SHMIM_PURGE_H
 #define COREMOD_MEMORY_SHMIM_PURGE_H
 
-
 errno_t CLIADDCMD_COREMOD_memory__shmim_purge();
 
-
-errno_t    shmim_purge(
-    const char *strfilter
-);
+errno_t shmim_purge(const char *strfilter);
 
 #endif
diff --git a/src/COREMOD_memory/shmim_setowner.c b/src/COREMOD_memory/shmim_setowner.c
index 171e2945..0e9822df 100644
--- a/src/COREMOD_memory/shmim_setowner.c
+++ b/src/COREMOD_memory/shmim_setowner.c
@@ -3,47 +3,29 @@
  * @brief   set stream owner PID
  */
 
-
 #include "CommandLineInterface/CLIcore.h"
 #include "image_ID.h"
 
-
-
-
-
-
 // ==========================================
 // forward declaration
 // ==========================================
 
-imageID shmim_setowner_creator(
-    const char *name
-);
+imageID shmim_setowner_creator(const char *name);
 
+imageID shmim_setowner_current(const char *name);
 
-imageID shmim_setowner_current(
-    const char *name
-);
-
-imageID shmim_setowner_init(
-    const char *name
-);
-
+imageID shmim_setowner_init(const char *name);
 
 // ==========================================
 // command line interface wrapper functions
 // ==========================================
 
-
 static errno_t shmim_setowner_creator__cli()
 {
-    if(0
-            + CLI_checkarg(1, CLIARG_IMG)
-            == 0)
+    if (0 + CLI_checkarg(1, CLIARG_IMG) == 0)
     {
 
-        shmim_setowner_creator(
-            data.cmdargtoken[1].val.string);
+        shmim_setowner_creator(data.cmdargtoken[1].val.string);
 
         return CLICMD_SUCCESS;
     }
@@ -55,13 +37,10 @@ static errno_t shmim_setowner_creator__cli()
 
 static errno_t shmim_setowner_current__cli()
 {
-    if(0
-            + CLI_checkarg(1, CLIARG_IMG)
-            == 0)
+    if (0 + CLI_checkarg(1, CLIARG_IMG) == 0)
     {
 
-        shmim_setowner_current(
-            data.cmdargtoken[1].val.string);
+        shmim_setowner_current(data.cmdargtoken[1].val.string);
 
         return CLICMD_SUCCESS;
     }
@@ -71,16 +50,12 @@ static errno_t shmim_setowner_current__cli()
     }
 }
 
-
 static errno_t shmim_setowner_init__cli()
 {
-    if(0
-            + CLI_checkarg(1, CLIARG_IMG)
-            == 0)
+    if (0 + CLI_checkarg(1, CLIARG_IMG) == 0)
     {
 
-        shmim_setowner_init(
-            data.cmdargtoken[1].val.string);
+        shmim_setowner_init(data.cmdargtoken[1].val.string);
 
         return CLICMD_SUCCESS;
     }
@@ -90,14 +65,6 @@ static errno_t shmim_setowner_init__cli()
     }
 }
 
-
-
-
-
-
-
-
-
 // ==========================================
 // Register CLI command(s)
 // ==========================================
@@ -105,97 +72,59 @@ static errno_t shmim_setowner_init__cli()
 errno_t shmim_setowner_addCLIcmd()
 {
 
-    RegisterCLIcommand(
-        "shmimsetowncreator",
-        __FILE__,
-        shmim_setowner_creator__cli,
-        "set owner to creator PID",
-        "<sname>",
-        "shmimsetowncreator im3",
-        "imageID shmim_setowner_creator(const char *name)"
-    );
-
-    RegisterCLIcommand(
-        "shmimsetowncurrent",
-        __FILE__,
-        shmim_setowner_current__cli,
-        "set owner to current PID",
-        "<sname>",
-        "shmimsetowncurrent im3",
-        "imageID shmim_setowner_current(const char *name)"
-    );
-
-    RegisterCLIcommand(
-        "shmimsetowninit",
-        __FILE__,
-        shmim_setowner_init__cli,
-        "set owner to init PID",
-        "<sname>",
-        "shmimsetowninit im3",
-        "imageID shmim_setowner_init(const char *name)"
-    );
+    RegisterCLIcommand("shmimsetowncreator", __FILE__, shmim_setowner_creator__cli, "set owner to creator PID",
+                       "<sname>", "shmimsetowncreator im3", "imageID shmim_setowner_creator(const char *name)");
+
+    RegisterCLIcommand("shmimsetowncurrent", __FILE__, shmim_setowner_current__cli, "set owner to current PID",
+                       "<sname>", "shmimsetowncurrent im3", "imageID shmim_setowner_current(const char *name)");
 
+    RegisterCLIcommand("shmimsetowninit", __FILE__, shmim_setowner_init__cli, "set owner to init PID", "<sname>",
+                       "shmimsetowninit im3", "imageID shmim_setowner_init(const char *name)");
 
     return RETURN_SUCCESS;
 }
 
-
-
-
-
-
-
 /** @brief set owner to creator */
-imageID shmim_setowner_creator(
-    const char *name
-)
+imageID shmim_setowner_creator(const char *name)
 {
-    imageID    ID;
-  
-	ID = image_ID(name);
-	if(ID != -1) 
-	{
+    imageID ID;
+
+    ID = image_ID(name);
+    if (ID != -1)
+    {
         data.image[ID].md[0].ownerPID = data.image[ID].md[0].creatorPID;
-	}
-  
+    }
+
     return ID;
 }
 
-
-
 /** @brief set owner to current PID */
-imageID shmim_setowner_current(
-    const char *name
-)
+imageID shmim_setowner_current(const char *name)
 {
-    imageID    ID;
-  
-	ID = image_ID(name);
-	if(ID != -1) 
-	{
+    imageID ID;
+
+    ID = image_ID(name);
+    if (ID != -1)
+    {
         data.image[ID].md[0].ownerPID = getpid();
-	}
-  
+    }
+
     return ID;
 }
 
-
-
-/** @brief set owner to init process 
- * 
+/** @brief set owner to init process
+ *
  * This makes the stream immune to orphan purging
  */
-imageID shmim_setowner_init(
-    const char *name
-)
+imageID shmim_setowner_init(const char *name)
 {
-    imageID    ID;
-  
-	ID = image_ID(name);
-	if(ID != -1) 
-	{
+    imageID ID;
+
+    ID = image_ID(name);
+    if (ID != -1)
+    {
         data.image[ID].md[0].ownerPID = 1;
-	}
-  
+    }
+
     return ID;
 }
diff --git a/src/COREMOD_memory/shmim_setowner.h b/src/COREMOD_memory/shmim_setowner.h
index 679f9ba4..add5703f 100644
--- a/src/COREMOD_memory/shmim_setowner.h
+++ b/src/COREMOD_memory/shmim_setowner.h
@@ -2,18 +2,10 @@
  * @file    shmim_setowner.h
  */
 
-imageID shmim_setowner_creator(
-    const char *name
-);
+imageID shmim_setowner_creator(const char *name);
 
+imageID shmim_setowner_current(const char *name);
 
-imageID shmim_setowner_current(
-    const char *name
-);
-
-imageID shmim_setowner_init(
-    const char *name
-);
-
+imageID shmim_setowner_init(const char *name);
 
 errno_t shmim_setowner_addCLIcmd();
diff --git a/src/COREMOD_memory/shmimlog.c b/src/COREMOD_memory/shmimlog.c
index b7a7d2cf..7011da66 100644
--- a/src/COREMOD_memory/shmimlog.c
+++ b/src/COREMOD_memory/shmimlog.c
@@ -1,73 +1,36 @@
 #define _GNU_SOURCE
 
 #include <fcntl.h>
-#include <sys/mman.h>
 #include <pthread.h>
-#include <sys/types.h>
+#include <sys/mman.h>
 #include <sys/stat.h>
+#include <sys/types.h>
 
 #include "CommandLineInterface/CLIcore.h"
-#include "shmimlog_types.h"
 #include "CommandLineInterface/timeutils.h"
+#include "shmimlog_types.h"
 
-
-
-#define likely(x)	__builtin_expect(!!(x), 1)
-#define unlikely(x)	__builtin_expect(!!(x), 0)
-
-
+#define likely(x) __builtin_expect(!!(x), 1)
+#define unlikely(x) __builtin_expect(!!(x), 0)
 
 // Local variables pointers
 static char *instreamname;
 static char *logdir;
 static long *logcubesize;
 
-
-
-
-
 // List of arguments to function
-static CLICMDARGDEF farg[] =
-{
-    {
-        CLIARG_IMG, ".in_sname", "input stream name", "im1",
-        CLIARG_VISIBLE_DEFAULT,
-        (void **) &instreamname, NULL
-    },
-    {
-        CLIARG_LONG, ".cubesize", "cube size", "10000",
-        CLIARG_VISIBLE_DEFAULT,
-        (void **) &logcubesize, NULL
-    },
-    {
-        CLIARG_STR, ".logdir", "log directory", "/media/data",
-        CLIARG_VISIBLE_DEFAULT,
-        (void **) &logdir, NULL
-    }
-};
-
+static CLICMDARGDEF farg[] = {
+    {CLIARG_IMG, ".in_sname", "input stream name", "im1", CLIARG_VISIBLE_DEFAULT, (void **)&instreamname, NULL},
+    {CLIARG_LONG, ".cubesize", "cube size", "10000", CLIARG_VISIBLE_DEFAULT, (void **)&logcubesize, NULL},
+    {CLIARG_STR, ".logdir", "log directory", "/media/data", CLIARG_VISIBLE_DEFAULT, (void **)&logdir, NULL}};
 
 // flag CLICMDFLAG_FPS enabled FPS capability
-static CLICMDDATA CLIcmddata =
-{
-    "shmimlog",
-    "log shared memory stream",
-    CLICMD_FIELDS_DEFAULTS
-};
-
-
-
-
+static CLICMDDATA CLIcmddata = {"shmimlog", "log shared memory stream", CLICMD_FIELDS_DEFAULTS};
 
 // Forward declarations
 
-static errno_t __attribute__((hot)) shmimlog2D(
-    const char *IDname,
-    uint32_t    zsize,
-    const char *logdir,
-    const char *IDlogdata_name
-);
-
+static errno_t __attribute__((hot))
+shmimlog2D(const char *IDname, uint32_t zsize, const char *logdir, const char *IDlogdata_name);
 
 // adding INSERT_STD_PROCINFO statements enable processinfo support
 static errno_t compute_function()
@@ -79,37 +42,27 @@ static errno_t compute_function()
     return RETURN_SUCCESS;
 }
 
-
-
 INSERT_STD_CLIfunction
 
-// Register function in CLI
-errno_t CLIADDCMD_COREMOD_memory__shmimlog()
+    // Register function in CLI
+    errno_t
+    CLIADDCMD_COREMOD_memory__shmimlog()
 {
     INSERT_STD_CLIREGISTERFUNC
 
     return RETURN_SUCCESS;
 }
 
-
-
-
-
-
-
-
 /** @brief creates logshimconf shared memory and loads it
  *
  */
-static LOGSHIM_CONF *shmimlog_create_SHMconf(
-    const char *logshimname
-)
+static LOGSHIM_CONF *shmimlog_create_SHMconf(const char *logshimname)
 {
-    int             SM_fd;
-    size_t          sharedsize = 0; // shared memory size in bytes
-    char            SM_fname[STRINGMAXLEN_FILENAME];
-    int             result;
-    LOGSHIM_CONF   *map;
+    int SM_fd;
+    size_t sharedsize = 0; // shared memory size in bytes
+    char SM_fname[STRINGMAXLEN_FILENAME];
+    int result;
+    LOGSHIM_CONF *map;
 
     sharedsize = sizeof(LOGSHIM_CONF);
 
@@ -117,7 +70,7 @@ static LOGSHIM_CONF *shmimlog_create_SHMconf(
 
     umask(0);
     SM_fd = open(SM_fname, O_RDWR | O_CREAT | O_TRUNC, (mode_t)0666);
-    if(SM_fd == -1)
+    if (SM_fd == -1)
     {
         printf("File \"%s\"\n", SM_fname);
         fflush(stdout);
@@ -126,7 +79,7 @@ static LOGSHIM_CONF *shmimlog_create_SHMconf(
     }
 
     result = lseek(SM_fd, sharedsize - 1, SEEK_SET);
-    if(result == -1)
+    if (result == -1)
     {
         close(SM_fd);
         PRINT_ERROR("Error calling lseek() to 'stretch' the file");
@@ -134,16 +87,15 @@ static LOGSHIM_CONF *shmimlog_create_SHMconf(
     }
 
     result = write(SM_fd, "", 1);
-    if(result != 1)
+    if (result != 1)
     {
         close(SM_fd);
         perror("Error writing last byte of the file");
         exit(0);
     }
 
-    map = (LOGSHIM_CONF *) mmap(0, sharedsize, PROT_READ | PROT_WRITE, MAP_SHARED,
-                                SM_fd, 0);
-    if(map == MAP_FAILED)
+    map = (LOGSHIM_CONF *)mmap(0, sharedsize, PROT_READ | PROT_WRITE, MAP_SHARED, SM_fd, 0);
+    if (map == MAP_FAILED)
     {
         close(SM_fd);
         perror("Error mmapping the file");
@@ -160,10 +112,6 @@ static LOGSHIM_CONF *shmimlog_create_SHMconf(
     return map;
 }
 
-
-
-
-
 /** @brief Logs a shared memory stream onto disk
  *
  * uses semlog semaphore
@@ -171,71 +119,64 @@ static LOGSHIM_CONF *shmimlog_create_SHMconf(
  * uses data cube buffer to store frames
  * if an image name logdata exists (should ideally be in shared mem), then this will be included in the timing txt file
  */
-static errno_t __attribute__((hot)) shmimlog2D(
-    const char *IDname,
-    uint32_t    zsize,
-    const char *logdir,
-    const char *IDlogdata_name
-)
+static errno_t __attribute__((hot))
+shmimlog2D(const char *IDname, uint32_t zsize, const char *logdir, const char *IDlogdata_name)
 {
     // WAIT time. If no new frame during this time, save existing cube
-    int        WaitSec = 5;
-
-    imageID    ID;
-    uint32_t   xsize;
-    uint32_t   ysize;
-    imageID    IDb;
-    imageID    IDb0;
-    imageID    IDb1;
-    long       index = 0;
-    unsigned long long       cnt = 0;
-    int        buffer;
-    uint8_t    datatype;
-    uint32_t  *imsizearray;
-    char       fname[200];
-    char       iname[200];
-
-    time_t          t;
-//    struct tm      *uttime;
-    struct tm      *uttimeStart;
+    int WaitSec = 5;
+
+    imageID ID;
+    uint32_t xsize;
+    uint32_t ysize;
+    imageID IDb;
+    imageID IDb0;
+    imageID IDb1;
+    long index = 0;
+    unsigned long long cnt = 0;
+    int buffer;
+    uint8_t datatype;
+    uint32_t *imsizearray;
+    char fname[200];
+    char iname[200];
+
+    time_t t;
+    //    struct tm      *uttime;
+    struct tm *uttimeStart;
     struct timespec ts;
     struct timespec timenow;
     struct timespec timenowStart;
-//    long            kw;
-    int             ret;
-    imageID         IDlogdata;
+    //    long            kw;
+    int ret;
+    imageID IDlogdata;
 
     char *ptr0_0; // source image data
     char *ptr1_0; // destination image data
-    char *ptr0; // source image data, after offset
-    char *ptr1; // destination image data, after offset
+    char *ptr0;   // source image data, after offset
+    char *ptr1;   // destination image data, after offset
 
     long framesize; // in bytes
 
-
-//    FILE *fp;
+    //    FILE *fp;
     char fnameascii[200];
 
-    pthread_t  thread_savefits;
-    int        tOK = 0;
-    int        iret_savefits;
+    pthread_t thread_savefits;
+    int tOK = 0;
+    int iret_savefits;
     STREAMSAVE_THREAD_MESSAGE *tmsg = malloc(sizeof(STREAMSAVE_THREAD_MESSAGE));
 
-
     long NBfiles = -1; // run forever
 
     long long cntwait;
-    long waitdelayus = 50;  // max speed = 20 kHz
+    long waitdelayus = 50;        // max speed = 20 kHz
     long long cntwaitlim = 10000; // 5 sec
     int wOK;
     int noframe;
 
-
     char logb0name[STRINGMAXLEN_STREAMNAME];
     char logb1name[STRINGMAXLEN_STREAMNAME];
 
     int is3Dcube = 0; // this is a rolling buffer
-//    int exitflag = 0; // toggles to 1 when loop must exit
+                      //    int exitflag = 0; // toggles to 1 when loop must exit
 
     LOGSHIM_CONF *logshimconf;
 
@@ -255,7 +196,6 @@ static errno_t __attribute__((hot)) shmimlog2D(
     int use_semlog;
     int semval;
 
-
     int VERBOSE = 0;
     // 0: don't print
     // 1: print statements outside fast loop
@@ -264,34 +204,28 @@ static errno_t __attribute__((hot)) shmimlog2D(
     // convert wait time into number of couunter steps (counter mode only)
     cntwaitlim = (long)(WaitSec * 1000000 / waitdelayus);
 
-
-
     schedpar.sched_priority = RT_priority;
-    if(seteuid(data.euid) != 0)     //This goes up to maximum privileges
+    if (seteuid(data.euid) != 0) //This goes up to maximum privileges
     {
         PRINT_ERROR("seteuid error");
     }
     sched_setscheduler(0, SCHED_FIFO,
                        &schedpar); //other option is SCHED_RR, might be faster
-    if(seteuid(data.ruid) != 0)     //Go back to normal privileges
+    if (seteuid(data.ruid) != 0)   //Go back to normal privileges
     {
         PRINT_ERROR("seteuid error");
     }
 
-
-
-
     IDlogdata = image_ID(IDlogdata_name);
-    if(IDlogdata != -1)
+    if (IDlogdata != -1)
     {
-        if(data.image[IDlogdata].md[0].datatype != _DATATYPE_FLOAT)
+        if (data.image[IDlogdata].md[0].datatype != _DATATYPE_FLOAT)
         {
             IDlogdata = -1;
         }
     }
     printf("log data name = %s\n", IDlogdata_name);
 
-
     logshimconf = shmimlog_create_SHMconf(IDname);
     logshimconf[0].on = 1;
     logshimconf[0].cnt = 0;
@@ -299,11 +233,7 @@ static errno_t __attribute__((hot)) shmimlog2D(
     logshimconf[0].logexit = 0;
     logshimconf[0].interval = 1;
 
-
-
-    imsizearray = (uint32_t *) malloc(sizeof(uint32_t) * 3);
-
-
+    imsizearray = (uint32_t *)malloc(sizeof(uint32_t) * 3);
 
     read_sharedmem_image(IDname);
     ID = image_ID(IDname);
@@ -311,12 +241,11 @@ static errno_t __attribute__((hot)) shmimlog2D(
     xsize = data.image[ID].md[0].size[0];
     ysize = data.image[ID].md[0].size[1];
 
-    if(data.image[ID].md[0].naxis == 3)
+    if (data.image[ID].md[0].naxis == 3)
     {
         is3Dcube = 1;
     }
 
-
     /** create the 2 buffers */
 
     imsizearray[0] = xsize;
@@ -331,72 +260,66 @@ static errno_t __attribute__((hot)) shmimlog2D(
     COREMOD_MEMORY_image_set_semflush(logb0name, -1);
     COREMOD_MEMORY_image_set_semflush(logb1name, -1);
 
+    array_time = (double *)malloc(sizeof(double) * zsize);
+    array_cnt0 = (uint64_t *)malloc(sizeof(uint64_t) * zsize);
+    array_cnt1 = (uint64_t *)malloc(sizeof(uint64_t) * zsize);
 
-    array_time = (double *) malloc(sizeof(double) * zsize);
-    array_cnt0 = (uint64_t *) malloc(sizeof(uint64_t) * zsize);
-    array_cnt1 = (uint64_t *) malloc(sizeof(uint64_t) * zsize);
-
-    array_time_cp = (double *) malloc(sizeof(double) * zsize);
-    array_cnt0_cp = (uint64_t *) malloc(sizeof(uint64_t) * zsize);
-    array_cnt1_cp = (uint64_t *) malloc(sizeof(uint64_t) * zsize);
-
+    array_time_cp = (double *)malloc(sizeof(double) * zsize);
+    array_cnt0_cp = (uint64_t *)malloc(sizeof(uint64_t) * zsize);
+    array_cnt1_cp = (uint64_t *)malloc(sizeof(uint64_t) * zsize);
 
     IDb = IDb0;
 
-    switch(datatype)
+    switch (datatype)
     {
-        case _DATATYPE_FLOAT:
-            framesize = SIZEOF_DATATYPE_FLOAT * xsize * ysize;
-            break;
+    case _DATATYPE_FLOAT:
+        framesize = SIZEOF_DATATYPE_FLOAT * xsize * ysize;
+        break;
 
-        case _DATATYPE_INT8:
-            framesize = SIZEOF_DATATYPE_INT8 * xsize * ysize;
-            break;
+    case _DATATYPE_INT8:
+        framesize = SIZEOF_DATATYPE_INT8 * xsize * ysize;
+        break;
 
-        case _DATATYPE_UINT8:
-            framesize = SIZEOF_DATATYPE_UINT8 * xsize * ysize;
-            break;
+    case _DATATYPE_UINT8:
+        framesize = SIZEOF_DATATYPE_UINT8 * xsize * ysize;
+        break;
 
-        case _DATATYPE_INT16:
-            framesize = SIZEOF_DATATYPE_INT16 * xsize * ysize;
-            break;
+    case _DATATYPE_INT16:
+        framesize = SIZEOF_DATATYPE_INT16 * xsize * ysize;
+        break;
 
-        case _DATATYPE_UINT16:
-            framesize = SIZEOF_DATATYPE_UINT16 * xsize * ysize;
-            break;
+    case _DATATYPE_UINT16:
+        framesize = SIZEOF_DATATYPE_UINT16 * xsize * ysize;
+        break;
 
-        case _DATATYPE_INT32:
-            framesize = SIZEOF_DATATYPE_INT32 * xsize * ysize;
-            break;
+    case _DATATYPE_INT32:
+        framesize = SIZEOF_DATATYPE_INT32 * xsize * ysize;
+        break;
 
-        case _DATATYPE_UINT32:
-            framesize = SIZEOF_DATATYPE_UINT32 * xsize * ysize;
-            break;
+    case _DATATYPE_UINT32:
+        framesize = SIZEOF_DATATYPE_UINT32 * xsize * ysize;
+        break;
 
-        case _DATATYPE_INT64:
-            framesize = SIZEOF_DATATYPE_INT64 * xsize * ysize;
-            break;
+    case _DATATYPE_INT64:
+        framesize = SIZEOF_DATATYPE_INT64 * xsize * ysize;
+        break;
 
-        case _DATATYPE_UINT64:
-            framesize = SIZEOF_DATATYPE_UINT64 * xsize * ysize;
-            break;
+    case _DATATYPE_UINT64:
+        framesize = SIZEOF_DATATYPE_UINT64 * xsize * ysize;
+        break;
 
+    case _DATATYPE_DOUBLE:
+        framesize = SIZEOF_DATATYPE_DOUBLE * xsize * ysize;
+        break;
 
-        case _DATATYPE_DOUBLE:
-            framesize = SIZEOF_DATATYPE_DOUBLE * xsize * ysize;
-            break;
-
-        default:
-            printf("ERROR: WRONG DATA TYPE\n");
-            exit(0);
-            break;
+    default:
+        printf("ERROR: WRONG DATA TYPE\n");
+        exit(0);
+        break;
     }
 
-    ptr0_0 = (char *) data.image[ID].array.raw;
-    ptr1_0 = (char *) data.image[IDb].array.raw;
-
-
-
+    ptr0_0 = (char *)data.image[ID].array.raw;
+    ptr1_0 = (char *)data.image[IDb].array.raw;
 
     cnt = data.image[ID].md[0].cnt0 - 1;
 
@@ -408,43 +331,38 @@ static errno_t __attribute__((hot)) shmimlog2D(
 
     // exitflag = 0;
 
-
     // initialize circuler buffer vars
     logshimconf->CBsize = data.image[ID].md->CBsize;
     logshimconf->CBindex = data.image[ID].md->CBindex;
     logshimconf->CBcycle = data.image[ID].md->CBcycle;
 
-
     // using semlog ?
     use_semlog = 0;
-    if(data.image[ID].semlog != NULL)
+    if (data.image[ID].semlog != NULL)
     {
         use_semlog = 1;
         sem_getvalue(data.image[ID].semlog, &semval);
 
         // bring semaphore value to 1 to only save 1 frame
-        while(semval > 1)
+        while (semval > 1)
         {
             sem_wait(data.image[ID].semlog);
             sem_getvalue(data.image[ID].semlog, &semval);
         }
-        if(semval == 0)
+        if (semval == 0)
         {
             sem_post(data.image[ID].semlog);
         }
     }
 
-
     DEBUG_TRACEPOINT(" ");
 
-
-
     int SkipWait = 0; // wait for update
-    while((logshimconf[0].filecnt != NBfiles) && (logshimconf[0].logexit == 0))
+    while ((logshimconf[0].filecnt != NBfiles) && (logshimconf[0].logexit == 0))
     {
         int timeout; // 1 if timeout has occurred
 
-        if(logshimconf[0].filecnt == 3)
+        if (logshimconf[0].filecnt == 3)
         {
             //test
             logshimconf[0].on = 0;
@@ -454,16 +372,15 @@ static errno_t __attribute__((hot)) shmimlog2D(
         noframe = 0;
         wOK = 1;
 
-        if(VERBOSE > 1)
+        if (VERBOSE > 1)
         {
             printf("%5d  Entering wait loop   index = %ld %d\n", __LINE__, index, noframe);
         }
 
         timeout = 0;
 
-
         // Keep CPU load light when not logging
-        if(logshimconf[0].on == 0)
+        if (logshimconf[0].on == 0)
         {
             float tdelay_us = 100.0; // 10 kHz
             struct timespec tdel;
@@ -473,13 +390,11 @@ static errno_t __attribute__((hot)) shmimlog2D(
             nanosleep(&tdel, NULL);
         }
 
-
-
-        if(SkipWait == 1)
+        if (SkipWait == 1)
         {
-            if(VERBOSE > 0)
+            if (VERBOSE > 0)
             {
-                if(logshimconf[0].on == 1)
+                if (logshimconf[0].on == 1)
                 {
                     printf(">>>>>>> SKIPPING WAIT >>>>>>>>\n");
                 }
@@ -487,14 +402,14 @@ static errno_t __attribute__((hot)) shmimlog2D(
         }
         else
         {
-            if(likely(use_semlog == 1))
+            if (likely(use_semlog == 1))
             {
-                if(VERBOSE > 1)
+                if (VERBOSE > 1)
                 {
                     printf("%5d  Waiting for semaphore\n", __LINE__);
                 }
 
-                if(clock_gettime(CLOCK_REALTIME, &ts) == -1)
+                if (clock_gettime(CLOCK_REALTIME, &ts) == -1)
                 {
                     perror("clock_gettime");
                     exit(EXIT_FAILURE);
@@ -502,16 +417,14 @@ static errno_t __attribute__((hot)) shmimlog2D(
                 ts.tv_sec += WaitSec;
 
                 ret = sem_timedwait(data.image[ID].semlog, &ts);
-                if(ret == -1)
+                if (ret == -1)
                 {
-                    if(errno == ETIMEDOUT)
+                    if (errno == ETIMEDOUT)
                     {
-                        printf("%5d  sem_timedwait() timed out (%d sec) -[index %ld]\n", __LINE__,
-                               WaitSec, index);
-                        if(VERBOSE > 0)
+                        printf("%5d  sem_timedwait() timed out (%d sec) -[index %ld]\n", __LINE__, WaitSec, index);
+                        if (VERBOSE > 0)
                         {
-                            printf("%5d  sem time elapsed -> Save current cube [index %ld]\n", __LINE__,
-                                   index);
+                            printf("%5d  sem time elapsed -> Save current cube [index %ld]\n", __LINE__, index);
                         }
 
                         strcpy(tmsg->iname, iname);
@@ -519,9 +432,9 @@ static errno_t __attribute__((hot)) shmimlog2D(
                         tmsg->partial = 1; // partial cube
                         tmsg->cubesize = index;
 
-                        memcpy(array_time_cp, array_time, sizeof(double)*index);
-                        memcpy(array_cnt0_cp, array_cnt0, sizeof(uint64_t)*index);
-                        memcpy(array_cnt1_cp, array_cnt1, sizeof(uint64_t)*index);
+                        memcpy(array_time_cp, array_time, sizeof(double) * index);
+                        memcpy(array_cnt0_cp, array_cnt0, sizeof(uint64_t) * index);
+                        memcpy(array_cnt1_cp, array_cnt1, sizeof(uint64_t) * index);
 
                         tmsg->arrayindex = array_cnt0_cp;
                         tmsg->arraycnt0 = array_cnt0_cp;
@@ -530,28 +443,28 @@ static errno_t __attribute__((hot)) shmimlog2D(
 
                         timeout = 1;
                     }
-                    if(errno == EINTR)
+                    if (errno == EINTR)
                     {
                         printf("%5d  sem_timedwait [index %ld]: The call was interrupted by a signal handler\n",
                                __LINE__, index);
                     }
 
-                    if(errno == EINVAL)
+                    if (errno == EINVAL)
                     {
-                        printf("%5d  sem_timedwait [index %ld]: Not a valid semaphore\n", __LINE__,
-                               index);
-                        printf("               The value of abs_timeout.tv_nsecs is less than 0, or greater than or equal to 1000 million\n");
+                        printf("%5d  sem_timedwait [index %ld]: Not a valid semaphore\n", __LINE__, index);
+                        printf("               The value of abs_timeout.tv_nsecs is less than 0, or greater than or "
+                               "equal to 1000 million\n");
                     }
 
-                    if(errno == EAGAIN)
+                    if (errno == EAGAIN)
                     {
-                        printf("%5d  sem_timedwait [index %ld]: The operation could not be performed without blocking (i.e., the semaphore currently has the value zero)\n",
+                        printf("%5d  sem_timedwait [index %ld]: The operation could not be performed without blocking "
+                               "(i.e., the semaphore currently has the value zero)\n",
                                __LINE__, index);
                     }
 
-
                     wOK = 0;
-                    if(index == 0)
+                    if (index == 0)
                     {
                         noframe = 1;
                     }
@@ -560,19 +473,17 @@ static errno_t __attribute__((hot)) shmimlog2D(
                         noframe = 0;
                     }
                 }
-
             }
             else
             {
-                if(VERBOSE > 1)
+                if (VERBOSE > 1)
                 {
                     printf("%5d  Not using semaphore, watching counter\n", __LINE__);
                 }
 
-                while(((cnt == data.image[ID].md[0].cnt0) || (logshimconf[0].on == 0))
-                        && (wOK == 1))
+                while (((cnt == data.image[ID].md[0].cnt0) || (logshimconf[0].on == 0)) && (wOK == 1))
                 {
-                    if(VERBOSE > 1)
+                    if (VERBOSE > 1)
                     {
                         printf("%5d  waiting time step\n", __LINE__);
                     }
@@ -580,28 +491,27 @@ static errno_t __attribute__((hot)) shmimlog2D(
                     usleep(waitdelayus);
                     cntwait++;
 
-                    if(VERBOSE > 1)
+                    if (VERBOSE > 1)
                     {
                         printf("%5d  cntwait = %lld\n", __LINE__, cntwait);
                         fflush(stdout);
                     }
 
-                    if(cntwait > cntwaitlim) // save current cube
+                    if (cntwait > cntwaitlim) // save current cube
                     {
-                        if(VERBOSE > 0)
+                        if (VERBOSE > 0)
                         {
                             printf("%5d  cnt time elapsed -> Save current cube\n", __LINE__);
                         }
 
-
                         strcpy(tmsg->iname, iname);
                         strcpy(tmsg->fname, fname);
                         tmsg->partial = 1; // partial cube
                         tmsg->cubesize = index;
 
-                        memcpy(array_time_cp, array_time, sizeof(double)*index);
-                        memcpy(array_cnt0_cp, array_cnt0, sizeof(uint64_t)*index);
-                        memcpy(array_cnt1_cp, array_cnt1, sizeof(uint64_t)*index);
+                        memcpy(array_time_cp, array_time, sizeof(double) * index);
+                        memcpy(array_cnt0_cp, array_cnt0, sizeof(uint64_t) * index);
+                        memcpy(array_cnt1_cp, array_cnt1, sizeof(uint64_t) * index);
 
                         tmsg->arrayindex = array_cnt0_cp;
                         tmsg->arraycnt0 = array_cnt0_cp;
@@ -609,7 +519,7 @@ static errno_t __attribute__((hot)) shmimlog2D(
                         tmsg->arraytime = array_time_cp;
 
                         wOK = 0;
-                        if(index == 0)
+                        if (index == 0)
                         {
                             noframe = 1;
                         }
@@ -624,10 +534,9 @@ static errno_t __attribute__((hot)) shmimlog2D(
 
         DEBUG_TRACEPOINT(" ");
 
-
-        if(index == 0)
+        if (index == 0)
         {
-            if(VERBOSE > 0)
+            if (VERBOSE > 0)
             {
                 printf("%5d  Setting cube start time [index %ld]\n", __LINE__, index);
             }
@@ -641,19 +550,18 @@ static errno_t __attribute__((hot)) shmimlog2D(
             //            sprintf(fnameascii,"%s/%s_%02d:%02d:%02ld.%09ld.txt", logdir, IDname, uttime->tm_hour, uttime->tm_min, timenow.tv_sec % 60, timenow.tv_nsec);
         }
 
-
-        if(VERBOSE > 1)
+        if (VERBOSE > 1)
         {
             printf("%5d  logshimconf[0].on = %d\n", __LINE__, logshimconf[0].on);
         }
 
         DEBUG_TRACEPOINT(" ");
 
-        if(likely(logshimconf[0].on == 1))
+        if (likely(logshimconf[0].on == 1))
         {
-            if(likely(wOK == 1)) // normal step: a frame has arrived
+            if (likely(wOK == 1)) // normal step: a frame has arrived
             {
-                if(VERBOSE > 1)
+                if (VERBOSE > 1)
                 {
                     printf("%5d  Frame has arrived [index %ld]\n", __LINE__, index);
                 }
@@ -672,67 +580,54 @@ static errno_t __attribute__((hot)) shmimlog2D(
                 long grabStart1 = 0;
                 long grabEnd1 = 0;
 
-                if(data.image[ID].md->CBsize > 0)
+                if (data.image[ID].md->CBsize > 0)
                 {
-                    if(VERBOSE > 0)
+                    if (VERBOSE > 0)
                     {
                         printf("\n");
 
-                        printf("    LAST SAVED          [%8ld %3ld]\n",
-                               logshimconf->CBcycle,
-                               (long) logshimconf->CBindex
-                              );
+                        printf("    LAST SAVED          [%8ld %3ld]\n", logshimconf->CBcycle,
+                               (long)logshimconf->CBindex);
                     }
                     long currentCBcycle = data.image[ID].md->CBcycle;
                     long currentCBindex = data.image[ID].md->CBindex;
 
-                    if(VERBOSE > 0)
+                    if (VERBOSE > 0)
                     {
-                        printf("    LAST WRITTEN IN CB  [%8ld %3ld]\n",
-                               (long) currentCBcycle,
-                               (long) currentCBindex
-                              );
+                        printf("    LAST WRITTEN IN CB  [%8ld %3ld]\n", (long)currentCBcycle, (long)currentCBindex);
                     }
 
-                    long CBcyclediff = (long) currentCBcycle
-                                       - (long) logshimconf->CBcycle;
-
-                    long CBindexdiff = (long) currentCBindex
-                                       - (long) logshimconf->CBindex;
+                    long CBcyclediff = (long)currentCBcycle - (long)logshimconf->CBcycle;
 
+                    long CBindexdiff = (long)currentCBindex - (long)logshimconf->CBindex;
 
                     // number of frames behind
-                    long NBframesbehind =
-                        (long)(CBcyclediff * (long) data.image[ID].md->CBsize
-                               + CBindexdiff);
+                    long NBframesbehind = (long)(CBcyclediff * (long)data.image[ID].md->CBsize + CBindexdiff);
 
-                    if(VERBOSE > 0)
+                    if (VERBOSE > 0)
                     {
-                        printf("    DIFF                [%8ld %3ld]    %8ld frames\n",
-                               CBcyclediff,
-                               CBindexdiff,
-                               NBframesbehind
-                              );
+                        printf("    DIFF                [%8ld %3ld]    %8ld frames\n", CBcyclediff, CBindexdiff,
+                               NBframesbehind);
                     }
 
                     long NBgrabmax = 20;
                     NBgrab = NBframesbehind;
-                    if(NBgrab > NBgrabmax)
+                    if (NBgrab > NBgrabmax)
                     {
                         NBgrab = NBgrabmax;
                     }
                     // avoid crossing big cube boundary
-                    long grabmax_logbuff =  zsize - index;
+                    long grabmax_logbuff = zsize - index;
 
-                    if(VERBOSE > 0)
+                    if (VERBOSE > 0)
                     {
                         printf("    -> GRABBING %4ld frames (max %6ld) -> ", NBgrab, grabmax_logbuff);
                     }
-                    if(NBgrab > grabmax_logbuff)
+                    if (NBgrab > grabmax_logbuff)
                     {
                         NBgrab = grabmax_logbuff;
                     }
-                    if(VERBOSE > 0)
+                    if (VERBOSE > 0)
                     {
                         printf("%6ld\n", NBgrab);
                     }
@@ -742,56 +637,49 @@ static errno_t __attribute__((hot)) shmimlog2D(
                     long grabEnd = currentCBindex;
 
                     grabStart0 = 0;
-                    grabEnd0   = 0;
-                    grabSpan0  = 0;
+                    grabEnd0 = 0;
+                    grabSpan0 = 0;
 
                     grabStart1 = 0;
-                    grabEnd1   = 0;
-                    grabSpan1  = 0;
-
+                    grabEnd1 = 0;
+                    grabSpan1 = 0;
 
-                    if(grabStart < 0)
+                    if (grabStart < 0)
                     {
                         grabStart0 = grabStart + data.image[ID].md->CBsize;
-                        grabEnd0   = data.image[ID].md->CBsize - 1;
-                        grabSpan0  = grabEnd0 - grabStart0 + 1;
+                        grabEnd0 = data.image[ID].md->CBsize - 1;
+                        grabSpan0 = grabEnd0 - grabStart0 + 1;
 
                         grabStart1 = 0;
-                        grabEnd1   = grabEnd;
-                        grabSpan1  = grabEnd1 - grabStart1 + 1;
+                        grabEnd1 = grabEnd;
+                        grabSpan1 = grabEnd1 - grabStart1 + 1;
                     }
                     else
                     {
                         grabStart0 = grabStart;
-                        grabEnd0   = grabEnd;
-                        grabSpan0  = grabEnd0 - grabStart0 + 1;
+                        grabEnd0 = grabEnd;
+                        grabSpan0 = grabEnd0 - grabStart0 + 1;
 
                         grabStart1 = 0;
-                        grabEnd1   = 0;
-                        grabSpan1  = 0;
+                        grabEnd1 = 0;
+                        grabSpan1 = 0;
                     }
 
-
                     index0start = index;
                     index0end = index0start + (grabSpan0 - 1);
                     index1start = index0end + 1;
                     index1end = index1start + (grabSpan1 - 1);
 
-                    if(VERBOSE > 0)
+                    if (VERBOSE > 0)
                     {
                         printf("    CB BUFFER RANGE     %3ld -> %3ld\n", grabStart, grabEnd);
 
-                        printf("     GRAB RANGE %3ld %3ld  (%3ld) ->  %6ld %6ld\n",
-                               grabStart0, grabEnd0,
-                               grabSpan0,
+                        printf("     GRAB RANGE %3ld %3ld  (%3ld) ->  %6ld %6ld\n", grabStart0, grabEnd0, grabSpan0,
                                index0start, index0end);
-                        printf("     GRAB RANGE %3ld %3ld  (%3ld) ->  %6ld %6ld\n",
-                               grabStart1, grabEnd1,
-                               grabSpan1,
+                        printf("     GRAB RANGE %3ld %3ld  (%3ld) ->  %6ld %6ld\n", grabStart1, grabEnd1, grabSpan1,
                                index1start, index1end);
                     }
 
-
                     // update last saved
                     logshimconf->CBcycle = currentCBcycle;
                     logshimconf->CBindex = currentCBindex;
@@ -799,9 +687,7 @@ static errno_t __attribute__((hot)) shmimlog2D(
                     // total number of frames grabbed
                     NBgrab = grabSpan0 + grabSpan1;
 
-
-
-                    if(NBframesbehind > 1)
+                    if (NBframesbehind > 1)
                     {
                         SkipWait = 1; // don't wait, proceed to grab next frame
                     }
@@ -817,46 +703,41 @@ static errno_t __attribute__((hot)) shmimlog2D(
                     NBgrab = 1;
                 }
 
-
                 /// measure time
                 //   t = time(NULL);
                 //   uttime = gmtime(&t);
 
                 clock_gettime(CLOCK_REALTIME, &timenow);
 
-
                 DEBUG_TRACEPOINT(" ");
 
-
-
                 // memcpy
                 //
-                if(data.image[ID].md->CBsize > 0) // circ buffer mode
+                if (data.image[ID].md->CBsize > 0) // circ buffer mode
                 {
 
-
-                    if(grabSpan0 > 0)
+                    if (grabSpan0 > 0)
                     {
                         // source
-                        ptr0 = (char *) data.image[ID].CBimdata;
+                        ptr0 = (char *)data.image[ID].CBimdata;
                         ptr0 += data.image[ID].md->imdatamemsize * grabStart0;
 
                         // destination
                         ptr1 = ptr1_0 + framesize * index0start;
 
-                        memcpy((void *) ptr1, (void *) ptr0, framesize * grabSpan0);
+                        memcpy((void *)ptr1, (void *)ptr0, framesize * grabSpan0);
                     }
 
-                    if(grabSpan1 > 0)
+                    if (grabSpan1 > 0)
                     {
                         // source
-                        ptr0 = (char *) data.image[ID].CBimdata;
+                        ptr0 = (char *)data.image[ID].CBimdata;
                         ptr0 += data.image[ID].md->imdatamemsize * grabStart1;
 
                         // destination
                         ptr1 = ptr1_0 + framesize * index1start;
 
-                        memcpy((void *) ptr1, (void *) ptr0, framesize * grabSpan1);
+                        memcpy((void *)ptr1, (void *)ptr0, framesize * grabSpan1);
                     }
                     index += NBgrab;
                 }
@@ -865,7 +746,7 @@ static errno_t __attribute__((hot)) shmimlog2D(
                     // no circular buffer
 
                     // source
-                    if(is3Dcube == 1)
+                    if (is3Dcube == 1)
                     {
                         ptr0 = ptr0_0 + framesize * data.image[ID].md[0].cnt1;
                     }
@@ -877,9 +758,9 @@ static errno_t __attribute__((hot)) shmimlog2D(
                     // destination
                     ptr1 = ptr1_0 + framesize * index;
 
-                    if(NBgrab > 0)
+                    if (NBgrab > 0)
                     {
-                        memcpy((void *) ptr1, (void *) ptr0, framesize * NBgrab);
+                        memcpy((void *)ptr1, (void *)ptr0, framesize * NBgrab);
                         array_cnt0[index] = data.image[ID].md[0].cnt0;
                         array_cnt1[index] = data.image[ID].md[0].cnt1;
                         array_time[index] = timenow.tv_sec + 1.0e-9 * timenow.tv_nsec;
@@ -887,10 +768,7 @@ static errno_t __attribute__((hot)) shmimlog2D(
                     index += NBgrab;
                 }
 
-
                 DEBUG_TRACEPOINT(" ");
-
-
             }
         }
         else
@@ -898,39 +776,30 @@ static errno_t __attribute__((hot)) shmimlog2D(
             // save partial if possible
             //if(index>0)
             wOK = 0;
-
         }
 
-
-        if(VERBOSE > 1)
+        if (VERBOSE > 1)
         {
             printf("%5d  index = %ld  wOK = %d\n", __LINE__, index, wOK);
         }
 
-
-
-
-
-
-
-
         // SAVE CUBE TO DISK
         /// cases:
         /// index>zsize-1  buffer full
         /// timeout==1 && index>0  : partial
-        if((index > zsize - 1)  || ((timeout == 1) && (index > 0)))
+        if ((index > zsize - 1) || ((timeout == 1) && (index > 0)))
         {
             long NBframemissing;
 
             /// save image
-            if(VERBOSE > 0)
+            if (VERBOSE > 0)
             {
-                printf("%5d  Save image   [index  %ld]  [timeout %d] [zsize %ld]\n", __LINE__,
-                       index, timeout, (long) zsize);
+                printf("%5d  Save image   [index  %ld]  [timeout %d] [zsize %ld]\n", __LINE__, index, timeout,
+                       (long)zsize);
             }
 
             sprintf(iname, "%s_logbuff%d", IDname, buffer);
-            if(buffer == 0)
+            if (buffer == 0)
             {
                 IDb = IDb0;
             }
@@ -939,69 +808,58 @@ static errno_t __attribute__((hot)) shmimlog2D(
                 IDb = IDb1;
             }
 
-
-            if(VERBOSE > 0)
+            if (VERBOSE > 0)
             {
                 printf("%5d  Building file name: ascii\n", __LINE__);
                 fflush(stdout);
             }
 
-            sprintf(fnameascii, "%s/%s.%04d%02d%02dT%02d%02d%02ld.%09ldZ.txt", logdir,
-                    IDname,
-                    1900 + uttimeStart->tm_year, 1 + uttimeStart->tm_mon, uttimeStart->tm_mday,
-                    uttimeStart->tm_hour, uttimeStart->tm_min, timenowStart.tv_sec % 60,
-                    timenowStart.tv_nsec);
-
+            sprintf(fnameascii, "%s/%s.%04d%02d%02dT%02d%02d%02ld.%09ldZ.txt", logdir, IDname,
+                    1900 + uttimeStart->tm_year, 1 + uttimeStart->tm_mon, uttimeStart->tm_mday, uttimeStart->tm_hour,
+                    uttimeStart->tm_min, timenowStart.tv_sec % 60, timenowStart.tv_nsec);
 
-            if(VERBOSE > 0)
+            if (VERBOSE > 0)
             {
                 printf("%5d  Building file name: fits\n", __LINE__);
                 fflush(stdout);
             }
-            sprintf(fname, "%s/%s.%04d%02d%02dT%02d%02d%02ld.%09ldZ.fits", logdir, IDname,
-                    1900 + uttimeStart->tm_year, 1 + uttimeStart->tm_mon, uttimeStart->tm_mday,
-                    uttimeStart->tm_hour, uttimeStart->tm_min, timenowStart.tv_sec % 60,
-                    timenowStart.tv_nsec);
-
-
+            sprintf(fname, "%s/%s.%04d%02d%02dT%02d%02d%02ld.%09ldZ.fits", logdir, IDname, 1900 + uttimeStart->tm_year,
+                    1 + uttimeStart->tm_mon, uttimeStart->tm_mday, uttimeStart->tm_hour, uttimeStart->tm_min,
+                    timenowStart.tv_sec % 60, timenowStart.tv_nsec);
 
             strcpy(tmsg->iname, iname);
             strcpy(tmsg->fname, fname);
             strcpy(tmsg->fnameascii, fnameascii);
             tmsg->saveascii = 1;
 
-
-
-            if(wOK == 1) // full cube
+            if (wOK == 1) // full cube
             {
                 tmsg->partial = 0; // full cube
-                if(VERBOSE > 0)
+                if (VERBOSE > 0)
                 {
                     printf("%5d  SAVING FULL CUBE\n", __LINE__);
                     fflush(stdout);
                 }
-
             }
             else // partial cube
             {
                 tmsg->partial = 1; // partial cube
-                if(VERBOSE > 0)
+                if (VERBOSE > 0)
                 {
                     printf("%5d  SAVING PARTIAL CUBE\n", __LINE__);
                     fflush(stdout);
                 }
             }
 
-
             //  fclose(fp);
 
             // Wait for save thread to complete to launch next one
-            if(tOK == 1)
+            if (tOK == 1)
             {
-                if(pthread_tryjoin_np(thread_savefits, NULL) == EBUSY)
+                if (pthread_tryjoin_np(thread_savefits, NULL) == EBUSY)
                 {
                     VERBOSE = 1;
-                    if(VERBOSE > 0)
+                    if (VERBOSE > 0)
                     {
                         printf("%5d  PREVIOUS SAVE THREAD NOT TERMINATED -> waiting\n", __LINE__);
                     }
@@ -1015,38 +873,36 @@ static errno_t __attribute__((hot)) shmimlog2D(
                     tdiff = timespec_diff(t0, t1);
                     printf("WAITED %ld.%09ld sec\n", tdiff.tv_sec, tdiff.tv_nsec);
 
-                    if(VERBOSE > 0)
+                    if (VERBOSE > 0)
                     {
                         printf("%5d  PREVIOUS SAVE THREAD NOW COMPLETED -> continuing\n", __LINE__);
                     }
                 }
-                else if(VERBOSE > 0)
+                else if (VERBOSE > 0)
                 {
                     printf("%5d  PREVIOUS SAVE THREAD ALREADY COMPLETED -> OK\n", __LINE__);
                 }
                 VERBOSE = 0;
             }
 
-
             COREMOD_MEMORY_image_set_sempost_byID(IDb, -1);
             data.image[IDb].md[0].cnt0++;
             data.image[IDb].md[0].write = 0;
 
-
             tmsg->cubesize = index;
             strcpy(tmsg->iname, iname);
-            memcpy(array_time_cp, array_time, sizeof(double)*index);
-            memcpy(array_cnt0_cp, array_cnt0, sizeof(uint64_t)*index);
-            memcpy(array_cnt1_cp, array_cnt1, sizeof(uint64_t)*index);
+            memcpy(array_time_cp, array_time, sizeof(double) * index);
+            memcpy(array_cnt0_cp, array_cnt0, sizeof(uint64_t) * index);
+            memcpy(array_cnt1_cp, array_cnt1, sizeof(uint64_t) * index);
 
             NBframemissing = (array_cnt0[index - 1] - array_cnt0[0]) - (index - 1);
 
-            printf("=== %6ld %6ld  %6ld   %6ld ====\n", array_cnt0[0],
-                   array_cnt0[index - 1], index, array_cnt0[index - 1] - array_cnt0[0]);
-            printf("===== CUBE %8lld   Number of missed frames = %8ld  / %ld  / %8ld ====\n",
-                   logshimconf[0].filecnt, NBframemissing, index, (long) zsize);
+            printf("=== %6ld %6ld  %6ld   %6ld ====\n", array_cnt0[0], array_cnt0[index - 1], index,
+                   array_cnt0[index - 1] - array_cnt0[0]);
+            printf("===== CUBE %8lld   Number of missed frames = %8ld  / %ld  / %8ld ====\n", logshimconf[0].filecnt,
+                   NBframemissing, index, (long)zsize);
 
-            if(VERBOSE > 0)
+            if (VERBOSE > 0)
             {
                 printf("%5d  Starting image save thread\n", __LINE__);
                 fflush(stdout);
@@ -1056,17 +912,13 @@ static errno_t __attribute__((hot)) shmimlog2D(
             tmsg->arraycnt0 = array_cnt0_cp;
             tmsg->arraycnt1 = array_cnt1_cp;
             tmsg->arraytime = array_time_cp;
-            WRITE_FULLFILENAME(tmsg->fname_auxFITSheader,
-                               "%s/%s.auxFITSheader.shm",
-                               data.shmdir,
-                               IDname);
-            iret_savefits = pthread_create(&thread_savefits, NULL, save_fits_function,
-                                           tmsg);
+            WRITE_FULLFILENAME(tmsg->fname_auxFITSheader, "%s/%s.auxFITSheader.shm", data.shmdir, IDname);
+            iret_savefits = pthread_create(&thread_savefits, NULL, save_fits_function, tmsg);
 
-            logshimconf[0].cnt ++;
+            logshimconf[0].cnt++;
 
             tOK = 1;
-            if(iret_savefits)
+            if (iret_savefits)
             {
                 fprintf(stderr, "Error - pthread_create() return code: %d\n", iret_savefits);
                 exit(EXIT_FAILURE);
@@ -1074,13 +926,13 @@ static errno_t __attribute__((hot)) shmimlog2D(
 
             index = 0;
             buffer++;
-            if(buffer == 2)
+            if (buffer == 2)
             {
                 buffer = 0;
             }
             //            printf("[%ld -> %d]", cnt, buffer);
             //           fflush(stdout);
-            if(buffer == 0)
+            if (buffer == 0)
             {
                 IDb = IDb0;
             }
@@ -1089,51 +941,51 @@ static errno_t __attribute__((hot)) shmimlog2D(
                 IDb = IDb1;
             }
 
-            switch(datatype)
+            switch (datatype)
             {
-                case _DATATYPE_FLOAT:
-                    ptr1_0 = (char *) data.image[IDb].array.F;
-                    break;
+            case _DATATYPE_FLOAT:
+                ptr1_0 = (char *)data.image[IDb].array.F;
+                break;
 
-                case _DATATYPE_INT8:
-                    ptr1_0 = (char *) data.image[IDb].array.SI8;
-                    break;
+            case _DATATYPE_INT8:
+                ptr1_0 = (char *)data.image[IDb].array.SI8;
+                break;
 
-                case _DATATYPE_UINT8:
-                    ptr1_0 = (char *) data.image[IDb].array.UI8;
-                    break;
+            case _DATATYPE_UINT8:
+                ptr1_0 = (char *)data.image[IDb].array.UI8;
+                break;
 
-                case _DATATYPE_INT16:
-                    ptr1_0 = (char *) data.image[IDb].array.SI16;
-                    break;
+            case _DATATYPE_INT16:
+                ptr1_0 = (char *)data.image[IDb].array.SI16;
+                break;
 
-                case _DATATYPE_UINT16:
-                    ptr1_0 = (char *) data.image[IDb].array.UI16;
-                    break;
+            case _DATATYPE_UINT16:
+                ptr1_0 = (char *)data.image[IDb].array.UI16;
+                break;
 
-                case _DATATYPE_INT32:
-                    ptr1_0 = (char *) data.image[IDb].array.SI32;
-                    break;
+            case _DATATYPE_INT32:
+                ptr1_0 = (char *)data.image[IDb].array.SI32;
+                break;
 
-                case _DATATYPE_UINT32:
-                    ptr1_0 = (char *) data.image[IDb].array.UI32;
-                    break;
+            case _DATATYPE_UINT32:
+                ptr1_0 = (char *)data.image[IDb].array.UI32;
+                break;
 
-                case _DATATYPE_INT64:
-                    ptr1_0 = (char *) data.image[IDb].array.SI64;
-                    break;
+            case _DATATYPE_INT64:
+                ptr1_0 = (char *)data.image[IDb].array.SI64;
+                break;
 
-                case _DATATYPE_UINT64:
-                    ptr1_0 = (char *) data.image[IDb].array.UI64;
-                    break;
+            case _DATATYPE_UINT64:
+                ptr1_0 = (char *)data.image[IDb].array.UI64;
+                break;
 
-                case _DATATYPE_DOUBLE:
-                    ptr1_0 = (char *) data.image[IDb].array.D;
-                    break;
+            case _DATATYPE_DOUBLE:
+                ptr1_0 = (char *)data.image[IDb].array.D;
+                break;
             }
 
             data.image[IDb].md[0].write = 1;
-            logshimconf[0].filecnt ++;
+            logshimconf[0].filecnt++;
         }
         cnt = data.image[ID].md[0].cnt0;
     }
@@ -1151,17 +1003,3 @@ static errno_t __attribute__((hot)) shmimlog2D(
 
     return RETURN_SUCCESS;
 }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/COREMOD_memory/shmimlog_types.h b/src/COREMOD_memory/shmimlog_types.h
index 13492580..02cc226e 100644
--- a/src/COREMOD_memory/shmimlog_types.h
+++ b/src/COREMOD_memory/shmimlog_types.h
@@ -7,12 +7,11 @@
 #ifndef CLICORE_MEMORY_LOGSHMIM_TYPES_H
 #define CLICORE_MEMORY_LOGSHMIM_TYPES_H
 
-
 typedef struct
 {
     char iname[100];
     char fname[200];
-    int partial; // 1 if partial cube
+    int partial;   // 1 if partial cube
     long cubesize; // size of the cube
 
     int saveascii;
@@ -20,34 +19,30 @@ typedef struct
     // 1 : Saving ascii: arraycnt0, arraycnt1, arraytime
     // 2 : ???
 
-    char      fname_auxFITSheader[STRINGMAXLEN_FILENAME];
+    char fname_auxFITSheader[STRINGMAXLEN_FILENAME];
 
-    char      fnameascii[STRINGMAXLEN_FILENAME];  // name of frame to be saved
+    char fnameascii[STRINGMAXLEN_FILENAME]; // name of frame to be saved
     uint64_t *arrayindex;
     uint64_t *arraycnt0;
     uint64_t *arraycnt1;
 
-    double   *arraytime;
+    double *arraytime;
 } STREAMSAVE_THREAD_MESSAGE;
 
-
-
-
-
 typedef struct
 {
-    int       on;                   /**<  1 if logging, 0 otherwise */
+    int on; /**<  1 if logging, 0 otherwise */
     long long cnt;
     long long filecnt;
-    long      interval;             /**<  log every x frames (default = 1) */
-    int       logexit;              /**<  toggle to 1 when exiting */
-    char      fname[200];
+    long interval; /**<  log every x frames (default = 1) */
+    int logexit;   /**<  toggle to 1 when exiting */
+    char fname[200];
 
     // circular buffer
-    uint32_t  CBsize;
+    uint32_t CBsize;
 
-    uint32_t  CBindex; // last frame grabbed
-    uint64_t  CBcycle; // last frame grabbed
+    uint32_t CBindex; // last frame grabbed
+    uint64_t CBcycle; // last frame grabbed
 } LOGSHIM_CONF;
 
 #endif
diff --git a/src/COREMOD_memory/shmimlogcmd.c b/src/COREMOD_memory/shmimlogcmd.c
index c98781ee..8fc480ce 100644
--- a/src/COREMOD_memory/shmimlogcmd.c
+++ b/src/COREMOD_memory/shmimlogcmd.c
@@ -5,66 +5,37 @@
 #include "CommandLineInterface/CLIcore.h"
 #include "shmimlog_types.h"
 
-
-
 // Local variables pointers
 static char *logstreamname;
 static char *logcmd;
 
-
-
 // List of arguments to function
-static CLICMDARGDEF farg[] =
-{
-    {
-        CLIARG_STR, ".in_sname", "input stream name", "im1",
-        CLIARG_VISIBLE_DEFAULT,
-        (void **) &logstreamname, NULL
-    },
-    {
-        CLIARG_STR, ".logcmd", "log command", "logon",
-        CLIARG_VISIBLE_DEFAULT,
-        (void **) &logcmd, NULL
-    }
-};
-
+static CLICMDARGDEF farg[] = {
+    {CLIARG_STR, ".in_sname", "input stream name", "im1", CLIARG_VISIBLE_DEFAULT, (void **)&logstreamname, NULL},
+    {CLIARG_STR, ".logcmd", "log command", "logon", CLIARG_VISIBLE_DEFAULT, (void **)&logcmd, NULL}};
 
 // flag CLICMDFLAG_FPS enabled FPS capability
-static CLICMDDATA CLIcmddata =
-{
-    "shmimlogcmd",
-    "log shared memory stream command\n"
-    "logon, logoff",
-    CLICMD_FIELDS_NOFPS
-};
-
-
-
-
-
-
-
+static CLICMDDATA CLIcmddata = {"shmimlogcmd",
+                                "log shared memory stream command\n"
+                                "logon, logoff",
+                                CLICMD_FIELDS_NOFPS};
 
 // set the on field in logshim
 // IDname is name of image logged
-static errno_t logshim_cmd(
-    const char *logshimname,
-    const char *cmd
-)
+static errno_t logshim_cmd(const char *logshimname, const char *cmd)
 {
-    LOGSHIM_CONF  *map;
-    char           SM_fname[STRINGMAXLEN_FILENAME];
-    int            SM_fd;
-    struct stat    file_stat;
+    LOGSHIM_CONF *map;
+    char SM_fname[STRINGMAXLEN_FILENAME];
+    int SM_fd;
+    struct stat file_stat;
 
     // read shared mem
     WRITE_FILENAME(SM_fname, "%s/%s.logshimconf.shm", data.shmdir, logshimname);
 
-
     printf("Importing mmap file \"%s\"\n", SM_fname);
 
     SM_fd = open(SM_fname, O_RDWR);
-    if(SM_fd == -1)
+    if (SM_fd == -1)
     {
         printf("Cannot import file - continuing\n");
         exit(0);
@@ -74,31 +45,30 @@ static errno_t logshim_cmd(
         fstat(SM_fd, &file_stat);
         printf("File %s size: %zd\n", SM_fname, file_stat.st_size);
 
-        map = (LOGSHIM_CONF *) mmap(0, file_stat.st_size, PROT_READ | PROT_WRITE,
-                                    MAP_SHARED, SM_fd, 0);
-        if(map == MAP_FAILED)
+        map = (LOGSHIM_CONF *)mmap(0, file_stat.st_size, PROT_READ | PROT_WRITE, MAP_SHARED, SM_fd, 0);
+        if (map == MAP_FAILED)
         {
             close(SM_fd);
             perror("Error mmapping the file");
             exit(0);
         }
 
-        if(strcmp(cmd, "logon") == 0)
+        if (strcmp(cmd, "logon") == 0)
         {
             printf("Setting logging to ON\n");
             map[0].on = 1;
         }
-        else if(strcmp(cmd, "logoff") == 0)
+        else if (strcmp(cmd, "logoff") == 0)
         {
             printf("Setting logging to OFF\n");
             map[0].on = 0;
         }
-        else if(strcmp(cmd, "logexit") == 0)
+        else if (strcmp(cmd, "logexit") == 0)
         {
             printf("log exit\n");
             map[0].logexit = 1;
         }
-        else if(strcmp(cmd, "stat") == 0)
+        else if (strcmp(cmd, "stat") == 0)
         {
             printf("LOG   on = %d\n", map[0].on);
             printf("    cnt  = %lld\n", map[0].cnt);
@@ -107,9 +77,7 @@ static errno_t logshim_cmd(
             printf("logexit  = %d\n", map[0].logexit);
         }
 
-
-
-        if(munmap(map, sizeof(LOGSHIM_CONF)) == -1)
+        if (munmap(map, sizeof(LOGSHIM_CONF)) == -1)
         {
             printf("unmapping %s\n", SM_fname);
             perror("Error un-mmapping the file");
@@ -119,8 +87,6 @@ static errno_t logshim_cmd(
     return RETURN_SUCCESS;
 }
 
-
-
 // adding INSERT_STD_PROCINFO statements enable processinfo support
 static errno_t compute_function()
 {
@@ -130,19 +96,13 @@ static errno_t compute_function()
     return RETURN_SUCCESS;
 }
 
-
-
 INSERT_STD_CLIfunction
 
-// Register function in CLI
-errno_t CLIADDCMD_COREMOD_memory__shmimlogcmd()
+    // Register function in CLI
+    errno_t
+    CLIADDCMD_COREMOD_memory__shmimlogcmd()
 {
     INSERT_STD_CLIREGISTERFUNC
 
     return RETURN_SUCCESS;
 }
-
-
-
-
-
diff --git a/src/COREMOD_memory/stream_TCP.c b/src/COREMOD_memory/stream_TCP.c
index 438c93cd..f1d64718 100644
--- a/src/COREMOD_memory/stream_TCP.c
+++ b/src/COREMOD_memory/stream_TCP.c
@@ -3,84 +3,49 @@
  * @brief   TCP stream transfer
  */
 
-
 #include <arpa/inet.h>
 #include <netinet/in.h>
 #include <netinet/tcp.h>
 #include <sched.h>
 
-
 #include "CommandLineInterface/CLIcore.h"
-#include "image_ID.h"
-#include "list_image.h"
 #include "create_image.h"
 #include "delete_image.h"
+#include "image_ID.h"
+#include "list_image.h"
 #include "read_shmim.h"
 #include "stream_sem.h"
 
-
 // set to 1 if transfering keywords
 static int TCPTRANSFERKW = 1;
 
-
 typedef struct
 {
     long cnt0;
     long cnt1;
 } TCP_BUFFER_METADATA;
 
-
-
-
-
-
 // ==========================================
 // Forward declaration(s)
 // ==========================================
 
+errno_t COREMOD_MEMORY_testfunction_semaphore(const char *IDname, int semtrig, int testmode);
 
-errno_t COREMOD_MEMORY_testfunction_semaphore(
-    const char *IDname,
-    int         semtrig,
-    int         testmode
-);
-
-
-imageID COREMOD_MEMORY_image_NETWORKtransmit(
-    const char *IDname,
-    const char *IPaddr,
-    int         port,
-    int         mode,
-    int         RT_priority
-);
-
-imageID COREMOD_MEMORY_image_NETWORKreceive(
-    int port,
-    int mode,
-    int RT_priority
-);
-
-
+imageID COREMOD_MEMORY_image_NETWORKtransmit(const char *IDname, const char *IPaddr, int port, int mode,
+                                             int RT_priority);
 
+imageID COREMOD_MEMORY_image_NETWORKreceive(int port, int mode, int RT_priority);
 
 // ==========================================
 // Command line interface wrapper function(s)
 // ==========================================
 
-
 static errno_t COREMOD_MEMORY_testfunction_semaphore__cli()
 {
-    if(0
-            + CLI_checkarg(1, CLIARG_IMG)
-            + CLI_checkarg(2, CLIARG_LONG)
-            + CLI_checkarg(3, CLIARG_LONG)
-            == 0)
+    if (0 + CLI_checkarg(1, CLIARG_IMG) + CLI_checkarg(2, CLIARG_LONG) + CLI_checkarg(3, CLIARG_LONG) == 0)
     {
-        COREMOD_MEMORY_testfunction_semaphore(
-            data.cmdargtoken[1].val.string,
-            data.cmdargtoken[2].val.numl,
-            data.cmdargtoken[3].val.numl
-        );
+        COREMOD_MEMORY_testfunction_semaphore(data.cmdargtoken[1].val.string, data.cmdargtoken[2].val.numl,
+                                              data.cmdargtoken[3].val.numl);
         return CLICMD_SUCCESS;
     }
     else
@@ -89,25 +54,15 @@ static errno_t COREMOD_MEMORY_testfunction_semaphore__cli()
     }
 }
 
-
-
 static errno_t COREMOD_MEMORY_image_NETWORKtransmit__cli()
 {
-    if(0
-            + CLI_checkarg(1, CLIARG_IMG)
-            + CLI_checkarg(2, CLIARG_STR_NOT_IMG)
-            + CLI_checkarg(3, CLIARG_LONG)
-            + CLI_checkarg(4, CLIARG_LONG)
-            + CLI_checkarg(5, CLIARG_LONG)
-            == 0)
+    if (0 + CLI_checkarg(1, CLIARG_IMG) + CLI_checkarg(2, CLIARG_STR_NOT_IMG) + CLI_checkarg(3, CLIARG_LONG) +
+            CLI_checkarg(4, CLIARG_LONG) + CLI_checkarg(5, CLIARG_LONG) ==
+        0)
     {
-        COREMOD_MEMORY_image_NETWORKtransmit(
-            data.cmdargtoken[1].val.string,
-            data.cmdargtoken[2].val.string,
-            data.cmdargtoken[3].val.numl,
-            data.cmdargtoken[4].val.numl,
-            data.cmdargtoken[5].val.numl
-        );
+        COREMOD_MEMORY_image_NETWORKtransmit(data.cmdargtoken[1].val.string, data.cmdargtoken[2].val.string,
+                                             data.cmdargtoken[3].val.numl, data.cmdargtoken[4].val.numl,
+                                             data.cmdargtoken[5].val.numl);
         return CLICMD_SUCCESS;
     }
     else
@@ -116,20 +71,12 @@ static errno_t COREMOD_MEMORY_image_NETWORKtransmit__cli()
     }
 }
 
-
 static errno_t COREMOD_MEMORY_image_NETWORKreceive__cli()
 {
-    if(0
-            + CLI_checkarg(1, CLIARG_LONG)
-            + CLI_checkarg(2, CLIARG_LONG)
-            + CLI_checkarg(3, CLIARG_LONG)
-            == 0)
+    if (0 + CLI_checkarg(1, CLIARG_LONG) + CLI_checkarg(2, CLIARG_LONG) + CLI_checkarg(3, CLIARG_LONG) == 0)
     {
-        COREMOD_MEMORY_image_NETWORKreceive(
-            data.cmdargtoken[1].val.numl,
-            data.cmdargtoken[2].val.numl,
-            data.cmdargtoken[3].val.numl
-        );
+        COREMOD_MEMORY_image_NETWORKreceive(data.cmdargtoken[1].val.numl, data.cmdargtoken[2].val.numl,
+                                            data.cmdargtoken[3].val.numl);
         return CLICMD_SUCCESS;
     }
     else
@@ -138,129 +85,91 @@ static errno_t COREMOD_MEMORY_image_NETWORKreceive__cli()
     }
 }
 
-
-
-
 // ==========================================
 // Register CLI command(s)
 // ==========================================
 
 errno_t stream__TCP_addCLIcmd()
 {
-    RegisterCLIcommand(
-        "testfuncsem",
-        __FILE__,
-        COREMOD_MEMORY_testfunction_semaphore__cli,
-        "test semaphore loop",
-        "<image> <semindex> <testmode>",
-        "testfuncsem im1 1 0",
-        "int COREMOD_MEMORY_testfunction_semaphore(const char *IDname, int semtrig, int testmode)");
+    RegisterCLIcommand("testfuncsem", __FILE__, COREMOD_MEMORY_testfunction_semaphore__cli, "test semaphore loop",
+                       "<image> <semindex> <testmode>", "testfuncsem im1 1 0",
+                       "int COREMOD_MEMORY_testfunction_semaphore(const char *IDname, int semtrig, int testmode)");
 
     RegisterCLIcommand(
-        "imnetwtransmit",
-        __FILE__,
-        COREMOD_MEMORY_image_NETWORKtransmit__cli,
-        "transmit image over network",
-        "<image> <IP addr> <port [long]> <sync mode [int]>",
-        "imnetwtransmit im1 127.0.0.1 0 8888 0",
+        "imnetwtransmit", __FILE__, COREMOD_MEMORY_image_NETWORKtransmit__cli, "transmit image over network",
+        "<image> <IP addr> <port [long]> <sync mode [int]>", "imnetwtransmit im1 127.0.0.1 0 8888 0",
         "long COREMOD_MEMORY_image_NETWORKtransmit(const char *IDname, const char *IPaddr, int port, int mode)");
 
-    RegisterCLIcommand(
-        "imnetwreceive",
-        __FILE__,
-        COREMOD_MEMORY_image_NETWORKreceive__cli,
-        "receive image(s) over network. mode=1 uses counter instead of semaphore",
-        "<port [long]> <mode [int]> <RT priority>",
-        "imnetwreceive 8887 0 80",
-        "long COREMOD_MEMORY_image_NETWORKreceive(int port, int mode, int RT_priority)");
-
+    RegisterCLIcommand("imnetwreceive", __FILE__, COREMOD_MEMORY_image_NETWORKreceive__cli,
+                       "receive image(s) over network. mode=1 uses counter instead of semaphore",
+                       "<port [long]> <mode [int]> <RT priority>", "imnetwreceive 8887 0 80",
+                       "long COREMOD_MEMORY_image_NETWORKreceive(int port, int mode, int RT_priority)");
 
     return RETURN_SUCCESS;
 }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-errno_t COREMOD_MEMORY_testfunction_semaphore(
-    const char *IDname,
-    int         semtrig,
-    int         testmode
-)
+errno_t COREMOD_MEMORY_testfunction_semaphore(const char *IDname, int semtrig, int testmode)
 {
     imageID ID;
-    int     semval;
-    int     rv;
-    long    loopcnt = 0;
+    int semval;
+    int rv;
+    long loopcnt = 0;
 
     ID = image_ID(IDname);
 
     char pinfomsg[200];
 
-
     // ===========================
     // Start loop
     // ===========================
     int loopOK = 1;
-    while(loopOK == 1)
+    while (loopOK == 1)
     {
         printf("\n");
         usleep(500);
 
         sem_getvalue(data.image[ID].semptr[semtrig], &semval);
-        sprintf(pinfomsg, "%ld TEST 0 semtrig %d  ID %ld  %d", loopcnt, semtrig, ID,
-                semval);
+        sprintf(pinfomsg, "%ld TEST 0 semtrig %d  ID %ld  %d", loopcnt, semtrig, ID, semval);
         printf("MSG: %s\n", pinfomsg);
         fflush(stdout);
 
-        if(testmode == 0)
+        if (testmode == 0)
         {
             rv = sem_wait(data.image[ID].semptr[semtrig]);
         }
 
-        if(testmode == 1)
+        if (testmode == 1)
         {
             rv = sem_trywait(data.image[ID].semptr[semtrig]);
         }
 
-        if(testmode == 2)
+        if (testmode == 2)
         {
             sem_post(data.image[ID].semptr[semtrig]);
             rv = sem_wait(data.image[ID].semptr[semtrig]);
         }
 
-        if(rv == -1)
+        if (rv == -1)
         {
-            switch(errno)
+            switch (errno)
             {
 
-                case EINTR:
-                    printf("    sem_wait call was interrupted by a signal handler\n");
-                    break;
+            case EINTR:
+                printf("    sem_wait call was interrupted by a signal handler\n");
+                break;
 
-                case EINVAL:
-                    printf("    not a valid semaphore\n");
-                    break;
+            case EINVAL:
+                printf("    not a valid semaphore\n");
+                break;
 
-                case EAGAIN:
-                    printf("    The operation could not be performed without blocking (i.e., the semaphore currently has the value zero)\n");
-                    break;
+            case EAGAIN:
+                printf("    The operation could not be performed without blocking (i.e., the semaphore currently has "
+                       "the value zero)\n");
+                break;
 
-                default:
-                    printf("    ERROR: unknown code %d\n", rv);
-                    break;
+            default:
+                printf("    ERROR: unknown code %d\n", rv);
+                break;
             }
         }
         else
@@ -269,78 +178,59 @@ errno_t COREMOD_MEMORY_testfunction_semaphore(
         }
 
         sem_getvalue(data.image[ID].semptr[semtrig], &semval);
-        sprintf(pinfomsg, "%ld TEST 1 semtrig %d  ID %ld  %d", loopcnt, semtrig, ID,
-                semval);
+        sprintf(pinfomsg, "%ld TEST 1 semtrig %d  ID %ld  %d", loopcnt, semtrig, ID, semval);
         printf("MSG: %s\n", pinfomsg);
         fflush(stdout);
 
-
-        loopcnt ++;
+        loopcnt++;
     }
 
-
     return RETURN_SUCCESS;
 }
 
-
-
-
-
-
 /** continuously transmits 2D image through TCP link
  * mode = 1, force counter to be used for synchronization, ignore semaphores if they exist
  */
 
-
-imageID COREMOD_MEMORY_image_NETWORKtransmit(
-    const char *IDname,
-    const char *IPaddr,
-    int         port,
-    int         mode,
-    int         RT_priority
-)
+imageID COREMOD_MEMORY_image_NETWORKtransmit(const char *IDname, const char *IPaddr, int port, int mode,
+                                             int RT_priority)
 {
-    imageID    ID;
-    struct     sockaddr_in sock_server;
-    int        fds_client;
-    int        flag = 1;
-    int        result;
-    unsigned long long  cnt = 0;
-    long long  iter = 0;
-    long       framesize; // pixel data only
-    uint32_t   xsize, ysize;
-    char      *ptr0; // source
-    char      *ptr1; // source - offset by slice
-    int        rs;
-
-
-    struct     timespec ts;
-    long       scnt;
-    int        semval;
-    int        semr;
-    int        slice, oldslice;
-    int        NBslices;
+    imageID ID;
+    struct sockaddr_in sock_server;
+    int fds_client;
+    int flag = 1;
+    int result;
+    unsigned long long cnt = 0;
+    long long iter = 0;
+    long framesize; // pixel data only
+    uint32_t xsize, ysize;
+    char *ptr0; // source
+    char *ptr1; // source - offset by slice
+    int rs;
+
+    struct timespec ts;
+    long scnt;
+    int semval;
+    int semr;
+    int slice, oldslice;
+    int NBslices;
 
     TCP_BUFFER_METADATA *frame_md;
-    long       framesize1; // pixel data + metadata
-    long       framesizeall; // total frame size : pixel data + metadata + kw
-    char      *buff; // transmit buffer
-
+    long framesize1;   // pixel data + metadata
+    long framesizeall; // total frame size : pixel data + metadata + kw
+    char *buff;        // transmit buffer
 
-    int        semtrig = 6; // TODO - scan for available sem
+    int semtrig = 6; // TODO - scan for available sem
     // IMPORTANT: do not use semtrig 0
-    int        UseSem = 1;
-
-    char       errmsg[200];
-
+    int UseSem = 1;
 
+    char errmsg[200];
 
     printf("Transmit stream %s over IP %s port %d\n", IDname, IPaddr, port);
     fflush(stdout);
 
     DEBUG_TRACEPOINT(" ");
 
-
     // ===========================
     // processinfo support
     // ===========================
@@ -355,61 +245,49 @@ imageID COREMOD_MEMORY_image_NETWORKtransmit(
     char pinfomsg[200];
     sprintf(pinfomsg, "setup");
 
-
     printf("Setup processinfo ...");
     fflush(stdout);
-    processinfo = processinfo_setup(
-                      pinfoname,
-                      descr,    // description
-                      pinfomsg,  // message on startup
-                      __FUNCTION__, __FILE__, __LINE__
-                  );
+    processinfo = processinfo_setup(pinfoname,
+                                    descr,    // description
+                                    pinfomsg, // message on startup
+                                    __FUNCTION__, __FILE__, __LINE__);
     printf(" done\n");
     fflush(stdout);
 
-
-
     // OPTIONAL SETTINGS
-    processinfo->MeasureTiming = 1; // Measure timing
-    processinfo->RT_priority =
-        RT_priority;  // RT_priority, 0-99. Larger number = higher priority. If <0, ignore
+    processinfo->MeasureTiming = 1;         // Measure timing
+    processinfo->RT_priority = RT_priority; // RT_priority, 0-99. Larger number = higher priority. If <0, ignore
 
     int loopOK = 1;
 
     ID = image_ID(IDname);
 
-
-
-
-
-    if((fds_client = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP)) < 0)
+    if ((fds_client = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP)) < 0)
     {
         printf("ERROR creating socket\n");
         exit(0);
     }
 
-    result = setsockopt(fds_client,      /* socket affected */
-                        IPPROTO_TCP,     /* set option at TCP level */
-                        TCP_NODELAY,     /* name of option */
-                        (char *) &flag,  /* the cast is historical cruft */
-                        sizeof(int));    /* length of option value */
+    result = setsockopt(fds_client,    /* socket affected */
+                        IPPROTO_TCP,   /* set option at TCP level */
+                        TCP_NODELAY,   /* name of option */
+                        (char *)&flag, /* the cast is historical cruft */
+                        sizeof(int));  /* length of option value */
 
-
-    if(result < 0)
+    if (result < 0)
     {
         processinfo_error(processinfo, "ERROR: setsockopt() failed\n");
         loopOK = 0;
     }
 
-    if(loopOK == 1)
+    if (loopOK == 1)
     {
-        memset((char *) &sock_server, 0, sizeof(sock_server));
+        memset((char *)&sock_server, 0, sizeof(sock_server));
         sock_server.sin_family = AF_INET;
         sock_server.sin_port = htons(port);
         sock_server.sin_addr.s_addr = inet_addr(IPaddr);
 
-        if(connect(fds_client, (struct sockaddr *) &sock_server,
-                   sizeof(sock_server)) < 0)
+        if (connect(fds_client, (struct sockaddr *)&sock_server, sizeof(sock_server)) < 0)
         {
             perror("Error  connect() failed ");
             printf("port = %d\n", port);
@@ -418,142 +296,132 @@ imageID COREMOD_MEMORY_image_NETWORKtransmit(
         }
     }
 
-    if(loopOK == 1)
+    if (loopOK == 1)
     {
-        if(send(fds_client, (void *) data.image[ID].md, sizeof(IMAGE_METADATA),
-                0) != sizeof(IMAGE_METADATA))
+        if (send(fds_client, (void *)data.image[ID].md, sizeof(IMAGE_METADATA), 0) != sizeof(IMAGE_METADATA))
         {
-            printf("send() sent a different number of bytes than expected %ld\n",
-                   sizeof(IMAGE_METADATA));
+            printf("send() sent a different number of bytes than expected %ld\n", sizeof(IMAGE_METADATA));
             fflush(stdout);
-            processinfo_error(processinfo,
-                              "send() sent a different number of bytes than expected");
+            processinfo_error(processinfo, "send() sent a different number of bytes than expected");
             loopOK = 0;
         }
     }
 
-
-    if(loopOK == 1)
+    if (loopOK == 1)
     {
         xsize = data.image[ID].md[0].size[0];
         ysize = data.image[ID].md[0].size[1];
         NBslices = 1;
-        if(data.image[ID].md[0].naxis > 2)
-            if(data.image[ID].md[0].size[2] > 1)
+        if (data.image[ID].md[0].naxis > 2)
+            if (data.image[ID].md[0].size[2] > 1)
             {
                 NBslices = data.image[ID].md[0].size[2];
             }
     }
 
-    if(loopOK == 1)
+    if (loopOK == 1)
     {
-        switch(data.image[ID].md[0].datatype)
+        switch (data.image[ID].md[0].datatype)
         {
 
-            case _DATATYPE_INT8:
-                framesize = SIZEOF_DATATYPE_INT8 * xsize * ysize;
-                break;
-            case _DATATYPE_UINT8:
-                framesize = SIZEOF_DATATYPE_UINT8 * xsize * ysize;
-                break;
-
-            case _DATATYPE_INT16:
-                framesize = SIZEOF_DATATYPE_INT16 * xsize * ysize;
-                break;
-            case _DATATYPE_UINT16:
-                framesize = SIZEOF_DATATYPE_UINT16 * xsize * ysize;
-                break;
+        case _DATATYPE_INT8:
+            framesize = SIZEOF_DATATYPE_INT8 * xsize * ysize;
+            break;
+        case _DATATYPE_UINT8:
+            framesize = SIZEOF_DATATYPE_UINT8 * xsize * ysize;
+            break;
 
-            case _DATATYPE_INT32:
-                framesize = SIZEOF_DATATYPE_INT32 * xsize * ysize;
-                break;
-            case _DATATYPE_UINT32:
-                framesize = SIZEOF_DATATYPE_UINT32 * xsize * ysize;
-                break;
+        case _DATATYPE_INT16:
+            framesize = SIZEOF_DATATYPE_INT16 * xsize * ysize;
+            break;
+        case _DATATYPE_UINT16:
+            framesize = SIZEOF_DATATYPE_UINT16 * xsize * ysize;
+            break;
 
-            case _DATATYPE_INT64:
-                framesize = SIZEOF_DATATYPE_INT64 * xsize * ysize;
-                break;
-            case _DATATYPE_UINT64:
-                framesize = SIZEOF_DATATYPE_UINT64 * xsize * ysize;
-                break;
+        case _DATATYPE_INT32:
+            framesize = SIZEOF_DATATYPE_INT32 * xsize * ysize;
+            break;
+        case _DATATYPE_UINT32:
+            framesize = SIZEOF_DATATYPE_UINT32 * xsize * ysize;
+            break;
 
-            case _DATATYPE_FLOAT:
-                framesize = SIZEOF_DATATYPE_FLOAT * xsize * ysize;
-                break;
-            case _DATATYPE_DOUBLE:
-                framesize = SIZEOF_DATATYPE_DOUBLE * xsize * ysize;
-                break;
+        case _DATATYPE_INT64:
+            framesize = SIZEOF_DATATYPE_INT64 * xsize * ysize;
+            break;
+        case _DATATYPE_UINT64:
+            framesize = SIZEOF_DATATYPE_UINT64 * xsize * ysize;
+            break;
 
+        case _DATATYPE_FLOAT:
+            framesize = SIZEOF_DATATYPE_FLOAT * xsize * ysize;
+            break;
+        case _DATATYPE_DOUBLE:
+            framesize = SIZEOF_DATATYPE_DOUBLE * xsize * ysize;
+            break;
 
-            default:
-                printf("ERROR: WRONG DATA TYPE\n");
-                sprintf(errmsg, "WRONG DATA TYPE data type = %d\n",
-                        data.image[ID].md[0].datatype);
-                printf("data type = %d\n", data.image[ID].md[0].datatype);
-                processinfo_error(processinfo, errmsg);
-                loopOK = 0;
-                break;
+        default:
+            printf("ERROR: WRONG DATA TYPE\n");
+            sprintf(errmsg, "WRONG DATA TYPE data type = %d\n", data.image[ID].md[0].datatype);
+            printf("data type = %d\n", data.image[ID].md[0].datatype);
+            processinfo_error(processinfo, errmsg);
+            loopOK = 0;
+            break;
         }
 
-
         printf("IMAGE FRAME SIZE = %ld\n", framesize);
         fflush(stdout);
     }
 
-    if(loopOK == 1)
+    if (loopOK == 1)
     {
-        switch(data.image[ID].md[0].datatype)
+        switch (data.image[ID].md[0].datatype)
         {
 
-            case _DATATYPE_INT8:
-                ptr0 = (char *) data.image[ID].array.SI8;
-                break;
-            case _DATATYPE_UINT8:
-                ptr0 = (char *) data.image[ID].array.UI8;
-                break;
+        case _DATATYPE_INT8:
+            ptr0 = (char *)data.image[ID].array.SI8;
+            break;
+        case _DATATYPE_UINT8:
+            ptr0 = (char *)data.image[ID].array.UI8;
+            break;
 
-            case _DATATYPE_INT16:
-                ptr0 = (char *) data.image[ID].array.SI16;
-                break;
-            case _DATATYPE_UINT16:
-                ptr0 = (char *) data.image[ID].array.UI16;
-                break;
+        case _DATATYPE_INT16:
+            ptr0 = (char *)data.image[ID].array.SI16;
+            break;
+        case _DATATYPE_UINT16:
+            ptr0 = (char *)data.image[ID].array.UI16;
+            break;
 
-            case _DATATYPE_INT32:
-                ptr0 = (char *) data.image[ID].array.SI32;
-                break;
-            case _DATATYPE_UINT32:
-                ptr0 = (char *) data.image[ID].array.UI32;
-                break;
+        case _DATATYPE_INT32:
+            ptr0 = (char *)data.image[ID].array.SI32;
+            break;
+        case _DATATYPE_UINT32:
+            ptr0 = (char *)data.image[ID].array.UI32;
+            break;
 
-            case _DATATYPE_INT64:
-                ptr0 = (char *) data.image[ID].array.SI64;
-                break;
-            case _DATATYPE_UINT64:
-                ptr0 = (char *) data.image[ID].array.UI64;
-                break;
+        case _DATATYPE_INT64:
+            ptr0 = (char *)data.image[ID].array.SI64;
+            break;
+        case _DATATYPE_UINT64:
+            ptr0 = (char *)data.image[ID].array.UI64;
+            break;
 
-            case _DATATYPE_FLOAT:
-                ptr0 = (char *) data.image[ID].array.F;
-                break;
-            case _DATATYPE_DOUBLE:
-                ptr0 = (char *) data.image[ID].array.D;
-                break;
+        case _DATATYPE_FLOAT:
+            ptr0 = (char *)data.image[ID].array.F;
+            break;
+        case _DATATYPE_DOUBLE:
+            ptr0 = (char *)data.image[ID].array.D;
+            break;
 
-            default:
-                printf("ERROR: WRONG DATA TYPE\n");
-                exit(0);
-                break;
+        default:
+            printf("ERROR: WRONG DATA TYPE\n");
+            exit(0);
+            break;
         }
 
-
-
-
-        frame_md = (TCP_BUFFER_METADATA *) malloc(sizeof(TCP_BUFFER_METADATA));
+        frame_md = (TCP_BUFFER_METADATA *)malloc(sizeof(TCP_BUFFER_METADATA));
         framesize1 = framesize + sizeof(TCP_BUFFER_METADATA);
 
-        if(TCPTRANSFERKW == 0)
+        if (TCPTRANSFERKW == 0)
         {
             framesizeall = framesize1;
         }
@@ -562,7 +430,7 @@ imageID COREMOD_MEMORY_image_NETWORKtransmit(
             framesizeall = framesize1 + data.image[ID].md[0].NBkw * sizeof(IMAGE_KEYWORD);
         }
 
-        buff = (char *) malloc(sizeof(char) * framesizeall);
+        buff = (char *)malloc(sizeof(char) * framesizeall);
 
         printf("transfer buffer size = %ld\n", framesizeall);
         fflush(stdout);
@@ -573,7 +441,7 @@ imageID COREMOD_MEMORY_image_NETWORKtransmit(
         fflush(stdout);
     }
 
-    if((data.image[ID].md[0].sem == 0) || (mode == 1))
+    if ((data.image[ID].md[0].sem == 0) || (mode == 1))
     {
         processinfo_WriteMessage(processinfo, "sync using counter");
         UseSem = 0;
@@ -585,23 +453,18 @@ imageID COREMOD_MEMORY_image_NETWORKtransmit(
         processinfo_WriteMessage(processinfo, msgstring);
     }
 
-
     // ===========================
     // Start loop
     // ===========================
-    processinfo_loopstart(
-        processinfo); // Notify processinfo that we are entering loop
-
+    processinfo_loopstart(processinfo); // Notify processinfo that we are entering loop
 
-
-    while(loopOK == 1)
+    while (loopOK == 1)
     {
         loopOK = processinfo_loopstep(processinfo);
 
-
-        if(UseSem == 0)   // use counter
+        if (UseSem == 0) // use counter
         {
-            while(data.image[ID].md[0].cnt0 == cnt)   // test if new frame exists
+            while (data.image[ID].md[0].cnt0 == cnt) // test if new frame exists
             {
                 usleep(5);
             }
@@ -610,7 +473,7 @@ imageID COREMOD_MEMORY_image_NETWORKtransmit(
         }
         else
         {
-            if(clock_gettime(CLOCK_REALTIME, &ts) == -1)
+            if (clock_gettime(CLOCK_REALTIME, &ts) == -1)
             {
                 perror("clock_gettime");
                 exit(EXIT_FAILURE);
@@ -619,14 +482,14 @@ imageID COREMOD_MEMORY_image_NETWORKtransmit(
 
             semr = sem_timedwait(data.image[ID].semptr[semtrig], &ts);
 
-            if(iter == 0)
+            if (iter == 0)
             {
                 processinfo_WriteMessage(processinfo, "Driving sem to 0");
                 printf("Driving semaphore to zero ... ");
                 fflush(stdout);
                 sem_getvalue(data.image[ID].semptr[semtrig], &semval);
                 int semvalcnt = semval;
-                for(scnt = 0; scnt < semvalcnt; scnt++)
+                for (scnt = 0; scnt < semvalcnt; scnt++)
                 {
                     sem_getvalue(data.image[ID].semptr[semtrig], &semval);
                     printf("sem = %d\n", semval);
@@ -644,61 +507,49 @@ imageID COREMOD_MEMORY_image_NETWORKtransmit(
             }
         }
 
-
-
-
-
-
-
-
         processinfo_exec_start(processinfo);
-        if(processinfo_compute_status(processinfo) == 1)
+        if (processinfo_compute_status(processinfo) == 1)
         {
 
-            if(semr == 0)
+            if (semr == 0)
             {
                 frame_md[0].cnt0 = data.image[ID].md[0].cnt0;
                 frame_md[0].cnt1 = data.image[ID].md[0].cnt1;
 
                 slice = data.image[ID].md[0].cnt1;
-                if(slice > oldslice + 1)
+                if (slice > oldslice + 1)
                 {
                     slice = oldslice + 1;
                 }
-                if(NBslices > 1)
-                    if(oldslice == NBslices - 1)
+                if (NBslices > 1)
+                    if (oldslice == NBslices - 1)
                     {
                         slice = 0;
                     }
-                if(slice > NBslices - 1)
+                if (slice > NBslices - 1)
                 {
                     slice = 0;
                 }
 
                 frame_md[0].cnt1 = slice;
 
-                ptr1 = ptr0 + framesize *
-                       slice; //data.image[ID].md[0].cnt1; // frame that was just written
+                ptr1 = ptr0 + framesize * slice; //data.image[ID].md[0].cnt1; // frame that was just written
                 memcpy(buff, ptr1, framesize);
                 memcpy(buff + framesize, frame_md, sizeof(TCP_BUFFER_METADATA));
 
-                if(TCPTRANSFERKW == 1)
+                if (TCPTRANSFERKW == 1)
                 {
-                    memcpy(
-                        buff + framesize1,
-                        (char *) data.image[ID].kw,
-                        data.image[ID].md[0].NBkw * sizeof(IMAGE_KEYWORD));
+                    memcpy(buff + framesize1, (char *)data.image[ID].kw,
+                           data.image[ID].md[0].NBkw * sizeof(IMAGE_KEYWORD));
                 }
 
-
                 rs = send(fds_client, buff, framesizeall, 0);
 
-                if(rs != framesizeall)
+                if (rs != framesizeall)
                 {
                     perror("socket send error ");
-                    sprintf(errmsg,
-                            "ERROR: send() sent a different number of bytes (%d) than expected %ld  %ld  %ld",
-                            rs, (long) framesize, (long) framesizeall, (long) sizeof(TCP_BUFFER_METADATA));
+                    sprintf(errmsg, "ERROR: send() sent a different number of bytes (%d) than expected %ld  %ld  %ld",
+                            rs, (long)framesize, (long)framesizeall, (long)sizeof(TCP_BUFFER_METADATA));
                     printf("%s\n", errmsg);
                     fflush(stdout);
                     processinfo_WriteMessage(processinfo, errmsg);
@@ -706,19 +557,12 @@ imageID COREMOD_MEMORY_image_NETWORKtransmit(
                 }
                 oldslice = slice;
             }
-
-
         }
         // process signals, increment loop counter
         processinfo_exec_end(processinfo);
 
-        if((data.signal_INT == 1) || \
-                (data.signal_TERM == 1) || \
-                (data.signal_ABRT == 1) || \
-                (data.signal_BUS == 1) || \
-                (data.signal_SEGV == 1) || \
-                (data.signal_HUP == 1) || \
-                (data.signal_PIPE == 1))
+        if ((data.signal_INT == 1) || (data.signal_TERM == 1) || (data.signal_ABRT == 1) || (data.signal_BUS == 1) ||
+            (data.signal_SEGV == 1) || (data.signal_HUP == 1) || (data.signal_PIPE == 1))
         {
             loopOK = 0;
         }
@@ -728,7 +572,6 @@ imageID COREMOD_MEMORY_image_NETWORKtransmit(
     // ==================================
     processinfo_cleanExit(processinfo);
 
-
     free(buff);
 
     close(fds_client);
@@ -737,69 +580,51 @@ imageID COREMOD_MEMORY_image_NETWORKtransmit(
 
     free(frame_md);
 
-
     return ID;
 }
 
-
-
-
-
-
 /** continuously receives 2D image through TCP link
  * mode = 1, force counter to be used for synchronization, ignore semaphores if they exist
  */
 
-
-imageID COREMOD_MEMORY_image_NETWORKreceive(
-    int port,
-    __attribute__((unused)) int mode,
-    int RT_priority
-)
+imageID COREMOD_MEMORY_image_NETWORKreceive(int port, __attribute__((unused)) int mode, int RT_priority)
 {
-    struct sockaddr_in   sock_server;
-    struct sockaddr_in   sock_client;
-    int                  fds_server;
-    int                  fds_client;
-    socklen_t            slen_client;
-
-    int             flag = 1;
-    long            recvsize;
-    int             result;
-    long            totsize = 0;
-    int             MAXPENDING = 5;
-
+    struct sockaddr_in sock_server;
+    struct sockaddr_in sock_client;
+    int fds_server;
+    int fds_client;
+    socklen_t slen_client;
+
+    int flag = 1;
+    long recvsize;
+    int result;
+    long totsize = 0;
+    int MAXPENDING = 5;
 
     IMAGE_METADATA *imgmd;
-    imageID         ID;
-    long            framesize;
-    uint32_t        xsize;
-    uint32_t        ysize;
-    char           *ptr0; // source
-    long            NBslices;
-    int             socketOpen = 1; // 0 if socket is closed
-    int             semval;
-    int             semnb;
-    int             OKim;
-    int             axis;
-
-
-    imgmd = (IMAGE_METADATA *) malloc(sizeof(IMAGE_METADATA));
+    imageID ID;
+    long framesize;
+    uint32_t xsize;
+    uint32_t ysize;
+    char *ptr0; // source
+    long NBslices;
+    int socketOpen = 1; // 0 if socket is closed
+    int semval;
+    int semnb;
+    int OKim;
+    int axis;
+
+    imgmd = (IMAGE_METADATA *)malloc(sizeof(IMAGE_METADATA));
 
     TCP_BUFFER_METADATA *frame_md;
-    long framesize1;     // pixel data + metadata
-    long framesizefull;  // pixel data + metadata + kw
-    char *buff;          // buffer
-
-
+    long framesize1;    // pixel data + metadata
+    long framesizefull; // pixel data + metadata + kw
+    char *buff;         // buffer
 
     struct sched_param schedpar;
 
-
-
-
     PROCESSINFO *processinfo;
-    if(data.processinfo == 1)
+    if (data.processinfo == 1)
     {
         // CREATE PROCESSINFO ENTRY
         // see processtools.c in module CommandLineInterface for details
@@ -810,7 +635,7 @@ imageID COREMOD_MEMORY_image_NETWORKreceive(
         processinfo->loopstat = 0; // loop initialization
 
         strcpy(processinfo->source_FUNCTION, __FUNCTION__);
-        strcpy(processinfo->source_FILE,     __FILE__);
+        strcpy(processinfo->source_FILE, __FILE__);
         processinfo->source_LINE = __LINE__;
 
         char msgstring[200];
@@ -820,63 +645,58 @@ imageID COREMOD_MEMORY_image_NETWORKreceive(
 
     // CATCH SIGNALS
 
-    if(sigaction(SIGTERM, &data.sigact, NULL) == -1)
+    if (sigaction(SIGTERM, &data.sigact, NULL) == -1)
     {
         printf("\ncan't catch SIGTERM\n");
     }
 
-    if(sigaction(SIGINT, &data.sigact, NULL) == -1)
+    if (sigaction(SIGINT, &data.sigact, NULL) == -1)
     {
         printf("\ncan't catch SIGINT\n");
     }
 
-    if(sigaction(SIGABRT, &data.sigact, NULL) == -1)
+    if (sigaction(SIGABRT, &data.sigact, NULL) == -1)
     {
         printf("\ncan't catch SIGABRT\n");
     }
 
-    if(sigaction(SIGBUS, &data.sigact, NULL) == -1)
+    if (sigaction(SIGBUS, &data.sigact, NULL) == -1)
     {
         printf("\ncan't catch SIGBUS\n");
     }
 
-    if(sigaction(SIGSEGV, &data.sigact, NULL) == -1)
+    if (sigaction(SIGSEGV, &data.sigact, NULL) == -1)
     {
         printf("\ncan't catch SIGSEGV\n");
     }
 
-    if(sigaction(SIGHUP, &data.sigact, NULL) == -1)
+    if (sigaction(SIGHUP, &data.sigact, NULL) == -1)
     {
         printf("\ncan't catch SIGHUP\n");
     }
 
-    if(sigaction(SIGPIPE, &data.sigact, NULL) == -1)
+    if (sigaction(SIGPIPE, &data.sigact, NULL) == -1)
     {
         printf("\ncan't catch SIGPIPE\n");
     }
 
-
-
-
-
-
     schedpar.sched_priority = RT_priority;
-    if(seteuid(data.euid) != 0)     //This goes up to maximum privileges
+    if (seteuid(data.euid) != 0) //This goes up to maximum privileges
     {
         PRINT_ERROR("seteuid error");
     }
     sched_setscheduler(0, SCHED_FIFO,
                        &schedpar); //other option is SCHED_RR, might be faster
-    if(seteuid(data.ruid) != 0)     //Go back to normal privileges
+    if (seteuid(data.ruid) != 0)   //Go back to normal privileges
     {
         PRINT_ERROR("seteuid error");
     }
 
     // create TCP socket
-    if((fds_server = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP)) == -1)
+    if ((fds_server = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP)) == -1)
     {
         printf("ERROR creating socket\n");
-        if(data.processinfo == 1)
+        if (data.processinfo == 1)
         {
             processinfo->loopstat = 4;
             processinfo_WriteMessage(processinfo, "ERROR creating socket");
@@ -884,21 +704,17 @@ imageID COREMOD_MEMORY_image_NETWORKreceive(
         exit(0);
     }
 
+    memset((char *)&sock_server, 0, sizeof(sock_server));
 
-
-
-
-    memset((char *) &sock_server, 0, sizeof(sock_server));
-
-    result = setsockopt(fds_server,            /* socket affected */
-                        IPPROTO_TCP,     /* set option at TCP level */
-                        TCP_NODELAY,     /* name of option */
-                        (char *) &flag,  /* the cast is historical cruft */
-                        sizeof(int));    /* length of option value */
-    if(result < 0)
+    result = setsockopt(fds_server,    /* socket affected */
+                        IPPROTO_TCP,   /* set option at TCP level */
+                        TCP_NODELAY,   /* name of option */
+                        (char *)&flag, /* the cast is historical cruft */
+                        sizeof(int));  /* length of option value */
+    if (result < 0)
     {
         printf("ERROR setsockopt\n");
-        if(data.processinfo == 1)
+        if (data.processinfo == 1)
         {
             processinfo->loopstat = 4;
             processinfo_WriteMessage(processinfo, "ERROR socketopt");
@@ -906,21 +722,19 @@ imageID COREMOD_MEMORY_image_NETWORKreceive(
         exit(0);
     }
 
-
     sock_server.sin_family = AF_INET;
     sock_server.sin_port = htons(port);
     sock_server.sin_addr.s_addr = htonl(INADDR_ANY);
 
     //bind socket to port
-    if(bind(fds_server, (struct sockaddr *)&sock_server,
-            sizeof(sock_server)) == -1)
+    if (bind(fds_server, (struct sockaddr *)&sock_server, sizeof(sock_server)) == -1)
     {
         char msgstring[200];
 
         sprintf(msgstring, "ERROR binding socket, port %d", port);
         printf("%s\n", msgstring);
 
-        if(data.processinfo == 1)
+        if (data.processinfo == 1)
         {
             processinfo->loopstat = 4;
             processinfo_WriteMessage(processinfo, msgstring);
@@ -928,15 +742,14 @@ imageID COREMOD_MEMORY_image_NETWORKreceive(
         exit(0);
     }
 
-
-    if(listen(fds_server, MAXPENDING) < 0)
+    if (listen(fds_server, MAXPENDING) < 0)
     {
         char msgstring[200];
 
         sprintf(msgstring, "ERROR listen socket");
         printf("%s\n", msgstring);
 
-        if(data.processinfo == 1)
+        if (data.processinfo == 1)
         {
             processinfo->loopstat = 4;
             processinfo_WriteMessage(processinfo, msgstring);
@@ -945,21 +758,20 @@ imageID COREMOD_MEMORY_image_NETWORKreceive(
         exit(0);
     }
 
-//    cnt = 0;
+    //    cnt = 0;
 
     /* Set the size of the in-out parameter */
     slen_client = sizeof(sock_client);
 
     /* Wait for a client to connect */
-    if((fds_client = accept(fds_server, (struct sockaddr *) &sock_client,
-                            &slen_client)) == -1)
+    if ((fds_client = accept(fds_server, (struct sockaddr *)&sock_client, &slen_client)) == -1)
     {
         char msgstring[200];
 
         sprintf(msgstring, "ERROR accept socket");
         printf("%s\n", msgstring);
 
-        if(data.processinfo == 1)
+        if (data.processinfo == 1)
         {
             processinfo->loopstat = 4;
             processinfo_WriteMessage(processinfo, msgstring);
@@ -972,15 +784,14 @@ imageID COREMOD_MEMORY_image_NETWORKreceive(
     fflush(stdout);
 
     // listen for image metadata
-    if((recvsize = recv(fds_client, imgmd, sizeof(IMAGE_METADATA),
-                        MSG_WAITALL)) < 0)
+    if ((recvsize = recv(fds_client, imgmd, sizeof(IMAGE_METADATA), MSG_WAITALL)) < 0)
     {
         char msgstring[200];
 
         sprintf(msgstring, "ERROR receiving image metadata");
         printf("%s\n", msgstring);
 
-        if(data.processinfo == 1)
+        if (data.processinfo == 1)
         {
             processinfo->loopstat = 4;
             processinfo_WriteMessage(processinfo, msgstring);
@@ -989,37 +800,31 @@ imageID COREMOD_MEMORY_image_NETWORKreceive(
         exit(0);
     }
 
-
-
-    if(data.processinfo == 1)
+    if (data.processinfo == 1)
     {
         char msgstring[200];
         sprintf(msgstring, "Receiving stream %s", imgmd[0].name);
         processinfo_WriteMessage(processinfo, msgstring);
     }
 
-
     {
         // flush socket for 1MB
 
         size_t flushsize = 1048576;
 
         char *flushbuff;
-        flushbuff = (char *) malloc(flushsize);
+        flushbuff = (char *)malloc(flushsize);
 
         recv(fds_client, flushbuff, flushsize, MSG_DONTWAIT);
 
         free(flushbuff);
     }
 
-
-
-
     // is image already in memory ?
     OKim = 0;
 
     ID = image_ID(imgmd[0].name);
-    if(ID == -1)
+    if (ID == -1)
     {
         // is it in shared memory ?
         ID = read_sharedmem_image(imgmd[0].name);
@@ -1027,55 +832,52 @@ imageID COREMOD_MEMORY_image_NETWORKreceive(
 
     list_image_ID();
 
-    if(ID == -1)
+    if (ID == -1)
     {
         OKim = 0;
     }
     else
     {
         OKim = 1;
-        if(imgmd[0].naxis != data.image[ID].md[0].naxis)
+        if (imgmd[0].naxis != data.image[ID].md[0].naxis)
         {
             OKim = 0;
         }
-        if(OKim == 1)
+        if (OKim == 1)
         {
-            for(axis = 0; axis < imgmd[0].naxis; axis++)
-                if(imgmd[0].size[axis] != data.image[ID].md[0].size[axis])
+            for (axis = 0; axis < imgmd[0].naxis; axis++)
+                if (imgmd[0].size[axis] != data.image[ID].md[0].size[axis])
                 {
                     OKim = 0;
                 }
         }
-        if(imgmd[0].datatype != data.image[ID].md[0].datatype)
+        if (imgmd[0].datatype != data.image[ID].md[0].datatype)
         {
             OKim = 0;
         }
 
-        if(OKim == 0)
+        if (OKim == 0)
         {
             delete_image_ID(imgmd[0].name, DELETE_IMAGE_ERRMODE_WARNING);
             ID = -1;
         }
     }
 
-
     int nbkw = 0;
-    if(TCPTRANSFERKW == 1)
+    if (TCPTRANSFERKW == 1)
     {
         nbkw = imgmd[0].NBkw;
-        if(imgmd[0].NBkw != data.image[ID].md[0].NBkw)
+        if (imgmd[0].NBkw != data.image[ID].md[0].NBkw)
         {
             OKim = 0;
         }
     }
 
-    if(OKim == 0)
+    if (OKim == 0)
     {
         printf("IMAGE %s HAS TO BE CREATED\n", imgmd[0].name);
-        create_image_ID(imgmd[0].name, imgmd[0].naxis, imgmd[0].size,
-                        imgmd[0].datatype, imgmd[0].shared, nbkw, 0, &ID);
-        printf("Created image stream %s - shared = %d\n", imgmd[0].name,
-               imgmd[0].shared);
+        create_image_ID(imgmd[0].name, imgmd[0].naxis, imgmd[0].size, imgmd[0].datatype, imgmd[0].shared, nbkw, 0, &ID);
+        printf("Created image stream %s - shared = %d\n", imgmd[0].name, imgmd[0].shared);
         printf("Size = %d,%d\n", imgmd[0].size[0], imgmd[0].size[1]);
     }
     else
@@ -1083,149 +885,139 @@ imageID COREMOD_MEMORY_image_NETWORKreceive(
         printf("REUSING EXISTING IMAGE %s\n", imgmd[0].name);
     }
 
-
-
-
-
     COREMOD_MEMORY_image_set_createsem(imgmd[0].name, IMAGE_NB_SEMAPHORE);
 
     xsize = data.image[ID].md[0].size[0];
     ysize = data.image[ID].md[0].size[1];
     NBslices = 1;
-    if(data.image[ID].md[0].naxis > 2)
-        if(data.image[ID].md[0].size[2] > 1)
+    if (data.image[ID].md[0].naxis > 2)
+        if (data.image[ID].md[0].size[2] > 1)
         {
             NBslices = data.image[ID].md[0].size[2];
         }
 
-
     char typestring[8];
 
-    switch(data.image[ID].md[0].datatype)
+    switch (data.image[ID].md[0].datatype)
     {
 
-        case _DATATYPE_INT8:
-            framesize = SIZEOF_DATATYPE_INT8 * xsize * ysize;
-            sprintf(typestring, "INT8");
-            break;
-
-        case _DATATYPE_UINT8:
-            framesize = SIZEOF_DATATYPE_UINT8 * xsize * ysize;
-            sprintf(typestring, "UINT8");
-            break;
-
-        case _DATATYPE_INT16:
-            framesize = SIZEOF_DATATYPE_INT16 * xsize * ysize;
-            sprintf(typestring, "INT16");
-            break;
-
-        case _DATATYPE_UINT16:
-            framesize = SIZEOF_DATATYPE_UINT16 * xsize * ysize;
-            sprintf(typestring, "UINT16");
-            break;
-
-        case _DATATYPE_INT32:
-            framesize = SIZEOF_DATATYPE_INT32 * xsize * ysize;
-            sprintf(typestring, "INT32");
-            break;
-
-        case _DATATYPE_UINT32:
-            framesize = SIZEOF_DATATYPE_UINT32 * xsize * ysize;
-            sprintf(typestring, "UINT32");
-            break;
-
-        case _DATATYPE_INT64:
-            framesize = SIZEOF_DATATYPE_INT64 * xsize * ysize;
-            sprintf(typestring, "INT64");
-            break;
-
-        case _DATATYPE_UINT64:
-            framesize = SIZEOF_DATATYPE_UINT64 * xsize * ysize;
-            sprintf(typestring, "UINT64");
-            break;
-
-        case _DATATYPE_FLOAT:
-            framesize = SIZEOF_DATATYPE_FLOAT * xsize * ysize;
-            sprintf(typestring, "FLOAT");
-            break;
-
-        case _DATATYPE_DOUBLE:
-            framesize = SIZEOF_DATATYPE_DOUBLE * xsize * ysize;
-            sprintf(typestring, "DOUBLE");
-            break;
-
-        default:
-            printf("ERROR: WRONG DATA TYPE\n");
-            sprintf(typestring, "ERR");
-            exit(0);
-            break;
+    case _DATATYPE_INT8:
+        framesize = SIZEOF_DATATYPE_INT8 * xsize * ysize;
+        sprintf(typestring, "INT8");
+        break;
+
+    case _DATATYPE_UINT8:
+        framesize = SIZEOF_DATATYPE_UINT8 * xsize * ysize;
+        sprintf(typestring, "UINT8");
+        break;
+
+    case _DATATYPE_INT16:
+        framesize = SIZEOF_DATATYPE_INT16 * xsize * ysize;
+        sprintf(typestring, "INT16");
+        break;
+
+    case _DATATYPE_UINT16:
+        framesize = SIZEOF_DATATYPE_UINT16 * xsize * ysize;
+        sprintf(typestring, "UINT16");
+        break;
+
+    case _DATATYPE_INT32:
+        framesize = SIZEOF_DATATYPE_INT32 * xsize * ysize;
+        sprintf(typestring, "INT32");
+        break;
+
+    case _DATATYPE_UINT32:
+        framesize = SIZEOF_DATATYPE_UINT32 * xsize * ysize;
+        sprintf(typestring, "UINT32");
+        break;
+
+    case _DATATYPE_INT64:
+        framesize = SIZEOF_DATATYPE_INT64 * xsize * ysize;
+        sprintf(typestring, "INT64");
+        break;
+
+    case _DATATYPE_UINT64:
+        framesize = SIZEOF_DATATYPE_UINT64 * xsize * ysize;
+        sprintf(typestring, "UINT64");
+        break;
+
+    case _DATATYPE_FLOAT:
+        framesize = SIZEOF_DATATYPE_FLOAT * xsize * ysize;
+        sprintf(typestring, "FLOAT");
+        break;
+
+    case _DATATYPE_DOUBLE:
+        framesize = SIZEOF_DATATYPE_DOUBLE * xsize * ysize;
+        sprintf(typestring, "DOUBLE");
+        break;
+
+    default:
+        printf("ERROR: WRONG DATA TYPE\n");
+        sprintf(typestring, "ERR");
+        exit(0);
+        break;
     }
 
     printf("image frame size = %ld\n", framesize);
 
-    switch(data.image[ID].md[0].datatype)
+    switch (data.image[ID].md[0].datatype)
     {
 
-        case _DATATYPE_INT8:
-            ptr0 = (char *) data.image[ID].array.SI8;
-            break;
-        case _DATATYPE_UINT8:
-            ptr0 = (char *) data.image[ID].array.UI8;
-            break;
-
-        case _DATATYPE_INT16:
-            ptr0 = (char *) data.image[ID].array.SI16;
-            break;
-        case _DATATYPE_UINT16:
-            ptr0 = (char *) data.image[ID].array.UI16;
-            break;
-
-        case _DATATYPE_INT32:
-            ptr0 = (char *) data.image[ID].array.SI32;
-            break;
-        case _DATATYPE_UINT32:
-            ptr0 = (char *) data.image[ID].array.UI32;
-            break;
-
-        case _DATATYPE_INT64:
-            ptr0 = (char *) data.image[ID].array.SI64;
-            break;
-        case _DATATYPE_UINT64:
-            ptr0 = (char *) data.image[ID].array.UI64;
-            break;
-
-        case _DATATYPE_FLOAT:
-            ptr0 = (char *) data.image[ID].array.F;
-            break;
-        case _DATATYPE_DOUBLE:
-            ptr0 = (char *) data.image[ID].array.D;
-            break;
-
-        default:
-            printf("ERROR: WRONG DATA TYPE\n");
-            exit(0);
-            break;
+    case _DATATYPE_INT8:
+        ptr0 = (char *)data.image[ID].array.SI8;
+        break;
+    case _DATATYPE_UINT8:
+        ptr0 = (char *)data.image[ID].array.UI8;
+        break;
+
+    case _DATATYPE_INT16:
+        ptr0 = (char *)data.image[ID].array.SI16;
+        break;
+    case _DATATYPE_UINT16:
+        ptr0 = (char *)data.image[ID].array.UI16;
+        break;
+
+    case _DATATYPE_INT32:
+        ptr0 = (char *)data.image[ID].array.SI32;
+        break;
+    case _DATATYPE_UINT32:
+        ptr0 = (char *)data.image[ID].array.UI32;
+        break;
+
+    case _DATATYPE_INT64:
+        ptr0 = (char *)data.image[ID].array.SI64;
+        break;
+    case _DATATYPE_UINT64:
+        ptr0 = (char *)data.image[ID].array.UI64;
+        break;
+
+    case _DATATYPE_FLOAT:
+        ptr0 = (char *)data.image[ID].array.F;
+        break;
+    case _DATATYPE_DOUBLE:
+        ptr0 = (char *)data.image[ID].array.D;
+        break;
+
+    default:
+        printf("ERROR: WRONG DATA TYPE\n");
+        exit(0);
+        break;
     }
 
-
-
-    if(data.processinfo == 1)
+    if (data.processinfo == 1)
     {
         char msgstring[200];
-        sprintf(msgstring, "<- %s [%d x %d x %ld] %s", imgmd[0].name, (int) xsize,
-                (int) ysize, NBslices, typestring);
-        sprintf(processinfo->description, "%s %dx%dx%ld %s", imgmd[0].name, (int) xsize,
-                (int) ysize, NBslices, typestring);
+        sprintf(msgstring, "<- %s [%d x %d x %ld] %s", imgmd[0].name, (int)xsize, (int)ysize, NBslices, typestring);
+        sprintf(processinfo->description, "%s %dx%dx%ld %s", imgmd[0].name, (int)xsize, (int)ysize, NBslices,
+                typestring);
         processinfo_WriteMessage(processinfo, msgstring);
     }
 
-
-
     // this line is not needed, as frame_md is declared below
     // frame_md = (TCP_BUFFER_METADATA*) malloc(sizeof(TCP_BUFFER_METADATA));
 
     framesize1 = framesize + sizeof(TCP_BUFFER_METADATA);
-    if(TCPTRANSFERKW == 0)
+    if (TCPTRANSFERKW == 0)
     {
         framesizefull = framesize1;
     }
@@ -1234,15 +1026,13 @@ imageID COREMOD_MEMORY_image_NETWORKreceive(
         framesizefull = framesize1 + nbkw * sizeof(IMAGE_KEYWORD);
     }
 
-    buff = (char *) malloc(sizeof(char) * framesizefull);
+    buff = (char *)malloc(sizeof(char) * framesizefull);
 
     frame_md = (TCP_BUFFER_METADATA *)(buff + framesize);
 
-
-
-    if(data.processinfo == 1)
+    if (data.processinfo == 1)
     {
-        processinfo->loopstat = 1;    //notify processinfo that we are entering loop
+        processinfo->loopstat = 1; //notify processinfo that we are entering loop
     }
 
     socketOpen = 1;
@@ -1258,40 +1048,38 @@ imageID COREMOD_MEMORY_image_NETWORKreceive(
     long monitorloopindex = 0;
     long cnt0previous = 0;
 
-    while(loopOK == 1)
+    while (loopOK == 1)
     {
-        if(data.processinfo == 1)
+        if (data.processinfo == 1)
         {
-            while(processinfo->CTRLval == 1)   // pause
+            while (processinfo->CTRLval == 1) // pause
             {
                 usleep(50);
             }
 
-            if(processinfo->CTRLval == 2)   // single iteration
+            if (processinfo->CTRLval == 2) // single iteration
             {
                 processinfo->CTRLval = 1;
             }
 
-            if(processinfo->CTRLval == 3)   // exit loop
+            if (processinfo->CTRLval == 3) // exit loop
             {
                 loopOK = 0;
             }
         }
 
-
-        if((recvsize = recv(fds_client, buff, framesizefull, MSG_WAITALL)) < 0)
+        if ((recvsize = recv(fds_client, buff, framesizefull, MSG_WAITALL)) < 0)
         {
             printf("ERROR recv()\n");
             socketOpen = 0;
         }
 
-
-        if((data.processinfo == 1) && (processinfo->MeasureTiming == 1))
+        if ((data.processinfo == 1) && (processinfo->MeasureTiming == 1))
         {
             processinfo_exec_start(processinfo);
         }
 
-        if(recvsize != 0)
+        if (recvsize != 0)
         {
             totsize += recvsize;
         }
@@ -1300,16 +1088,14 @@ imageID COREMOD_MEMORY_image_NETWORKreceive(
             socketOpen = 0;
         }
 
-        if(socketOpen == 1)
+        if (socketOpen == 1)
         {
             frame_md = (TCP_BUFFER_METADATA *)(buff + framesize);
 
-
             data.image[ID].md[0].cnt1 = frame_md[0].cnt1;
 
-
             // copy pixel data
-            if(NBslices > 1)
+            if (NBslices > 1)
             {
                 memcpy(ptr0 + framesize * frame_md[0].cnt1, buff, framesize);
             }
@@ -1318,32 +1104,25 @@ imageID COREMOD_MEMORY_image_NETWORKreceive(
                 memcpy(ptr0, buff, framesize);
             }
 
-            if(TCPTRANSFERKW == 1)
+            if (TCPTRANSFERKW == 1)
             {
                 // copy kw
-                memcpy(
-                    data.image[ID].kw,
-                    (IMAGE_KEYWORD *)(buff + framesize1),
-                    nbkw * sizeof(IMAGE_KEYWORD)
-                );
+                memcpy(data.image[ID].kw, (IMAGE_KEYWORD *)(buff + framesize1), nbkw * sizeof(IMAGE_KEYWORD));
             }
 
             frameincr = (long)frame_md[0].cnt0 - cnt0previous;
-            if(frameincr > 1)
+            if (frameincr > 1)
             {
-                printf("Skipped %ld frame(s) at index %ld %ld\n", frameincr - 1,
-                       (long)(frame_md[0].cnt0), (long)(frame_md[0].cnt1));
+                printf("Skipped %ld frame(s) at index %ld %ld\n", frameincr - 1, (long)(frame_md[0].cnt0),
+                       (long)(frame_md[0].cnt1));
             }
 
             cnt0previous = frame_md[0].cnt0;
 
-            if(monitorindex == monitorinterval)
+            if (monitorindex == monitorinterval)
             {
-                printf("[%5ld]  input %20ld (+ %8ld) output %20ld (+ %8ld)\n",
-                       monitorloopindex,
-                       frame_md[0].cnt0, frame_md[0].cnt0 - minputcnt,
-                       data.image[ID].md[0].cnt0, data.image[ID].md[0].cnt0 - moutputcnt);
-
+                printf("[%5ld]  input %20ld (+ %8ld) output %20ld (+ %8ld)\n", monitorloopindex, frame_md[0].cnt0,
+                       frame_md[0].cnt0 - minputcnt, data.image[ID].md[0].cnt0, data.image[ID].md[0].cnt0 - moutputcnt);
 
                 minputcnt = frame_md[0].cnt0;
                 moutputcnt = data.image[ID].md[0].cnt0;
@@ -1354,114 +1133,110 @@ imageID COREMOD_MEMORY_image_NETWORKreceive(
 
             monitorindex++;
 
-
             data.image[ID].md[0].cnt0++;
-            for(semnb = 0; semnb < data.image[ID].md[0].sem ; semnb++)
+            for (semnb = 0; semnb < data.image[ID].md[0].sem; semnb++)
             {
                 sem_getvalue(data.image[ID].semptr[semnb], &semval);
-                if(semval < SEMAPHORE_MAXVAL)
+                if (semval < SEMAPHORE_MAXVAL)
                 {
                     sem_post(data.image[ID].semptr[semnb]);
                 }
             }
 
             sem_getvalue(data.image[ID].semlog, &semval);
-            if(semval < 2)
+            if (semval < 2)
             {
                 sem_post(data.image[ID].semlog);
             }
-
         }
 
-        if(socketOpen == 0)
+        if (socketOpen == 0)
         {
             loopOK = 0;
         }
 
-        if((data.processinfo == 1) && (processinfo->MeasureTiming == 1))
+        if ((data.processinfo == 1) && (processinfo->MeasureTiming == 1))
         {
             processinfo_exec_end(processinfo);
         }
 
-
         // process signals
 
-        if(data.signal_TERM == 1)
+        if (data.signal_TERM == 1)
         {
             loopOK = 0;
-            if(data.processinfo == 1)
+            if (data.processinfo == 1)
             {
                 processinfo_SIGexit(processinfo, SIGTERM);
             }
         }
 
-        if(data.signal_INT == 1)
+        if (data.signal_INT == 1)
         {
             loopOK = 0;
-            if(data.processinfo == 1)
+            if (data.processinfo == 1)
             {
                 processinfo_SIGexit(processinfo, SIGINT);
             }
         }
 
-        if(data.signal_ABRT == 1)
+        if (data.signal_ABRT == 1)
         {
             loopOK = 0;
-            if(data.processinfo == 1)
+            if (data.processinfo == 1)
             {
                 processinfo_SIGexit(processinfo, SIGABRT);
             }
         }
 
-        if(data.signal_BUS == 1)
+        if (data.signal_BUS == 1)
         {
             loopOK = 0;
-            if(data.processinfo == 1)
+            if (data.processinfo == 1)
             {
                 processinfo_SIGexit(processinfo, SIGBUS);
             }
         }
 
-        if(data.signal_SEGV == 1)
+        if (data.signal_SEGV == 1)
         {
             loopOK = 0;
-            if(data.processinfo == 1)
+            if (data.processinfo == 1)
             {
                 processinfo_SIGexit(processinfo, SIGSEGV);
             }
         }
 
-        if(data.signal_HUP == 1)
+        if (data.signal_HUP == 1)
         {
             loopOK = 0;
-            if(data.processinfo == 1)
+            if (data.processinfo == 1)
             {
                 processinfo_SIGexit(processinfo, SIGHUP);
             }
         }
 
-        if(data.signal_PIPE == 1)
+        if (data.signal_PIPE == 1)
         {
             loopOK = 0;
-            if(data.processinfo == 1)
+            if (data.processinfo == 1)
             {
                 processinfo_SIGexit(processinfo, SIGPIPE);
             }
         }
 
         loopcnt++;
-        if(data.processinfo == 1)
+        if (data.processinfo == 1)
         {
             processinfo->loopcnt = loopcnt;
         }
     }
 
-    if(data.processinfo == 1)
+    if (data.processinfo == 1)
     {
         processinfo_cleanExit(processinfo);
     }
 
-
     free(buff);
 
     close(fds_client);
@@ -1471,10 +1246,5 @@ imageID COREMOD_MEMORY_image_NETWORKreceive(
 
     free(imgmd);
 
-
     return ID;
 }
-
-
-
-
diff --git a/src/COREMOD_memory/stream_TCP.h b/src/COREMOD_memory/stream_TCP.h
index fc2224b0..ce860e67 100644
--- a/src/COREMOD_memory/stream_TCP.h
+++ b/src/COREMOD_memory/stream_TCP.h
@@ -5,29 +5,13 @@
 #ifndef _STREAM_TCP_H
 #define _STREAM_TCP_H
 
-
 errno_t stream__TCP_addCLIcmd();
 
+errno_t COREMOD_MEMORY_testfunction_semaphore(const char *IDname, int semtrig, int testmode);
 
-errno_t COREMOD_MEMORY_testfunction_semaphore(
-    const char *IDname,
-    int         semtrig,
-    int         testmode
-);
-
-
-imageID COREMOD_MEMORY_image_NETWORKtransmit(
-    const char *IDname,
-    const char *IPaddr,
-    int         port,
-    int         mode,
-    int         RT_priority
-);
+imageID COREMOD_MEMORY_image_NETWORKtransmit(const char *IDname, const char *IPaddr, int port, int mode,
+                                             int RT_priority);
 
-imageID COREMOD_MEMORY_image_NETWORKreceive(
-    int port,
-    int mode,
-    int RT_priority
-);
+imageID COREMOD_MEMORY_image_NETWORKreceive(int port, int mode, int RT_priority);
 
 #endif
diff --git a/src/COREMOD_memory/stream_ave.c b/src/COREMOD_memory/stream_ave.c
index d1a382ae..40287a36 100644
--- a/src/COREMOD_memory/stream_ave.c
+++ b/src/COREMOD_memory/stream_ave.c
@@ -1,31 +1,17 @@
 /** @file stream_ave.c
  */
 
-
-
-
 #include "CommandLineInterface/CLIcore.h"
-#include "image_ID.h"
-#include "stream_sem.h"
 #include "create_image.h"
 #include "delete_image.h"
-
-
-
-
+#include "image_ID.h"
+#include "stream_sem.h"
 
 // ==========================================
 // Forward declaration(s)
 // ==========================================
 
-imageID COREMOD_MEMORY_streamAve(
-    const char *IDstream_name,
-    int         NBave,
-    int         mode,
-    const char *IDout_name
-);
-
-
+imageID COREMOD_MEMORY_streamAve(const char *IDstream_name, int NBave, int mode, const char *IDout_name);
 
 // ==========================================
 // Command line interface wrapper function(s)
@@ -33,19 +19,12 @@ imageID COREMOD_MEMORY_streamAve(
 
 static errno_t COREMOD_MEMORY_streamAve__cli()
 {
-    if(0
-            + CLI_checkarg(1, CLIARG_IMG)
-            + CLI_checkarg(2, CLIARG_LONG)
-            + CLI_checkarg(3, CLIARG_LONG)
-            + CLI_checkarg(4, 5)
-            == 0)
+    if (0 + CLI_checkarg(1, CLIARG_IMG) + CLI_checkarg(2, CLIARG_LONG) + CLI_checkarg(3, CLIARG_LONG) +
+            CLI_checkarg(4, 5) ==
+        0)
     {
-        COREMOD_MEMORY_streamAve(
-            data.cmdargtoken[1].val.string,
-            data.cmdargtoken[2].val.numl,
-            data.cmdargtoken[3].val.numl,
-            data.cmdargtoken[4].val.string
-        );
+        COREMOD_MEMORY_streamAve(data.cmdargtoken[1].val.string, data.cmdargtoken[2].val.numl,
+                                 data.cmdargtoken[3].val.numl, data.cmdargtoken[4].val.string);
         return CLICMD_SUCCESS;
     }
     else
@@ -54,9 +33,6 @@ static errno_t COREMOD_MEMORY_streamAve__cli()
     }
 }
 
-
-
-
 // ==========================================
 // Register CLI command(s)
 // ==========================================
@@ -64,10 +40,7 @@ static errno_t COREMOD_MEMORY_streamAve__cli()
 errno_t stream_ave_addCLIcmd()
 {
     RegisterCLIcommand(
-        "streamave",
-        __FILE__,
-        COREMOD_MEMORY_streamAve__cli,
-        "averages stream",
+        "streamave", __FILE__, COREMOD_MEMORY_streamAve__cli, "averages stream",
         "<instream> <NBave> <mode, 1 for single local instance, 0 for loop> <outstream>",
         "streamave instream 100 0 outstream",
         "long COREMODE_MEMORY_streamAve(const char *IDstream_name, int NBave, int mode, const char *IDout_name)");
@@ -75,22 +48,6 @@ errno_t stream_ave_addCLIcmd()
     return RETURN_SUCCESS;
 }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 /** @brief Averages frames in stream
  *
  * @param[in]  IDstream_name        Input stream
@@ -101,30 +58,24 @@ errno_t stream_ave_addCLIcmd()
  *
  */
 
-
-imageID COREMOD_MEMORY_streamAve(
-    const char *IDstream_name,
-    int         NBave,
-    int         mode,
-    const char *IDout_name
-)
+imageID COREMOD_MEMORY_streamAve(const char *IDstream_name, int NBave, int mode, const char *IDout_name)
 {
     DEBUG_TRACE_FSTART();
 
-    imageID      IDout;
-    imageID      IDout0;
-    imageID      IDin;
-    uint8_t      datatype;
-    uint32_t     xsize;
-    uint32_t     ysize;
-    uint32_t     xysize;
-    uint32_t    *imsize;
-    int_fast8_t  OKloop;
-    int          cntin = 0;
-    long         dtus = 20;
-    long         ii;
-    long         cnt0;
-    long         cnt0old;
+    imageID IDout;
+    imageID IDout0;
+    imageID IDin;
+    uint8_t datatype;
+    uint32_t xsize;
+    uint32_t ysize;
+    uint32_t xysize;
+    uint32_t *imsize;
+    int_fast8_t OKloop;
+    int cntin = 0;
+    long dtus = 20;
+    long ii;
+    long cnt0;
+    long cnt0old;
 
     IDin = image_ID(IDstream_name);
     datatype = data.image[IDin].md[0].datatype;
@@ -132,21 +83,18 @@ imageID COREMOD_MEMORY_streamAve(
     ysize = data.image[IDin].md[0].size[1];
     xysize = xsize * ysize;
 
+    FUNC_CHECK_RETURN(create_2Dimage_ID("_streamAve_tmp", xsize, ysize, &IDout0));
 
-    FUNC_CHECK_RETURN(
-        create_2Dimage_ID("_streamAve_tmp", xsize, ysize, &IDout0));
-
-    if(mode == 1) // local image
+    if (mode == 1) // local image
     {
-        FUNC_CHECK_RETURN(
-            create_2Dimage_ID(IDout_name, xsize, ysize, &IDout));
+        FUNC_CHECK_RETURN(create_2Dimage_ID(IDout_name, xsize, ysize, &IDout));
     }
     else // shared memory
     {
         IDout = image_ID(IDout_name);
-        if(IDout == -1) // CREATE IT
+        if (IDout == -1) // CREATE IT
         {
-            imsize = (uint32_t *) malloc(sizeof(uint32_t) * 2);
+            imsize = (uint32_t *)malloc(sizeof(uint32_t) * 2);
             imsize[0] = xsize;
             imsize[1] = ysize;
             create_image_ID(IDout_name, 2, imsize, _DATATYPE_FLOAT, 1, 0, 0, &IDout);
@@ -155,89 +103,88 @@ imageID COREMOD_MEMORY_streamAve(
         }
     }
 
-
     cntin = 0;
     cnt0old = data.image[IDin].md[0].cnt0;
 
-    for(ii = 0; ii < xysize; ii++)
+    for (ii = 0; ii < xysize; ii++)
     {
         data.image[IDout].array.F[ii] = 0.0;
     }
 
     OKloop = 1;
-    while(OKloop == 1)
+    while (OKloop == 1)
     {
         // has new frame arrived ?
         cnt0 = data.image[IDin].md[0].cnt0;
-        if(cnt0 != cnt0old)
+        if (cnt0 != cnt0old)
         {
-            switch(datatype)
+            switch (datatype)
             {
-            case _DATATYPE_UINT8 :
-                for(ii = 0; ii < xysize; ii++)
+            case _DATATYPE_UINT8:
+                for (ii = 0; ii < xysize; ii++)
                 {
                     data.image[IDout0].array.F[ii] += data.image[IDin].array.UI8[ii];
                 }
                 break;
 
-            case _DATATYPE_INT8 :
-                for(ii = 0; ii < xysize; ii++)
+            case _DATATYPE_INT8:
+                for (ii = 0; ii < xysize; ii++)
                 {
                     data.image[IDout0].array.F[ii] += data.image[IDin].array.SI8[ii];
                 }
                 break;
 
-            case _DATATYPE_UINT16 :
-                for(ii = 0; ii < xysize; ii++)
+            case _DATATYPE_UINT16:
+                for (ii = 0; ii < xysize; ii++)
                 {
                     data.image[IDout0].array.F[ii] += data.image[IDin].array.UI16[ii];
                 }
                 break;
 
-            case _DATATYPE_INT16 :
-                for(ii = 0; ii < xysize; ii++)
+            case _DATATYPE_INT16:
+                for (ii = 0; ii < xysize; ii++)
                 {
                     data.image[IDout0].array.F[ii] += data.image[IDin].array.SI16[ii];
                 }
                 break;
 
-            case _DATATYPE_UINT32 :
-                for(ii = 0; ii < xysize; ii++)
+            case _DATATYPE_UINT32:
+                for (ii = 0; ii < xysize; ii++)
                 {
                     data.image[IDout0].array.F[ii] += data.image[IDin].array.UI32[ii];
                 }
                 break;
 
-            case _DATATYPE_INT32 :
-                for(ii = 0; ii < xysize; ii++)
+            case _DATATYPE_INT32:
+                for (ii = 0; ii < xysize; ii++)
                 {
                     data.image[IDout0].array.F[ii] += data.image[IDin].array.SI32[ii];
                 }
                 break;
 
-            case _DATATYPE_UINT64 :
-                for(ii = 0; ii < xysize; ii++)
+            case _DATATYPE_UINT64:
+                for (ii = 0; ii < xysize; ii++)
                 {
                     data.image[IDout0].array.F[ii] += data.image[IDin].array.UI64[ii];
                 }
                 break;
 
-            case _DATATYPE_INT64 :
-                for(ii = 0; ii < xysize; ii++)
+            case _DATATYPE_INT64:
+                for (ii = 0; ii < xysize; ii++)
                 {
                     data.image[IDout0].array.F[ii] += data.image[IDin].array.SI64[ii];
                 }
                 break;
 
-            case _DATATYPE_FLOAT :
-                for(ii = 0; ii < xysize; ii++)
+            case _DATATYPE_FLOAT:
+                for (ii = 0; ii < xysize; ii++)
                 {
                     data.image[IDout0].array.F[ii] += data.image[IDin].array.F[ii];
                 }
                 break;
 
-            case _DATATYPE_DOUBLE :
-                for(ii = 0; ii < xysize; ii++)
+            case _DATATYPE_DOUBLE:
+                for (ii = 0; ii < xysize; ii++)
                 {
                     data.image[IDout0].array.F[ii] += data.image[IDin].array.D[ii];
                 }
@@ -245,11 +192,11 @@ imageID COREMOD_MEMORY_streamAve(
             }
 
             cntin++;
-            if(cntin == NBave)
+            if (cntin == NBave)
             {
                 cntin = 0;
                 data.image[IDout].md[0].write = 1;
-                for(ii = 0; ii < xysize; ii++)
+                for (ii = 0; ii < xysize; ii++)
                 {
                     data.image[IDout].array.F[ii] = data.image[IDout0].array.F[ii] / NBave;
                 }
@@ -257,9 +204,9 @@ imageID COREMOD_MEMORY_streamAve(
                 data.image[IDout].md[0].write = 0;
                 COREMOD_MEMORY_image_set_sempost_byID(IDout, -1);
 
-                if(mode != 1)
+                if (mode != 1)
                 {
-                    for(ii = 0; ii < xysize; ii++)
+                    for (ii = 0; ii < xysize; ii++)
                     {
                         data.image[IDout].array.F[ii] = 0.0;
                     }
@@ -279,4 +226,3 @@ imageID COREMOD_MEMORY_streamAve(
     DEBUG_TRACE_FEXIT();
     return IDout;
 }
-
diff --git a/src/COREMOD_memory/stream_ave.h b/src/COREMOD_memory/stream_ave.h
index 021275b5..bc03029a 100644
--- a/src/COREMOD_memory/stream_ave.h
+++ b/src/COREMOD_memory/stream_ave.h
@@ -1,14 +1,6 @@
 /** @file stream_ave.h
  */
- 
 
 errno_t stream_ave_addCLIcmd();
 
-
-imageID COREMOD_MEMORY_streamAve(
-    const char *IDstream_name,
-    int         NBave,
-    int         mode,
-    const char *IDout_name
-);
-
+imageID COREMOD_MEMORY_streamAve(const char *IDstream_name, int NBave, int mode, const char *IDout_name);
diff --git a/src/COREMOD_memory/stream_delay.c b/src/COREMOD_memory/stream_delay.c
index 3f0521e3..f226d51f 100644
--- a/src/COREMOD_memory/stream_delay.c
+++ b/src/COREMOD_memory/stream_delay.c
@@ -4,98 +4,52 @@
 #include <math.h>
 
 #include "CommandLineInterface/CLIcore.h"
-#include "image_ID.h"
-#include "stream_sem.h"
 #include "create_image.h"
 #include "delete_image.h"
+#include "image_ID.h"
+#include "stream_sem.h"
 
 #include "COREMOD_tools/COREMOD_tools.h"
 #include "CommandLineInterface/timeutils.h"
 
-
-
-
-
 // Local variables pointers
-static char     *inimname;
-static char     *outimname;
-static float    *delaysec;
+static char *inimname;
+static char *outimname;
+static float *delaysec;
 static uint64_t *timebuffsize;
 
-static int32_t  *avemode;
+static int32_t *avemode;
 static long fpi_avemode;
 
 static uint64_t *avedtns;
 static long fpi_timeavedtns;
 
-static uint64_t  *statusframelag;
-static uint64_t  *statuskkin;
-static uint64_t  *statuskkout;
-
-
-static CLICMDARGDEF farg[] =
-{
-    {
-        CLIARG_IMG, ".in_name", "input image", "im1",
-        CLIARG_VISIBLE_DEFAULT,
-        (void **) &inimname, NULL
-    },
-    {
-        CLIARG_STR, ".out_name", "output image", "out1",
-        CLIARG_VISIBLE_DEFAULT,
-        (void **) &outimname, NULL
-    },
-    {
-        CLIARG_FLOAT32, ".delaysec", "delay [s]", "0.001",
-        CLIARG_VISIBLE_DEFAULT,
-        (void **) &delaysec, NULL
-    },
-    {
-        CLIARG_UINT64, ".timebuffsize", "time buffer size", "10000",
-        CLIARG_HIDDEN_DEFAULT,
-        (void **) &timebuffsize, NULL
-    },
-    {
-        CLIARG_INT32, ".option.timeavemode", "Enable time window averaging (>0)", "0",
-        CLIARG_HIDDEN_DEFAULT,
-        (void **) &avemode, &fpi_avemode
-    },
-    {
-        CLIARG_UINT64, ".option.timeavedtns", "Averaging time window width [ns]", "10000",
-        CLIARG_HIDDEN_DEFAULT,
-        (void **) &avedtns, &fpi_timeavedtns
-    },
-    {
-        CLIARG_UINT64, ".status.framelag", "current time lag frame index", "100",
-        CLIARG_OUTPUT_DEFAULT,
-        (void **) &statusframelag, NULL
-    },
-    {
-        CLIARG_UINT64, ".status.kkin", "input cube slice index", "100",
-        CLIARG_OUTPUT_DEFAULT,
-        (void **) &statuskkin, NULL
-    },
-    {
-        CLIARG_UINT64, ".status.kkout", "output cube slice index", "100",
-        CLIARG_OUTPUT_DEFAULT,
-        (void **) &statuskkout, NULL
-    }
-};
-
-
-
-static errno_t customCONFsetup()
-{
-
-    return RETURN_SUCCESS;
-}
-
+static uint64_t *statusframelag;
+static uint64_t *statuskkin;
+static uint64_t *statuskkout;
+
+static CLICMDARGDEF farg[] = {
+    {CLIARG_IMG, ".in_name", "input image", "im1", CLIARG_VISIBLE_DEFAULT, (void **)&inimname, NULL},
+    {CLIARG_STR, ".out_name", "output image", "out1", CLIARG_VISIBLE_DEFAULT, (void **)&outimname, NULL},
+    {CLIARG_FLOAT32, ".delaysec", "delay [s]", "0.001", CLIARG_VISIBLE_DEFAULT, (void **)&delaysec, NULL},
+    {CLIARG_UINT64, ".timebuffsize", "time buffer size", "10000", CLIARG_HIDDEN_DEFAULT, (void **)&timebuffsize, NULL},
+    {CLIARG_INT32, ".option.timeavemode", "Enable time window averaging (>0)", "0", CLIARG_HIDDEN_DEFAULT,
+     (void **)&avemode, &fpi_avemode},
+    {CLIARG_UINT64, ".option.timeavedtns", "Averaging time window width [ns]", "10000", CLIARG_HIDDEN_DEFAULT,
+     (void **)&avedtns, &fpi_timeavedtns},
+    {CLIARG_UINT64, ".status.framelag", "current time lag frame index", "100", CLIARG_OUTPUT_DEFAULT,
+     (void **)&statusframelag, NULL},
+    {CLIARG_UINT64, ".status.kkin", "input cube slice index", "100", CLIARG_OUTPUT_DEFAULT, (void **)&statuskkin, NULL},
+    {CLIARG_UINT64, ".status.kkout", "output cube slice index", "100", CLIARG_OUTPUT_DEFAULT, (void **)&statuskkout,
+     NULL}};
+
+static errno_t customCONFsetup() { return RETURN_SUCCESS; }
 
 static errno_t customCONFcheck()
 {
-    if(data.fpsptr != NULL)
+    if (data.fpsptr != NULL)
     {
-        if(data.fpsptr->parray[fpi_avemode].val.i32[0] == 0)     // no ave mode
+        if (data.fpsptr->parray[fpi_avemode].val.i32[0] == 0) // no ave mode
         {
             data.fpsptr->parray[fpi_timeavedtns].fpflag &= ~FPFLAG_USED;
             data.fpsptr->parray[fpi_timeavedtns].fpflag &= ~FPFLAG_VISIBLE;
@@ -110,47 +64,24 @@ static errno_t customCONFcheck()
     return RETURN_SUCCESS;
 }
 
-
-
-static CLICMDDATA CLIcmddata =
-{
-    "streamdelay",
-    "delay input stream to output stream",
-    CLICMD_FIELDS_DEFAULTS
-};
-
+static CLICMDDATA CLIcmddata = {"streamdelay", "delay input stream to output stream", CLICMD_FIELDS_DEFAULTS};
 
 // detailed help
-static errno_t help_function()
-{
-    return RETURN_SUCCESS;
-}
-
-
-
-
+static errno_t help_function() { return RETURN_SUCCESS; }
 
-
-static errno_t streamdelay(
-    IMGID inimg,
-    IMGID outimg,
-    IMGID bufferimg,
-    struct timespec *tarray,
-    int *warray,
-    int *status
-)
+static errno_t streamdelay(IMGID inimg, IMGID outimg, IMGID bufferimg, struct timespec *tarray, int *warray,
+                           int *status)
 {
     static uint64_t cnt0prev = 0;
     static uint64_t bufferindex_input = 0;
     static uint64_t bufferindex_output = 0;
 
-
     // get current time
     struct timespec tnow;
     clock_gettime(CLOCK_REALTIME, &tnow);
 
     // update circular buffer if new frame has arrived
-    if(cnt0prev != inimg.md->cnt0)
+    if (cnt0prev != inimg.md->cnt0)
     {
         //printf("cnt %8ld %8ld   CIRC BUFFER UPDATE -> index %8ld / %8ld\n",
         //       cnt0prev, inimg.md->cnt0, bufferindex_input, *timebuffsize);
@@ -159,32 +90,26 @@ static errno_t streamdelay(
         // update counter for next detection loop
         cnt0prev = inimg.md->cnt0;
 
-
         // write current time to array
-        tarray[bufferindex_input].tv_sec  = tnow.tv_sec;
+        tarray[bufferindex_input].tv_sec = tnow.tv_sec;
         tarray[bufferindex_input].tv_nsec = tnow.tv_nsec;
 
         // copy image data to circular buffer
         char *destptr;
-        destptr = (char *) bufferimg.im->array.raw;
+        destptr = (char *)bufferimg.im->array.raw;
         destptr += inimg.md->imdatamemsize * bufferindex_input;
-        memcpy(
-            destptr,
-            inimg.im->array.raw,
-            inimg.md->imdatamemsize
-        );
+        memcpy(destptr, inimg.im->array.raw, inimg.md->imdatamemsize);
 
         warray[bufferindex_input] = 0;
 
-        bufferindex_input ++;
-        if(bufferindex_input == (*timebuffsize))
+        bufferindex_input++;
+        if (bufferindex_input == (*timebuffsize))
         {
             // end of circular buffer reached
             bufferindex_input = 0;
         }
     }
 
-
     // check if current time is past time array at output index + delay
     struct timespec tdiff = timespec_diff(tarray[bufferindex_output], tnow);
     double tdiffv = 1.0 * tdiff.tv_sec + 1.0e-9 * tdiff.tv_nsec;
@@ -195,15 +120,15 @@ static errno_t streamdelay(
 
     int updateflag = 0;
     long bufferindex_output_last = 0;
-    while((warray[bufferindex_output] == 0) && (tdiffv > (*delaysec)))
+    while ((warray[bufferindex_output] == 0) && (tdiffv > (*delaysec)))
     {
         // update output frame
         updateflag = 1;
         warray[bufferindex_output] = 1;
 
         bufferindex_output_last = bufferindex_output;
-        bufferindex_output ++;
-        if(bufferindex_output == (*timebuffsize))
+        bufferindex_output++;
+        if (bufferindex_output == (*timebuffsize))
         {
             // end of circular buffer reached
             bufferindex_output = 0;
@@ -214,20 +139,15 @@ static errno_t streamdelay(
         tdiffv = 1.0 * tdiff.tv_sec + 1.0e-9 * tdiff.tv_nsec;
     }
 
-    if(updateflag == 1)
+    if (updateflag == 1)
     {
-        printf("     WRITE %8ld %8ld  :  %ld bytes\n",
-               bufferindex_input, bufferindex_output_last,
-               (long) inimg.md->imdatamemsize);
+        printf("     WRITE %8ld %8ld  :  %ld bytes\n", bufferindex_input, bufferindex_output_last,
+               (long)inimg.md->imdatamemsize);
         // copy circular buffer frame to output
         char *srcptr;
-        srcptr = (char *) bufferimg.im->array.raw;
+        srcptr = (char *)bufferimg.im->array.raw;
         srcptr += inimg.md->imdatamemsize * bufferindex_output_last;
-        memcpy(
-            outimg.im->array.raw,
-            srcptr,
-            inimg.md->imdatamemsize
-        );
+        memcpy(outimg.im->array.raw, srcptr, inimg.md->imdatamemsize);
 
         // frame has been processed
         *status = 1;
@@ -240,11 +160,6 @@ static errno_t streamdelay(
     return RETURN_SUCCESS;
 }
 
-
-
-
-
-
 static errno_t compute_function()
 {
     DEBUG_TRACE_FSTART();
@@ -255,29 +170,26 @@ static errno_t compute_function()
     IMGID outimg = makeIMGID(outimname);
     imcreatelikewiseIMGID(&outimg, &inimg);
 
-    IMGID bufferimg = makeIMGID_3D("streamdelaybuff", inimg.size[0], inimg.size[1],
-                                   *timebuffsize);
+    IMGID bufferimg = makeIMGID_3D("streamdelaybuff", inimg.size[0], inimg.size[1], *timebuffsize);
     bufferimg.datatype = inimg.datatype;
     imcreateIMGID(&bufferimg);
 
-
-    struct timespec    *timeinarray;
-    timeinarray = (struct timespec *) malloc(sizeof(struct timespec) *
-                  (*timebuffsize));
+    struct timespec *timeinarray;
+    timeinarray = (struct timespec *)malloc(sizeof(struct timespec) * (*timebuffsize));
     // get current time
     struct timespec tnow;
     clock_gettime(CLOCK_REALTIME, &tnow);
-    for(uint64_t i = 0; i < *timebuffsize; i++)
+    for (uint64_t i = 0; i < *timebuffsize; i++)
     {
-        timeinarray[i].tv_sec  = tnow.tv_sec;
+        timeinarray[i].tv_sec = tnow.tv_sec;
         timeinarray[i].tv_nsec = tnow.tv_nsec;
     }
 
     // write array
     // 0 if new, 1 if already sent to output
     int *warray;
-    warray = (int *) malloc(sizeof(int) * (*timebuffsize));
-    for(uint64_t i = 0; i < *timebuffsize; i++)
+    warray = (int *)malloc(sizeof(int) * (*timebuffsize));
+    for (uint64_t i = 0; i < *timebuffsize; i++)
     {
         warray[i] = 1;
     }
@@ -288,15 +200,9 @@ static errno_t compute_function()
     INSERT_STD_PROCINFO_COMPUTEFUNC_INIT
     INSERT_STD_PROCINFO_COMPUTEFUNC_LOOPSTART
 
-    streamdelay(
-        inimg,
-        outimg,
-        bufferimg,
-        timeinarray,
-        warray,
-        &status);
+    streamdelay(inimg, outimg, bufferimg, timeinarray, warray, &status);
     // status is 0 if no update to output, 1 otherwise
-    if(status != 0)
+    if (status != 0)
     {
         processinfo_update_output_stream(processinfo, outimg.ID);
     }
@@ -310,13 +216,11 @@ static errno_t compute_function()
     return RETURN_SUCCESS;
 }
 
-
-
-
 INSERT_STD_FPSCLIfunctions
 
-// Register function in CLI
-errno_t CLIADDCMD_COREMOD_memory__streamdelay()
+    // Register function in CLI
+    errno_t
+    CLIADDCMD_COREMOD_memory__streamdelay()
 {
     CLIcmddata.FPS_customCONFsetup = customCONFsetup;
     CLIcmddata.FPS_customCONFcheck = customCONFcheck;
@@ -325,13 +229,6 @@ errno_t CLIADDCMD_COREMOD_memory__streamdelay()
     return RETURN_SUCCESS;
 }
 
-
-
-
-
-
-
-
 /*
     imageID             IDimc;
     imageID             IDin, IDout;
@@ -549,12 +446,3 @@ errno_t CLIADDCMD_COREMOD_memory__streamdelay()
 
                 processinfo_update_output_stream(processinfo, IDout);
            */
-
-
-
-
-
-
-
-
-
diff --git a/src/COREMOD_memory/stream_delay.h b/src/COREMOD_memory/stream_delay.h
index 1572efae..2a4dfc89 100644
--- a/src/COREMOD_memory/stream_delay.h
+++ b/src/COREMOD_memory/stream_delay.h
@@ -1,10 +1,8 @@
 /** @file stream_delay,h
  */
 
-
 errno_t CLIADDCMD_COREMOD_memory__streamdelay();
 
-
 /*
 errno_t COREMOD_MEMORY_streamDelay(
     const char *IDin_name,
diff --git a/src/COREMOD_memory/stream_diff.c b/src/COREMOD_memory/stream_diff.c
index 9c6ac27c..37f00177 100644
--- a/src/COREMOD_memory/stream_diff.c
+++ b/src/COREMOD_memory/stream_diff.c
@@ -2,51 +2,31 @@
  * @file    stream_diff.c
  */
 
-
 #include "CommandLineInterface/CLIcore.h"
-#include "image_ID.h"
 #include "create_image.h"
+#include "image_ID.h"
 #include "stream_sem.h"
 
-
-
-
 // ==========================================
 // forward declarations
 // ==========================================
 
-imageID COREMOD_MEMORY_streamDiff(
-    const char *IDstream0_name,
-    const char *IDstream1_name,
-    const char *IDstreammask_name,
-    const char *IDstreamout_name,
-    long        semtrig
-);
-
+imageID COREMOD_MEMORY_streamDiff(const char *IDstream0_name, const char *IDstream1_name, const char *IDstreammask_name,
+                                  const char *IDstreamout_name, long semtrig);
 
 // ==========================================
 // command line interface wrapper functions
 // ==========================================
 
-
-
 static errno_t COREMOD_MEMORY_streamDiff__cli()
 {
-    if(0
-            + CLI_checkarg(1, CLIARG_IMG)
-            + CLI_checkarg(2, CLIARG_IMG)
-            + CLI_checkarg(3, 5)
-            + CLI_checkarg(4, CLIARG_STR_NOT_IMG)
-            + CLI_checkarg(5, CLIARG_LONG)
-            == 0)
+    if (0 + CLI_checkarg(1, CLIARG_IMG) + CLI_checkarg(2, CLIARG_IMG) + CLI_checkarg(3, 5) +
+            CLI_checkarg(4, CLIARG_STR_NOT_IMG) + CLI_checkarg(5, CLIARG_LONG) ==
+        0)
     {
-        COREMOD_MEMORY_streamDiff(
-            data.cmdargtoken[1].val.string,
-            data.cmdargtoken[2].val.string,
-            data.cmdargtoken[3].val.string,
-            data.cmdargtoken[4].val.string,
-            data.cmdargtoken[5].val.numl
-        );
+        COREMOD_MEMORY_streamDiff(data.cmdargtoken[1].val.string, data.cmdargtoken[2].val.string,
+                                  data.cmdargtoken[3].val.string, data.cmdargtoken[4].val.string,
+                                  data.cmdargtoken[5].val.numl);
         return CLICMD_SUCCESS;
     }
     else
@@ -55,38 +35,22 @@ static errno_t COREMOD_MEMORY_streamDiff__cli()
     }
 }
 
-
-
 // ==========================================
 // Register CLI command(s)
 // ==========================================
 
 errno_t stream_diff_addCLIcmd()
 {
-	RegisterCLIcommand(
-        "streamdiff",
-        __FILE__,
-        COREMOD_MEMORY_streamDiff__cli,
-        "compute difference between two image streams",
-        "<in stream 0> <in stream 1> <out stream> <optional mask> <sem trigger index>",
-        "streamdiff stream0 stream1 null outstream 3",
-        "long COREMOD_MEMORY_streamDiff(const char *IDstream0_name, const char *IDstream1_name, const char *IDstreamout_name, long semtrig)");
+    RegisterCLIcommand("streamdiff", __FILE__, COREMOD_MEMORY_streamDiff__cli,
+                       "compute difference between two image streams",
+                       "<in stream 0> <in stream 1> <out stream> <optional mask> <sem trigger index>",
+                       "streamdiff stream0 stream1 null outstream 3",
+                       "long COREMOD_MEMORY_streamDiff(const char *IDstream0_name, const char *IDstream1_name, const "
+                       "char *IDstreamout_name, long semtrig)");
 
     return RETURN_SUCCESS;
 }
 
-
-
-
-
-
-
-
-
-
-
-
-
 /**
  * ## Purpose
  *
@@ -94,23 +58,18 @@ errno_t stream_diff_addCLIcmd()
  * Triggers on stream0\n
  *
  */
-imageID COREMOD_MEMORY_streamDiff(
-    const char *IDstream0_name,
-    const char *IDstream1_name,
-    const char *IDstreammask_name,
-    const char *IDstreamout_name,
-    long        semtrig
-)
+imageID COREMOD_MEMORY_streamDiff(const char *IDstream0_name, const char *IDstream1_name, const char *IDstreammask_name,
+                                  const char *IDstreamout_name, long semtrig)
 {
-    imageID    ID0;
-    imageID    ID1;
-    imageID    IDout;
-    uint32_t   xsize;
-    uint32_t   ysize;
-    uint64_t   xysize;
-    uint32_t  *arraysize;
-    unsigned long long  cnt;
-    imageID    IDmask; // optional
+    imageID ID0;
+    imageID ID1;
+    imageID IDout;
+    uint32_t xsize;
+    uint32_t ysize;
+    uint64_t xysize;
+    uint32_t *arraysize;
+    unsigned long long cnt;
+    imageID IDmask; // optional
 
     ID0 = image_ID(IDstream0_name);
     ID1 = image_ID(IDstream1_name);
@@ -120,17 +79,17 @@ imageID COREMOD_MEMORY_streamDiff(
     ysize = data.image[ID0].md[0].size[1];
     xysize = xsize * ysize;
 
-    arraysize = (uint32_t *) malloc(sizeof(uint32_t) * 2);
-    if(arraysize == NULL)
+    arraysize = (uint32_t *)malloc(sizeof(uint32_t) * 2);
+    if (arraysize == NULL)
     {
-		PRINT_ERROR("malloc error");
-		abort();
-	}
+        PRINT_ERROR("malloc error");
+        abort();
+    }
     arraysize[0] = xsize;
     arraysize[1] = ysize;
 
     IDout = image_ID(IDstreamout_name);
-    if(IDout == -1)
+    if (IDout == -1)
     {
         create_image_ID(IDstreamout_name, 2, arraysize, _DATATYPE_FLOAT, 1, 0, 0, &IDout);
         COREMOD_MEMORY_image_set_createsem(IDstreamout_name, IMAGE_NB_SEMAPHORE);
@@ -138,13 +97,12 @@ imageID COREMOD_MEMORY_streamDiff(
 
     free(arraysize);
 
-
-    while(1)
+    while (1)
     {
         // has new frame arrived ?
-        if(data.image[ID0].md[0].sem == 0)
+        if (data.image[ID0].md[0].sem == 0)
         {
-            while(cnt == data.image[ID0].md[0].cnt0)   // test if new frame exists
+            while (cnt == data.image[ID0].md[0].cnt0) // test if new frame exists
             {
                 usleep(5);
             }
@@ -155,33 +113,27 @@ imageID COREMOD_MEMORY_streamDiff(
             sem_wait(data.image[ID0].semptr[semtrig]);
         }
 
-
-
-
         data.image[IDout].md[0].write = 1;
-        if(IDmask == -1)
+        if (IDmask == -1)
         {
-            for(uint64_t ii = 0; ii < xysize; ii++)
+            for (uint64_t ii = 0; ii < xysize; ii++)
             {
-                data.image[IDout].array.F[ii] = data.image[ID0].array.F[ii] -
-                                                data.image[ID1].array.F[ii];
+                data.image[IDout].array.F[ii] = data.image[ID0].array.F[ii] - data.image[ID1].array.F[ii];
             }
         }
         else
         {
-            for(uint64_t ii = 0; ii < xysize; ii++)
+            for (uint64_t ii = 0; ii < xysize; ii++)
             {
-                data.image[IDout].array.F[ii] = (data.image[ID0].array.F[ii] -
-                                                 data.image[ID1].array.F[ii]) * data.image[IDmask].array.F[ii];
+                data.image[IDout].array.F[ii] =
+                    (data.image[ID0].array.F[ii] - data.image[ID1].array.F[ii]) * data.image[IDmask].array.F[ii];
             }
         }
-        COREMOD_MEMORY_image_set_sempost_byID(IDout, -1);;
+        COREMOD_MEMORY_image_set_sempost_byID(IDout, -1);
+        ;
         data.image[IDout].md[0].cnt0++;
         data.image[IDout].md[0].write = 0;
     }
 
-
     return IDout;
 }
-
-
diff --git a/src/COREMOD_memory/stream_diff.h b/src/COREMOD_memory/stream_diff.h
index 3c5ea535..190dcd06 100644
--- a/src/COREMOD_memory/stream_diff.h
+++ b/src/COREMOD_memory/stream_diff.h
@@ -2,14 +2,7 @@
  * @file    stream_diff.h
  */
 
-
 errno_t stream_diff_addCLIcmd();
 
-
-imageID COREMOD_MEMORY_streamDiff(
-    const char *IDstream0_name,
-    const char *IDstream1_name,
-    const char *IDstreammask_name,
-    const char *IDstreamout_name,
-    long        semtrig
-);
+imageID COREMOD_MEMORY_streamDiff(const char *IDstream0_name, const char *IDstream1_name, const char *IDstreammask_name,
+                                  const char *IDstreamout_name, long semtrig);
diff --git a/src/COREMOD_memory/stream_halfimdiff.c b/src/COREMOD_memory/stream_halfimdiff.c
index 21c85eff..4c50a4b8 100644
--- a/src/COREMOD_memory/stream_halfimdiff.c
+++ b/src/COREMOD_memory/stream_halfimdiff.c
@@ -1,29 +1,18 @@
-/** 
+/**
  * @file stream_hlfimdiff.c
  * @brief difference between two halves of stream image
  */
 
-
 #include "CommandLineInterface/CLIcore.h"
-#include "image_ID.h"
 #include "create_image.h"
+#include "image_ID.h"
 #include "stream_sem.h"
 
-
-
-
-
-
 // ==========================================
 // Forward declaration(s)
 // ==========================================
 
-imageID COREMOD_MEMORY_stream_halfimDiff(
-    const char *IDstream_name,
-    const char *IDstreamout_name,
-    long        semtrig
-);
-
+imageID COREMOD_MEMORY_stream_halfimDiff(const char *IDstream_name, const char *IDstreamout_name, long semtrig);
 
 // ==========================================
 // Command line interface wrapper function(s)
@@ -31,17 +20,10 @@ imageID COREMOD_MEMORY_stream_halfimDiff(
 
 static errno_t COREMOD_MEMORY_stream_halfimDiff__cli()
 {
-    if(0
-            + CLI_checkarg(1, CLIARG_IMG)
-            + CLI_checkarg(2, CLIARG_IMG)
-            + CLI_checkarg(3, CLIARG_LONG)
-            == 0)
+    if (0 + CLI_checkarg(1, CLIARG_IMG) + CLI_checkarg(2, CLIARG_IMG) + CLI_checkarg(3, CLIARG_LONG) == 0)
     {
-        COREMOD_MEMORY_stream_halfimDiff(
-            data.cmdargtoken[1].val.string,
-            data.cmdargtoken[2].val.string,
-            data.cmdargtoken[3].val.numl
-        );
+        COREMOD_MEMORY_stream_halfimDiff(data.cmdargtoken[1].val.string, data.cmdargtoken[2].val.string,
+                                         data.cmdargtoken[3].val.numl);
         return CLICMD_SUCCESS;
     }
     else
@@ -50,9 +32,6 @@ static errno_t COREMOD_MEMORY_stream_halfimDiff__cli()
     }
 }
 
-
-
-
 // ==========================================
 // Register CLI command(s)
 // ==========================================
@@ -60,112 +39,95 @@ static errno_t COREMOD_MEMORY_stream_halfimDiff__cli()
 errno_t stream_halfimdiff_addCLIcmd()
 {
     RegisterCLIcommand(
-        "streamhalfdiff",
-        __FILE__,
-        COREMOD_MEMORY_stream_halfimDiff__cli,
-        "compute difference between two halves of an image stream",
-        "<in stream> <out stream> <sem trigger index>",
+        "streamhalfdiff", __FILE__, COREMOD_MEMORY_stream_halfimDiff__cli,
+        "compute difference between two halves of an image stream", "<in stream> <out stream> <sem trigger index>",
         "streamhalfdiff stream outstream 3",
         "long COREMOD_MEMORY_stream_halfimDiff(const char *IDstream_name, const char *IDstreamout_name, long semtrig)");
-	
+
     return RETURN_SUCCESS;
 }
 
-
-
-
-
-
-
-
 //
 // compute difference between two halves of an image stream
 // triggers on instream
 //
-imageID COREMOD_MEMORY_stream_halfimDiff(
-    const char *IDstream_name,
-    const char *IDstreamout_name,
-    long        semtrig
-)
+imageID COREMOD_MEMORY_stream_halfimDiff(const char *IDstream_name, const char *IDstreamout_name, long semtrig)
 {
-    imageID    ID0;
-    imageID    IDout;
-    uint32_t   xsizein;
-    uint32_t   ysizein;
-    uint32_t   xsize;
-    uint32_t   ysize;
-    uint64_t   xysize;
-    uint32_t  *arraysize;
-    unsigned long long  cnt;
-    uint8_t    datatype;
-    uint8_t    datatypeout;
-
+    imageID ID0;
+    imageID IDout;
+    uint32_t xsizein;
+    uint32_t ysizein;
+    uint32_t xsize;
+    uint32_t ysize;
+    uint64_t xysize;
+    uint32_t *arraysize;
+    unsigned long long cnt;
+    uint8_t datatype;
+    uint8_t datatypeout;
 
     ID0 = image_ID(IDstream_name);
 
     xsizein = data.image[ID0].md[0].size[0];
     ysizein = data.image[ID0].md[0].size[1];
-//    xysizein = xsizein*ysizein;
+    //    xysizein = xsizein*ysizein;
 
     xsize = xsizein;
     ysize = ysizein / 2;
     xysize = xsize * ysize;
 
-
-    arraysize = (uint32_t *) malloc(sizeof(uint32_t) * 2);
-    if(arraysize == NULL)
+    arraysize = (uint32_t *)malloc(sizeof(uint32_t) * 2);
+    if (arraysize == NULL)
     {
-		PRINT_ERROR("malloc error");
-		abort();
-	}    
+        PRINT_ERROR("malloc error");
+        abort();
+    }
     arraysize[0] = xsize;
     arraysize[1] = ysize;
 
     datatype = data.image[ID0].md[0].datatype;
     datatypeout = _DATATYPE_FLOAT;
-    switch(datatype)
+    switch (datatype)
     {
 
-        case _DATATYPE_UINT8:
-            datatypeout = _DATATYPE_INT16;
-            break;
+    case _DATATYPE_UINT8:
+        datatypeout = _DATATYPE_INT16;
+        break;
 
-        case _DATATYPE_UINT16:
-            datatypeout = _DATATYPE_INT32;
-            break;
+    case _DATATYPE_UINT16:
+        datatypeout = _DATATYPE_INT32;
+        break;
 
-        case _DATATYPE_UINT32:
-            datatypeout = _DATATYPE_INT64;
-            break;
+    case _DATATYPE_UINT32:
+        datatypeout = _DATATYPE_INT64;
+        break;
 
-        case _DATATYPE_UINT64:
-            datatypeout = _DATATYPE_INT64;
-            break;
+    case _DATATYPE_UINT64:
+        datatypeout = _DATATYPE_INT64;
+        break;
 
+    case _DATATYPE_INT8:
+        datatypeout = _DATATYPE_INT16;
+        break;
 
-        case _DATATYPE_INT8:
-            datatypeout = _DATATYPE_INT16;
-            break;
+    case _DATATYPE_INT16:
+        datatypeout = _DATATYPE_INT32;
+        break;
 
-        case _DATATYPE_INT16:
-            datatypeout = _DATATYPE_INT32;
-            break;
+    case _DATATYPE_INT32:
+        datatypeout = _DATATYPE_INT64;
+        break;
 
-        case _DATATYPE_INT32:
-            datatypeout = _DATATYPE_INT64;
-            break;
-
-        case _DATATYPE_INT64:
-            datatypeout = _DATATYPE_INT64;
-            break;
+    case _DATATYPE_INT64:
+        datatypeout = _DATATYPE_INT64;
+        break;
 
-        case _DATATYPE_DOUBLE:
-            datatypeout = _DATATYPE_DOUBLE;
-            break;
+    case _DATATYPE_DOUBLE:
+        datatypeout = _DATATYPE_DOUBLE;
+        break;
     }
 
     IDout = image_ID(IDstreamout_name);
-    if(IDout == -1)
+    if (IDout == -1)
     {
         create_image_ID(IDstreamout_name, 2, arraysize, datatypeout, 1, 0, 0, &IDout);
         COREMOD_MEMORY_image_set_createsem(IDstreamout_name, IMAGE_NB_SEMAPHORE);
@@ -173,14 +135,12 @@ imageID COREMOD_MEMORY_stream_halfimDiff(
 
     free(arraysize);
 
-
-
-    while(1)
+    while (1)
     {
         // has new frame arrived ?
-        if(data.image[ID0].md[0].sem == 0)
+        if (data.image[ID0].md[0].sem == 0)
         {
-            while(cnt == data.image[ID0].md[0].cnt0) // test if new frame exists
+            while (cnt == data.image[ID0].md[0].cnt0) // test if new frame exists
             {
                 usleep(5);
             }
@@ -193,93 +153,86 @@ imageID COREMOD_MEMORY_stream_halfimDiff(
 
         data.image[IDout].md[0].write = 1;
 
-        switch(datatype)
+        switch (datatype)
         {
 
-            case _DATATYPE_UINT8:
-                for(uint64_t ii = 0; ii < xysize; ii++)
-                {
-                    data.image[IDout].array.SI16[ii] = data.image[ID0].array.UI8[ii] -
-                                                       data.image[ID0].array.UI8[xysize + ii];
-                }
-                break;
-
-            case _DATATYPE_UINT16:
-                for(uint64_t ii = 0; ii < xysize; ii++)
-                {
-                    data.image[IDout].array.SI32[ii] = data.image[ID0].array.UI16[ii] -
-                                                       data.image[ID0].array.UI16[xysize + ii];
-                }
-                break;
-
-            case _DATATYPE_UINT32:
-                for(uint64_t ii = 0; ii < xysize; ii++)
-                {
-                    data.image[IDout].array.SI64[ii] = data.image[ID0].array.UI32[ii] -
-                                                       data.image[ID0].array.UI32[xysize + ii];
-                }
-                break;
-
-            case _DATATYPE_UINT64:
-                for(uint64_t ii = 0; ii < xysize; ii++)
-                {
-                    data.image[IDout].array.SI64[ii] = data.image[ID0].array.UI64[ii] -
-                                                       data.image[ID0].array.UI64[xysize + ii];
-                }
-                break;
-
-
-
-            case _DATATYPE_INT8:
-                for(uint64_t ii = 0; ii < xysize; ii++)
-                {
-                    data.image[IDout].array.SI16[ii] = data.image[ID0].array.SI8[ii] -
-                                                       data.image[ID0].array.SI8[xysize + ii];
-                }
-                break;
-
-            case _DATATYPE_INT16:
-                for(uint64_t ii = 0; ii < xysize; ii++)
-                {
-                    data.image[IDout].array.SI32[ii] = data.image[ID0].array.SI16[ii] -
-                                                       data.image[ID0].array.SI16[xysize + ii];
-                }
-                break;
-
-            case _DATATYPE_INT32:
-                for(uint64_t ii = 0; ii < xysize; ii++)
-                {
-                    data.image[IDout].array.SI64[ii] = data.image[ID0].array.SI32[ii] -
-                                                       data.image[ID0].array.SI32[xysize + ii];
-                }
-                break;
-
-            case _DATATYPE_INT64:
-                for(uint64_t ii = 0; ii < xysize; ii++)
-                {
-                    data.image[IDout].array.SI64[ii] = data.image[ID0].array.SI64[ii] -
-                                                       data.image[ID0].array.SI64[xysize + ii];
-                }
-                break;
-
-
-
-            case _DATATYPE_FLOAT:
-                for(uint64_t ii = 0; ii < xysize; ii++)
-                {
-                    data.image[IDout].array.F[ii] = data.image[ID0].array.F[ii] -
-                                                    data.image[ID0].array.F[xysize + ii];
-                }
-                break;
-
-            case _DATATYPE_DOUBLE:
-                for(uint64_t ii = 0; ii < xysize; ii++)
-                {
-                    data.image[IDout].array.D[ii] = data.image[ID0].array.D[ii] -
-                                                    data.image[ID0].array.D[xysize + ii];
-                }
-                break;
+        case _DATATYPE_UINT8:
+            for (uint64_t ii = 0; ii < xysize; ii++)
+            {
+                data.image[IDout].array.SI16[ii] =
+                    data.image[ID0].array.UI8[ii] - data.image[ID0].array.UI8[xysize + ii];
+            }
+            break;
+
+        case _DATATYPE_UINT16:
+            for (uint64_t ii = 0; ii < xysize; ii++)
+            {
+                data.image[IDout].array.SI32[ii] =
+                    data.image[ID0].array.UI16[ii] - data.image[ID0].array.UI16[xysize + ii];
+            }
+            break;
+
+        case _DATATYPE_UINT32:
+            for (uint64_t ii = 0; ii < xysize; ii++)
+            {
+                data.image[IDout].array.SI64[ii] =
+                    data.image[ID0].array.UI32[ii] - data.image[ID0].array.UI32[xysize + ii];
+            }
+            break;
+
+        case _DATATYPE_UINT64:
+            for (uint64_t ii = 0; ii < xysize; ii++)
+            {
+                data.image[IDout].array.SI64[ii] =
+                    data.image[ID0].array.UI64[ii] - data.image[ID0].array.UI64[xysize + ii];
+            }
+            break;
+
+        case _DATATYPE_INT8:
+            for (uint64_t ii = 0; ii < xysize; ii++)
+            {
+                data.image[IDout].array.SI16[ii] =
+                    data.image[ID0].array.SI8[ii] - data.image[ID0].array.SI8[xysize + ii];
+            }
+            break;
+
+        case _DATATYPE_INT16:
+            for (uint64_t ii = 0; ii < xysize; ii++)
+            {
+                data.image[IDout].array.SI32[ii] =
+                    data.image[ID0].array.SI16[ii] - data.image[ID0].array.SI16[xysize + ii];
+            }
+            break;
+
+        case _DATATYPE_INT32:
+            for (uint64_t ii = 0; ii < xysize; ii++)
+            {
+                data.image[IDout].array.SI64[ii] =
+                    data.image[ID0].array.SI32[ii] - data.image[ID0].array.SI32[xysize + ii];
+            }
+            break;
 
+        case _DATATYPE_INT64:
+            for (uint64_t ii = 0; ii < xysize; ii++)
+            {
+                data.image[IDout].array.SI64[ii] =
+                    data.image[ID0].array.SI64[ii] - data.image[ID0].array.SI64[xysize + ii];
+            }
+            break;
+
+        case _DATATYPE_FLOAT:
+            for (uint64_t ii = 0; ii < xysize; ii++)
+            {
+                data.image[IDout].array.F[ii] = data.image[ID0].array.F[ii] - data.image[ID0].array.F[xysize + ii];
+            }
+            break;
+
+        case _DATATYPE_DOUBLE:
+            for (uint64_t ii = 0; ii < xysize; ii++)
+            {
+                data.image[IDout].array.D[ii] = data.image[ID0].array.D[ii] - data.image[ID0].array.D[xysize + ii];
+            }
+            break;
         }
 
         COREMOD_MEMORY_image_set_sempost_byID(IDout, -1);
@@ -287,7 +240,5 @@ imageID COREMOD_MEMORY_stream_halfimDiff(
         data.image[IDout].md[0].write = 0;
     }
 
-
     return IDout;
 }
-
diff --git a/src/COREMOD_memory/stream_halfimdiff.h b/src/COREMOD_memory/stream_halfimdiff.h
index a999cd8a..c0628d15 100644
--- a/src/COREMOD_memory/stream_halfimdiff.h
+++ b/src/COREMOD_memory/stream_halfimdiff.h
@@ -1,13 +1,7 @@
-/** 
+/**
  * @file stream_hlfimdiff.h
  */
 
-
 errno_t stream_halfimdiff_addCLIcmd();
 
-
-imageID COREMOD_MEMORY_stream_halfimDiff(
-    const char *IDstream_name,
-    const char *IDstreamout_name,
-    long        semtrig
-);
+imageID COREMOD_MEMORY_stream_halfimDiff(const char *IDstream_name, const char *IDstreamout_name, long semtrig);
diff --git a/src/COREMOD_memory/stream_monitorlimits.c b/src/COREMOD_memory/stream_monitorlimits.c
index 47c588eb..3503a671 100644
--- a/src/COREMOD_memory/stream_monitorlimits.c
+++ b/src/COREMOD_memory/stream_monitorlimits.c
@@ -8,36 +8,22 @@
 #include <math.h>
 
 #include "CommandLineInterface/CLIcore.h"
-#include "image_ID.h"
-#include "stream_sem.h"
 #include "create_image.h"
 #include "delete_image.h"
+#include "image_ID.h"
+#include "stream_sem.h"
 
 #include "COREMOD_tools/COREMOD_tools.h"
 
-
-
-
-
-
-
 // ==========================================
 // Forward declaration(s)
 // ==========================================
 
-
-
 errno_t stream_monitorlimits_FPCONF();
 
 errno_t stream_monitorlimits_RUN();
 
-
-errno_t stream_monitorlimits(
-    const char *instreamname
-);
-
-
-
+errno_t stream_monitorlimits(const char *instreamname);
 
 // ==========================================
 // Command line interface wrapper function(s)
@@ -52,31 +38,28 @@ static errno_t COREMOD_MEMORY_stream_monitorlimits__cli()
     // See code in function_parameter.c for detailed rules.
     function_parameter_getFPSargs_from_CLIfunc("streammlim");
 
-    if(data.FPS_CMDCODE != 0) {	// use FPS implementation
+    if (data.FPS_CMDCODE != 0)
+    { // use FPS implementation
         // set pointers to CONF and RUN functions
         data.FPS_CONFfunc = stream_monitorlimits_FPCONF;
-        data.FPS_RUNfunc  = stream_monitorlimits_RUN;
+        data.FPS_RUNfunc = stream_monitorlimits_RUN;
         function_parameter_execFPScmd();
         return RETURN_SUCCESS;
     }
 
-
     // call non FPS implementation - all parameters specified at function launch
-    if(
-        CLI_checkarg(1, CLIARG_IMG)
-        == 0) {
-        stream_monitorlimits(
-            data.cmdargtoken[1].val.string
-        );
+    if (CLI_checkarg(1, CLIARG_IMG) == 0)
+    {
+        stream_monitorlimits(data.cmdargtoken[1].val.string);
 
         return RETURN_SUCCESS;
-    } else {
+    }
+    else
+    {
         return CLICMD_INVALID_ARG;
     }
 }
 
-
-
 // ==========================================
 // Register CLI command(s)
 // ==========================================
@@ -84,25 +67,13 @@ static errno_t COREMOD_MEMORY_stream_monitorlimits__cli()
 errno_t stream_monitorlimits_addCLIcmd()
 {
 
-    RegisterCLIcommand(
-        "streammlim",
-        __FILE__,
-        COREMOD_MEMORY_stream_monitorlimits__cli,
-        "monitor stream values for safety",
-        "FPS function",
-        "streammlim",
-        "COREMOD_MEMORY_stream_monitorlimits_RUN");
+    RegisterCLIcommand("streammlim", __FILE__, COREMOD_MEMORY_stream_monitorlimits__cli,
+                       "monitor stream values for safety", "FPS function", "streammlim",
+                       "COREMOD_MEMORY_stream_monitorlimits_RUN");
 
     return RETURN_SUCCESS;
 }
 
-
-
-
-
-
-
-
 /**
  * @brief Manages configuration parameters for stream_monitorlimits
  *
@@ -130,15 +101,12 @@ errno_t stream_monitorlimits_FPCONF()
     FPFLAG = FPFLAG_DEFAULT_INPUT;
     FPFLAG &= ~FPFLAG_WRITERUN;
 
-    FPS_ADDPARAM_STREAM_IN(streaminname,   ".in_sname",  "input stream", NULL);
-
-    long dtus_default[4] = { 50, 1, 1000000000, 50 };
-    long fp_dtus    = 0;
-    function_parameter_add_entry(&fps, ".dtus",
-                      "Loop period [us]", FPTYPE_INT64, FPFLAG, &dtus_default, &fp_dtus);
-    (void) fp_dtus; // suppresses unused parameter compiler warning
-
+    FPS_ADDPARAM_STREAM_IN(streaminname, ".in_sname", "input stream", NULL);
 
+    long dtus_default[4] = {50, 1, 1000000000, 50};
+    long fp_dtus = 0;
+    function_parameter_add_entry(&fps, ".dtus", "Loop period [us]", FPTYPE_INT64, FPFLAG, &dtus_default, &fp_dtus);
+    (void)fp_dtus; // suppresses unused parameter compiler warning
 
     // Limits
 
@@ -146,57 +114,32 @@ errno_t stream_monitorlimits_FPCONF()
     FPFLAG |= FPFLAG_WRITERUN;
 
     long fpi_minON = 0;
-    function_parameter_add_entry(&fps, ".minON", "min toggle",
-                     FPTYPE_ONOFF, FPFLAG, NULL, &fpi_minON);
-    (void) fpi_minON;
+    function_parameter_add_entry(&fps, ".minON", "min toggle", FPTYPE_ONOFF, FPFLAG, NULL, &fpi_minON);
+    (void)fpi_minON;
 
     long fpi_minVal = 0;
-    function_parameter_add_entry(&fps, ".minVal", "min value",
-                      FPTYPE_FLOAT32, FPFLAG, NULL, &fpi_minVal);
-    (void) fpi_minVal;
-
-
-
+    function_parameter_add_entry(&fps, ".minVal", "min value", FPTYPE_FLOAT32, FPFLAG, NULL, &fpi_minVal);
+    (void)fpi_minVal;
 
     long fpi_maxON = 0;
-    function_parameter_add_entry(&fps, ".maxON", "max toggle",
-                     FPTYPE_ONOFF, FPFLAG_DEFAULT_INPUT, NULL, &fpi_maxON);
-    (void) fpi_maxON;
+    function_parameter_add_entry(&fps, ".maxON", "max toggle", FPTYPE_ONOFF, FPFLAG_DEFAULT_INPUT, NULL, &fpi_maxON);
+    (void)fpi_maxON;
 
     long fpi_maxVal = 0;
-    function_parameter_add_entry(&fps, ".minVal", "min value",
-                      FPTYPE_FLOAT32, FPFLAG, NULL, &fpi_maxVal);
-    (void) fpi_maxVal;
-
-
-
+    function_parameter_add_entry(&fps, ".minVal", "min value", FPTYPE_FLOAT32, FPFLAG, NULL, &fpi_maxVal);
+    (void)fpi_maxVal;
 
     // start function parameter conf loop, defined in function_parameter.h
     FPS_CONFLOOP_START
 
-
     // stop function parameter conf loop, defined in function_parameter.h
     FPS_CONFLOOP_END
 
     printf("CONF EXIT CONDITION MET\n");
 
-
     return RETURN_SUCCESS;
 }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
 /**
  * @brief Delay image stream by time offset
  *
@@ -210,7 +153,7 @@ errno_t stream_monitorlimits_RUN()
     // ===========================
     /// ### CONNECT TO FPS
     // ===========================
-    FPS_CONNECT( data.FPS_name, FPSCONNECT_RUN );
+    FPS_CONNECT(data.FPS_name, FPSCONNECT_RUN);
 
     // ===============================
     /// ### GET FUNCTION PARAMETER VALUES
@@ -219,26 +162,19 @@ errno_t stream_monitorlimits_RUN()
     // These parameters are read once, before running the loop
     //
     char IDin_name[FUNCTION_PARAMETER_STRMAXLEN];
-    strncpy(IDin_name,  functionparameter_GetParamPtr_STRING(&fps, ".in_sname"),
-            FUNCTION_PARAMETER_STRMAXLEN-1);
-
-    long dtus    = functionparameter_GetParamValue_INT64(&fps, ".dtus");
-
-
+    strncpy(IDin_name, functionparameter_GetParamPtr_STRING(&fps, ".in_sname"), FUNCTION_PARAMETER_STRMAXLEN - 1);
 
+    long dtus = functionparameter_GetParamValue_INT64(&fps, ".dtus");
 
     // ===========================
     /// ### processinfo support
     // ===========================
     PROCESSINFO *processinfo;
 
-    processinfo = processinfo_setup(
-                      data.FPS_name,	             // re-use fpsname as processinfo name
-                      "monitor stream limits",     // description
-                      "starting monitor",          // message on startup
-                      __FUNCTION__, __FILE__, __LINE__
-                  );
-
+    processinfo = processinfo_setup(data.FPS_name,           // re-use fpsname as processinfo name
+                                    "monitor stream limits", // description
+                                    "starting monitor",      // message on startup
+                                    __FUNCTION__, __FILE__, __LINE__);
 
     // =============================================
     /// ### OPTIONAL: TESTING CONDITION FOR LOOP ENTRY
@@ -246,22 +182,18 @@ errno_t stream_monitorlimits_RUN()
     // Pre-loop testing, anything that would prevent loop from starting should issue message
     int loopOK = 1;
 
-
-
     // Specify input stream trigger
     imageID IDin = image_ID(IDin_name);
 
-    processinfo_waitoninputstream_init(processinfo, IDin,
-                                       PROCESSINFO_TRIGGERMODE_DELAY, -1);
+    processinfo_waitoninputstream_init(processinfo, IDin, PROCESSINFO_TRIGGERMODE_DELAY, -1);
     processinfo->triggerdelay.tv_sec = 0;
-    processinfo->triggerdelay.tv_nsec = (long) (dtus*1000);
-    while(processinfo->triggerdelay.tv_nsec > 1000000000)
+    processinfo->triggerdelay.tv_nsec = (long)(dtus * 1000);
+    while (processinfo->triggerdelay.tv_nsec > 1000000000)
     {
         processinfo->triggerdelay.tv_nsec -= 1000000000;
         processinfo->triggerdelay.tv_sec += 1;
     }
 
-
     // ===========================
     /// ### START LOOP
     // ===========================
@@ -269,19 +201,16 @@ errno_t stream_monitorlimits_RUN()
     // Notify processinfo that we are entering loop
     processinfo_loopstart(processinfo);
 
-
-    while(loopOK == 1)
+    while (loopOK == 1)
     {
         loopOK = processinfo_loopstep(processinfo);
 
         processinfo_waitoninputstream(processinfo);
 
-
         processinfo_exec_start(processinfo);
 
-        if(processinfo_compute_status(processinfo) == 1)
+        if (processinfo_compute_status(processinfo) == 1)
         {
-
         }
 
         // process signals, increment loop counter
@@ -294,21 +223,10 @@ errno_t stream_monitorlimits_RUN()
     processinfo_cleanExit(processinfo);
     function_parameter_RUNexit(&fps);
 
-
     return RETURN_SUCCESS;
 }
 
-
-
-
-
-
-
-
-
-errno_t stream_monitorlimits(
-    const char *instreamname
-)
+errno_t stream_monitorlimits(const char *instreamname)
 {
     FUNCTION_PARAMETER_STRUCT fps;
 
@@ -328,9 +246,3 @@ errno_t stream_monitorlimits(
 
     return RETURN_SUCCESS;
 }
-
-
-
-
-
-
diff --git a/src/COREMOD_memory/stream_monitorlimits.h b/src/COREMOD_memory/stream_monitorlimits.h
index 52ff95d5..9e93ca7d 100644
--- a/src/COREMOD_memory/stream_monitorlimits.h
+++ b/src/COREMOD_memory/stream_monitorlimits.h
@@ -1,19 +1,10 @@
 /** @file stream_delay,h
  */
 
-
-
-
 errno_t stream_monitorlimits_addCLIcmd();
 
-
-
-
 errno_t stream_monitorlimits_FPCONF();
 
 errno_t stream_monitorlimits_RUN();
 
-
-errno_t stream_monitorlimits(
-    const char *instreamname
-);
+errno_t stream_monitorlimits(const char *instreamname);
diff --git a/src/COREMOD_memory/stream_paste.c b/src/COREMOD_memory/stream_paste.c
index 31c7b473..87f6f3c4 100644
--- a/src/COREMOD_memory/stream_paste.c
+++ b/src/COREMOD_memory/stream_paste.c
@@ -3,54 +3,31 @@
  * @brief Paste two equal size 2D streams into an output 2D stream
 */
 
-
-
 #include "CommandLineInterface/CLIcore.h"
+#include "create_image.h"
 #include "image_ID.h"
 #include "stream_sem.h"
-#include "create_image.h"
-
-
-
 
 // ==========================================
 // Forward declarations
 // ==========================================
 
-imageID COREMOD_MEMORY_streamPaste(
-    const char *IDstream0_name,
-    const char *IDstream1_name,
-    const char *IDstreamout_name,
-    long        semtrig0,
-    long        semtrig1,
-    int         master
-);
-
+imageID COREMOD_MEMORY_streamPaste(const char *IDstream0_name, const char *IDstream1_name, const char *IDstreamout_name,
+                                   long semtrig0, long semtrig1, int master);
 
 // ==========================================
 // Command line interface wrapper functions
 // ==========================================
 
-
 static errno_t COREMOD_MEMORY_streamPaste__cli()
 {
-    if(0
-            + CLI_checkarg(1, CLIARG_IMG)
-            + CLI_checkarg(2, CLIARG_IMG)
-            + CLI_checkarg(3, 5)
-            + CLI_checkarg(4, CLIARG_LONG)
-            + CLI_checkarg(5, CLIARG_LONG)
-            + CLI_checkarg(6, CLIARG_LONG)
-            == 0)
+    if (0 + CLI_checkarg(1, CLIARG_IMG) + CLI_checkarg(2, CLIARG_IMG) + CLI_checkarg(3, 5) +
+            CLI_checkarg(4, CLIARG_LONG) + CLI_checkarg(5, CLIARG_LONG) + CLI_checkarg(6, CLIARG_LONG) ==
+        0)
     {
-        COREMOD_MEMORY_streamPaste(
-            data.cmdargtoken[1].val.string,
-            data.cmdargtoken[2].val.string,
-            data.cmdargtoken[3].val.string,
-            data.cmdargtoken[4].val.numl,
-            data.cmdargtoken[5].val.numl,
-            data.cmdargtoken[6].val.numl
-        );
+        COREMOD_MEMORY_streamPaste(data.cmdargtoken[1].val.string, data.cmdargtoken[2].val.string,
+                                   data.cmdargtoken[3].val.string, data.cmdargtoken[4].val.numl,
+                                   data.cmdargtoken[5].val.numl, data.cmdargtoken[6].val.numl);
         return CLICMD_SUCCESS;
     }
     else
@@ -59,8 +36,6 @@ static errno_t COREMOD_MEMORY_streamPaste__cli()
     }
 }
 
-
-
 // ==========================================
 // Register CLI command(s)
 // ==========================================
@@ -68,50 +43,34 @@ static errno_t COREMOD_MEMORY_streamPaste__cli()
 errno_t stream_paste_addCLIcmd()
 {
 
-    RegisterCLIcommand(
-        "streampaste",
-        __FILE__,
-        COREMOD_MEMORY_streamPaste__cli,
-        "paste two 2D image streams of same size",
-        "<in stream 0> <in stream 1> <out stream> <sem trigger0> <sem trigger1> <master>",
-        "streampaste stream0 stream1 outstream 3 3 0",
-        "long COREMOD_MEMORY_streamPaste(const char *IDstream0_name, const char *IDstream1_name, const char *IDstreamout_name, long semtrig0, long semtrig1, int master)");
-
+    RegisterCLIcommand("streampaste", __FILE__, COREMOD_MEMORY_streamPaste__cli,
+                       "paste two 2D image streams of same size",
+                       "<in stream 0> <in stream 1> <out stream> <sem trigger0> <sem trigger1> <master>",
+                       "streampaste stream0 stream1 outstream 3 3 0",
+                       "long COREMOD_MEMORY_streamPaste(const char *IDstream0_name, const char *IDstream1_name, const "
+                       "char *IDstreamout_name, long semtrig0, long semtrig1, int master)");
 
     return RETURN_SUCCESS;
 }
 
-
-
-
-
-
-
-
 //
 // compute difference between two 2D streams
 // triggers alternatively on stream0 and stream1
 //
-imageID COREMOD_MEMORY_streamPaste(
-    const char *IDstream0_name,
-    const char *IDstream1_name,
-    const char *IDstreamout_name,
-    long        semtrig0,
-    long        semtrig1,
-    int         master
-)
+imageID COREMOD_MEMORY_streamPaste(const char *IDstream0_name, const char *IDstream1_name, const char *IDstreamout_name,
+                                   long semtrig0, long semtrig1, int master)
 {
-    imageID     ID0;
-    imageID     ID1;
-    imageID     IDout;
-    imageID     IDin;
-    long        Xoffset;
-    uint32_t    xsize;
-    uint32_t    ysize;
-    uint32_t   *arraysize;
-    unsigned long long   cnt;
-    uint8_t     datatype;
-    int         FrameIndex;
+    imageID ID0;
+    imageID ID1;
+    imageID IDout;
+    imageID IDin;
+    long Xoffset;
+    uint32_t xsize;
+    uint32_t ysize;
+    uint32_t *arraysize;
+    unsigned long long cnt;
+    uint8_t datatype;
+    int FrameIndex;
 
     ID0 = image_ID(IDstream0_name);
     ID1 = image_ID(IDstream1_name);
@@ -120,8 +79,8 @@ imageID COREMOD_MEMORY_streamPaste(
     ysize = data.image[ID0].md[0].size[1];
     datatype = data.image[ID0].md[0].datatype;
 
-    arraysize = (uint32_t *) malloc(sizeof(uint32_t) * 2);
-    if(arraysize == NULL)
+    arraysize = (uint32_t *)malloc(sizeof(uint32_t) * 2);
+    if (arraysize == NULL)
     {
         PRINT_ERROR("malloc error");
         abort();
@@ -130,24 +89,23 @@ imageID COREMOD_MEMORY_streamPaste(
     arraysize[1] = ysize;
 
     IDout = image_ID(IDstreamout_name);
-    if(IDout == -1)
+    if (IDout == -1)
     {
         create_image_ID(IDstreamout_name, 2, arraysize, datatype, 1, 0, 0, &IDout);
         COREMOD_MEMORY_image_set_createsem(IDstreamout_name, IMAGE_NB_SEMAPHORE);
     }
     free(arraysize);
 
-
     FrameIndex = 0;
 
-    while(1)
+    while (1)
     {
-        if(FrameIndex == 0)
+        if (FrameIndex == 0)
         {
             // has new frame 0 arrived ?
-            if(data.image[ID0].md[0].sem == 0)
+            if (data.image[ID0].md[0].sem == 0)
             {
-                while(cnt == data.image[ID0].md[0].cnt0) // test if new frame exists
+                while (cnt == data.image[ID0].md[0].cnt0) // test if new frame exists
                 {
                     usleep(5);
                 }
@@ -163,9 +121,9 @@ imageID COREMOD_MEMORY_streamPaste(
         else
         {
             // has new frame 1 arrived ?
-            if(data.image[ID1].md[0].sem == 0)
+            if (data.image[ID1].md[0].sem == 0)
             {
-                while(cnt == data.image[ID1].md[0].cnt0) // test if new frame exists
+                while (cnt == data.image[ID1].md[0].cnt0) // test if new frame exists
                 {
                     usleep(5);
                 }
@@ -179,133 +137,133 @@ imageID COREMOD_MEMORY_streamPaste(
             IDin = 1;
         }
 
-
         data.image[IDout].md[0].write = 1;
 
-        switch(datatype)
+        switch (datatype)
         {
-            case _DATATYPE_UINT8 :
-                for(uint32_t ii = 0; ii < xsize; ii++)
-                    for(uint32_t jj = 0; jj < ysize; jj++)
-                    {
-                        data.image[IDout].array.UI8[jj * 2 * xsize + ii + Xoffset] =
-                            data.image[IDin].array.UI8[jj * xsize + ii];
-                    }
-                break;
-
-            case _DATATYPE_UINT16 :
-                for(uint32_t ii = 0; ii < xsize; ii++)
-                    for(uint32_t jj = 0; jj < ysize; jj++)
-                    {
-                        data.image[IDout].array.UI16[jj * 2 * xsize + ii + Xoffset] =
-                            data.image[IDin].array.UI16[jj * xsize + ii];
-                    }
-                break;
-
-            case _DATATYPE_UINT32 :
-                for(uint32_t ii = 0; ii < xsize; ii++)
-                    for(uint32_t jj = 0; jj < ysize; jj++)
-                    {
-                        data.image[IDout].array.UI32[jj * 2 * xsize + ii + Xoffset] =
-                            data.image[IDin].array.UI32[jj * xsize + ii];
-                    }
-                break;
-
-            case _DATATYPE_UINT64 :
-                for(uint32_t ii = 0; ii < xsize; ii++)
-                    for(uint32_t jj = 0; jj < ysize; jj++)
-                    {
-                        data.image[IDout].array.UI64[jj * 2 * xsize + ii + Xoffset] =
-                            data.image[IDin].array.UI64[jj * xsize + ii];
-                    }
-                break;
-
-            case _DATATYPE_INT8 :
-                for(uint32_t ii = 0; ii < xsize; ii++)
-                    for(uint32_t jj = 0; jj < ysize; jj++)
-                    {
-                        data.image[IDout].array.SI8[jj * 2 * xsize + ii + Xoffset] =
-                            data.image[IDin].array.SI8[jj * xsize + ii];
-                    }
-                break;
-
-            case _DATATYPE_INT16 :
-                for(uint32_t ii = 0; ii < xsize; ii++)
-                    for(uint32_t jj = 0; jj < ysize; jj++)
-                    {
-                        data.image[IDout].array.SI16[jj * 2 * xsize + ii + Xoffset] =
-                            data.image[IDin].array.SI16[jj * xsize + ii];
-                    }
-                break;
-
-            case _DATATYPE_INT32 :
-                for(uint32_t ii = 0; ii < xsize; ii++)
-                    for(uint32_t jj = 0; jj < ysize; jj++)
-                    {
-                        data.image[IDout].array.SI32[jj * 2 * xsize + ii + Xoffset] =
-                            data.image[IDin].array.SI32[jj * xsize + ii];
-                    }
-                break;
-
-            case _DATATYPE_INT64 :
-                for(uint32_t ii = 0; ii < xsize; ii++)
-                    for(uint32_t jj = 0; jj < ysize; jj++)
-                    {
-                        data.image[IDout].array.SI64[jj * 2 * xsize + ii + Xoffset] =
-                            data.image[IDin].array.SI64[jj * xsize + ii];
-                    }
-                break;
-
-            case _DATATYPE_FLOAT :
-                for(uint32_t ii = 0; ii < xsize; ii++)
-                    for(uint32_t jj = 0; jj < ysize; jj++)
-                    {
-                        data.image[IDout].array.F[jj * 2 * xsize + ii + Xoffset] =
-                            data.image[IDin].array.F[jj * xsize + ii];
-                    }
-                break;
-
-            case _DATATYPE_DOUBLE :
-                for(uint32_t ii = 0; ii < xsize; ii++)
-                    for(uint32_t jj = 0; jj < ysize; jj++)
-                    {
-                        data.image[IDout].array.D[jj * 2 * xsize + ii + Xoffset] =
-                            data.image[IDin].array.D[jj * xsize + ii];
-                    }
-                break;
-
-            case _DATATYPE_COMPLEX_FLOAT :
-                for(uint32_t ii = 0; ii < xsize; ii++)
-                    for(uint32_t jj = 0; jj < ysize; jj++)
-                    {
-                        data.image[IDout].array.CF[jj * 2 * xsize + ii + Xoffset] =
-                            data.image[IDin].array.CF[jj * xsize + ii];
-                    }
-                break;
-
-            case _DATATYPE_COMPLEX_DOUBLE :
-                for(uint32_t ii = 0; ii < xsize; ii++)
-                    for(uint32_t jj = 0; jj < ysize; jj++)
-                    {
-                        data.image[IDout].array.CD[jj * 2 * xsize + ii + Xoffset] =
-                            data.image[IDin].array.CD[jj * xsize + ii];
-                    }
-                break;
-
-            default :
-                printf("Unknown data type\n");
-                exit(0);
-                break;
+        case _DATATYPE_UINT8:
+            for (uint32_t ii = 0; ii < xsize; ii++)
+                for (uint32_t jj = 0; jj < ysize; jj++)
+                {
+                    data.image[IDout].array.UI8[jj * 2 * xsize + ii + Xoffset] =
+                        data.image[IDin].array.UI8[jj * xsize + ii];
+                }
+            break;
+
+        case _DATATYPE_UINT16:
+            for (uint32_t ii = 0; ii < xsize; ii++)
+                for (uint32_t jj = 0; jj < ysize; jj++)
+                {
+                    data.image[IDout].array.UI16[jj * 2 * xsize + ii + Xoffset] =
+                        data.image[IDin].array.UI16[jj * xsize + ii];
+                }
+            break;
+
+        case _DATATYPE_UINT32:
+            for (uint32_t ii = 0; ii < xsize; ii++)
+                for (uint32_t jj = 0; jj < ysize; jj++)
+                {
+                    data.image[IDout].array.UI32[jj * 2 * xsize + ii + Xoffset] =
+                        data.image[IDin].array.UI32[jj * xsize + ii];
+                }
+            break;
+
+        case _DATATYPE_UINT64:
+            for (uint32_t ii = 0; ii < xsize; ii++)
+                for (uint32_t jj = 0; jj < ysize; jj++)
+                {
+                    data.image[IDout].array.UI64[jj * 2 * xsize + ii + Xoffset] =
+                        data.image[IDin].array.UI64[jj * xsize + ii];
+                }
+            break;
+
+        case _DATATYPE_INT8:
+            for (uint32_t ii = 0; ii < xsize; ii++)
+                for (uint32_t jj = 0; jj < ysize; jj++)
+                {
+                    data.image[IDout].array.SI8[jj * 2 * xsize + ii + Xoffset] =
+                        data.image[IDin].array.SI8[jj * xsize + ii];
+                }
+            break;
+
+        case _DATATYPE_INT16:
+            for (uint32_t ii = 0; ii < xsize; ii++)
+                for (uint32_t jj = 0; jj < ysize; jj++)
+                {
+                    data.image[IDout].array.SI16[jj * 2 * xsize + ii + Xoffset] =
+                        data.image[IDin].array.SI16[jj * xsize + ii];
+                }
+            break;
+
+        case _DATATYPE_INT32:
+            for (uint32_t ii = 0; ii < xsize; ii++)
+                for (uint32_t jj = 0; jj < ysize; jj++)
+                {
+                    data.image[IDout].array.SI32[jj * 2 * xsize + ii + Xoffset] =
+                        data.image[IDin].array.SI32[jj * xsize + ii];
+                }
+            break;
+
+        case _DATATYPE_INT64:
+            for (uint32_t ii = 0; ii < xsize; ii++)
+                for (uint32_t jj = 0; jj < ysize; jj++)
+                {
+                    data.image[IDout].array.SI64[jj * 2 * xsize + ii + Xoffset] =
+                        data.image[IDin].array.SI64[jj * xsize + ii];
+                }
+            break;
+
+        case _DATATYPE_FLOAT:
+            for (uint32_t ii = 0; ii < xsize; ii++)
+                for (uint32_t jj = 0; jj < ysize; jj++)
+                {
+                    data.image[IDout].array.F[jj * 2 * xsize + ii + Xoffset] =
+                        data.image[IDin].array.F[jj * xsize + ii];
+                }
+            break;
+
+        case _DATATYPE_DOUBLE:
+            for (uint32_t ii = 0; ii < xsize; ii++)
+                for (uint32_t jj = 0; jj < ysize; jj++)
+                {
+                    data.image[IDout].array.D[jj * 2 * xsize + ii + Xoffset] =
+                        data.image[IDin].array.D[jj * xsize + ii];
+                }
+            break;
+
+        case _DATATYPE_COMPLEX_FLOAT:
+            for (uint32_t ii = 0; ii < xsize; ii++)
+                for (uint32_t jj = 0; jj < ysize; jj++)
+                {
+                    data.image[IDout].array.CF[jj * 2 * xsize + ii + Xoffset] =
+                        data.image[IDin].array.CF[jj * xsize + ii];
+                }
+            break;
+
+        case _DATATYPE_COMPLEX_DOUBLE:
+            for (uint32_t ii = 0; ii < xsize; ii++)
+                for (uint32_t jj = 0; jj < ysize; jj++)
+                {
+                    data.image[IDout].array.CD[jj * 2 * xsize + ii + Xoffset] =
+                        data.image[IDin].array.CD[jj * xsize + ii];
+                }
+            break;
+
+        default:
+            printf("Unknown data type\n");
+            exit(0);
+            break;
         }
-        if(FrameIndex == master)
+        if (FrameIndex == master)
         {
-            COREMOD_MEMORY_image_set_sempost_byID(IDout, -1);;
+            COREMOD_MEMORY_image_set_sempost_byID(IDout, -1);
+            ;
             data.image[IDout].md[0].cnt0++;
         }
         data.image[IDout].md[0].cnt1 = FrameIndex;
         data.image[IDout].md[0].write = 0;
 
-        if(FrameIndex == 0)
+        if (FrameIndex == 0)
         {
             FrameIndex = 1;
         }
@@ -317,7 +275,3 @@ imageID COREMOD_MEMORY_streamPaste(
 
     return IDout;
 }
-
-
-
-
diff --git a/src/COREMOD_memory/stream_paste.h b/src/COREMOD_memory/stream_paste.h
index d6ec7ac1..2b3eb63a 100644
--- a/src/COREMOD_memory/stream_paste.h
+++ b/src/COREMOD_memory/stream_paste.h
@@ -1,16 +1,8 @@
-/** 
+/**
  * @file stream_paste.h
  */
 
-
 errno_t stream_paste_addCLIcmd();
 
-
-imageID COREMOD_MEMORY_streamPaste(
-    const char *IDstream0_name,
-    const char *IDstream1_name,
-    const char *IDstreamout_name,
-    long        semtrig0,
-    long        semtrig1,
-    int         master
-);
+imageID COREMOD_MEMORY_streamPaste(const char *IDstream0_name, const char *IDstream1_name, const char *IDstreamout_name,
+                                   long semtrig0, long semtrig1, int master);
diff --git a/src/COREMOD_memory/stream_pixmapdecode.c b/src/COREMOD_memory/stream_pixmapdecode.c
index aae85138..14d6db8d 100644
--- a/src/COREMOD_memory/stream_pixmapdecode.c
+++ b/src/COREMOD_memory/stream_pixmapdecode.c
@@ -1,67 +1,37 @@
 /** @file stream_pixmapdecode.c
  */
 
-
 #include "CommandLineInterface/CLIcore.h"
-#include "image_ID.h"
-#include "stream_sem.h"
 #include "create_image.h"
 #include "delete_image.h"
-
+#include "image_ID.h"
+#include "stream_sem.h"
 
 #include "COREMOD_iofits/COREMOD_iofits.h"
 
-
-
-
-
-
-
 // ==========================================
 // Forward declaration(s)
 // ==========================================
 
-imageID COREMOD_MEMORY_PixMapDecode_U(
-    const char *inputstream_name,
-    uint32_t    xsizeim,
-    uint32_t    ysizeim,
-    const char *NBpix_fname,
-    const char *IDmap_name,
-    const char *IDout_name,
-    const char *IDout_pixslice_fname,
-    uint32_t    reverse
-);
-
-
+imageID COREMOD_MEMORY_PixMapDecode_U(const char *inputstream_name, uint32_t xsizeim, uint32_t ysizeim,
+                                      const char *NBpix_fname, const char *IDmap_name, const char *IDout_name,
+                                      const char *IDout_pixslice_fname, uint32_t reverse);
 
 // ==========================================
 // Command line interface wrapper function(s)
 // ==========================================
 
-
 static errno_t COREMOD_MEMORY_PixMapDecode_U__cli()
 {
-    if(0
-            + CLI_checkarg(1, CLIARG_IMG)
-            + CLI_checkarg(2, CLIARG_LONG)
-            + CLI_checkarg(3, CLIARG_LONG)
-            + CLI_checkarg(4, CLIARG_STR_NOT_IMG)
-            + CLI_checkarg(5, CLIARG_IMG)
-            + CLI_checkarg(6, CLIARG_STR_NOT_IMG)
-            + CLI_checkarg(7, CLIARG_STR_NOT_IMG)
-            + CLI_checkarg(8, CLIARG_LONG)
-            == 0)
+    if (0 + CLI_checkarg(1, CLIARG_IMG) + CLI_checkarg(2, CLIARG_LONG) + CLI_checkarg(3, CLIARG_LONG) +
+            CLI_checkarg(4, CLIARG_STR_NOT_IMG) + CLI_checkarg(5, CLIARG_IMG) + CLI_checkarg(6, CLIARG_STR_NOT_IMG) +
+            CLI_checkarg(7, CLIARG_STR_NOT_IMG) + CLI_checkarg(8, CLIARG_LONG) ==
+        0)
     {
-        COREMOD_MEMORY_PixMapDecode_U(
-            data.cmdargtoken[1].val.string,
-            data.cmdargtoken[2].val.numl,
-            data.cmdargtoken[3].val.numl,
-            data.cmdargtoken[4].val.string,
-            data.cmdargtoken[5].val.string,
-            data.cmdargtoken[6].val.string,
-            data.cmdargtoken[7].val.string,
-            data.cmdargtoken[8].val.numl
-        );
+        COREMOD_MEMORY_PixMapDecode_U(data.cmdargtoken[1].val.string, data.cmdargtoken[2].val.numl,
+                                      data.cmdargtoken[3].val.numl, data.cmdargtoken[4].val.string,
+                                      data.cmdargtoken[5].val.string, data.cmdargtoken[6].val.string,
+                                      data.cmdargtoken[7].val.string, data.cmdargtoken[8].val.numl);
         return CLICMD_SUCCESS;
     }
     else
@@ -70,71 +40,48 @@ static errno_t COREMOD_MEMORY_PixMapDecode_U__cli()
     }
 }
 
-
-
-
-
 // ==========================================
 // Register CLI command(s)
 // ==========================================
 
 errno_t stream_pixmapdecode_addCLIcmd()
 {
-    RegisterCLIcommand(
-        "impixdecodeU",
-        __FILE__,
-        COREMOD_MEMORY_PixMapDecode_U__cli,
-        "decode image stream",
-        "<in stream> <xsize [long]> <ysize [long]> <nbpix per slice [ASCII file]> <decode map> <out stream> <out image slice index [FITS]> <reverse mode>",
-        "impixdecodeU streamin 120 120 pixsclienb.txt decmap outim outsliceindex.fits 0",
-        "COREMOD_MEMORY_PixMapDecode_U(const char *inputstream_name, uint32_t xsizeim, uint32_t ysizeim, const char* NBpix_fname, const char* IDmap_name, const char *IDout_name, const char *IDout_pixslice_fname, uint32_t reverse)");
-
+    RegisterCLIcommand("impixdecodeU", __FILE__, COREMOD_MEMORY_PixMapDecode_U__cli, "decode image stream",
+                       "<in stream> <xsize [long]> <ysize [long]> <nbpix per slice [ASCII file]> <decode map> <out "
+                       "stream> <out image slice index [FITS]> <reverse mode>",
+                       "impixdecodeU streamin 120 120 pixsclienb.txt decmap outim outsliceindex.fits 0",
+                       "COREMOD_MEMORY_PixMapDecode_U(const char *inputstream_name, uint32_t xsizeim, uint32_t "
+                       "ysizeim, const char* NBpix_fname, const char* IDmap_name, const char *IDout_name, const char "
+                       "*IDout_pixslice_fname, uint32_t reverse)");
 
     return RETURN_SUCCESS;
 }
 
-
-
-
-
-
-
-
-
-
-
 //
 // pixel decode for unsigned short
 // sem0, cnt0 gets updated at each full frame
 // sem1 gets updated for each slice
 // cnt1 contains the slice index that was just written
 //
-imageID COREMOD_MEMORY_PixMapDecode_U(
-    const char *inputstream_name,
-    uint32_t    xsizeim,
-    uint32_t    ysizeim,
-    const char *NBpix_fname,
-    const char *IDmap_name,
-    const char *IDout_name,
-    const char *IDout_pixslice_fname,
-    uint32_t    reverse
-)
+imageID COREMOD_MEMORY_PixMapDecode_U(const char *inputstream_name, uint32_t xsizeim, uint32_t ysizeim,
+                                      const char *NBpix_fname, const char *IDmap_name, const char *IDout_name,
+                                      const char *IDout_pixslice_fname, uint32_t reverse)
 {
-    imageID   IDout = -1;
-    imageID   IDin;
-    imageID   IDmap;
-    long      slice, sliceii;
-    long      oldslice = 0;
-    long      NBslice;
-    long     *nbpixslice;
-    uint32_t  xsizein;
-    uint32_t  ysizein;
-    uint32_t  nbpixout = xsizeim * ysizeim;
-    FILE     *fp;
+    imageID IDout = -1;
+    imageID IDin;
+    imageID IDmap;
+    long slice, sliceii;
+    long oldslice = 0;
+    long NBslice;
+    long *nbpixslice;
+    uint32_t xsizein;
+    uint32_t ysizein;
+    uint32_t nbpixout = xsizeim * ysizeim;
+    FILE *fp;
     uint32_t *sizearray;
-    imageID   IDout_pixslice;
-    long      ii;
-    unsigned long long      cnt = 0;
+    imageID IDout_pixslice;
+    long ii;
+    unsigned long long cnt = 0;
     //    int RT_priority = 80; //any number from 0-99
 
     //    struct sched_param schedpar;
@@ -148,8 +95,7 @@ imageID COREMOD_MEMORY_PixMapDecode_U(
 
     double *dtarray;
     struct timespec *tarray;
-//    long slice1;
-
+    //    long slice1;
 
     PROCESSINFO *processinfo;
 
@@ -162,7 +108,7 @@ imageID COREMOD_MEMORY_PixMapDecode_U(
     xsizein = data.image[IDin].md[0].size[0];
     ysizein = data.image[IDin].md[0].size[1];
 
-    if(data.image[IDin].md[0].naxis > 2)
+    if (data.image[IDin].md[0].naxis > 2)
     {
         NBslice = data.image[IDin].md[0].size[2];
     }
@@ -171,32 +117,28 @@ imageID COREMOD_MEMORY_PixMapDecode_U(
         NBslice = 1;
     }
 
-    char pinfoname[200];  // short name for the processinfo instance
+    char pinfoname[200]; // short name for the processinfo instance
     sprintf(pinfoname, "decode-%s-to-%s", inputstream_name, IDout_name);
     char pinfodescr[200];
-    sprintf(pinfodescr, "%ldx%ldx%ld->%ldx%ld", (long) xsizein, (long) ysizein,
-            NBslice, (long) xsizeim, (long) ysizeim);
+    sprintf(pinfodescr, "%ldx%ldx%ld->%ldx%ld", (long)xsizein, (long)ysizein, NBslice, (long)xsizeim, (long)ysizeim);
     char msgstring[200];
     sprintf(msgstring, "%s->%s", inputstream_name, IDout_name);
 
     processinfo = processinfo_setup(
-                      pinfoname,             // short name for the processinfo instance, no spaces, no dot, name should be human-readable
-                      pinfodescr,    // description
-                      msgstring,  // message on startup
-                      __FUNCTION__, __FILE__, __LINE__
-                  );
+        pinfoname,  // short name for the processinfo instance, no spaces, no dot, name should be human-readable
+        pinfodescr, // description
+        msgstring,  // message on startup
+        __FUNCTION__, __FILE__, __LINE__);
     // OPTIONAL SETTINGS
     processinfo->MeasureTiming = 1; // Measure timing
-    processinfo->RT_priority =
-        20;  // RT_priority, 0-99. Larger number = higher priority. If <0, ignore
-
+    processinfo->RT_priority = 20;  // RT_priority, 0-99. Larger number = higher priority. If <0, ignore
 
     int loopOK = 1;
 
     processinfo_WriteMessage(processinfo, "Allocating memory");
 
-    sizearray = (uint32_t *) malloc(sizeof(uint32_t) * 3);
-    if(sizearray == NULL)
+    sizearray = (uint32_t *)malloc(sizeof(uint32_t) * 3);
+    if (sizearray == NULL)
     {
         PRINT_ERROR("malloc error");
         abort();
@@ -204,35 +146,30 @@ imageID COREMOD_MEMORY_PixMapDecode_U(
 
     int in_semwaitindex = ImageStreamIO_getsemwaitindex(&data.image[IDin], 0);
 
-    if(reverse == 0 && (xsizein != data.image[IDmap].md[0].size[0]
-                        || ysizein != data.image[IDmap].md[0].size[1]))
+    if (reverse == 0 && (xsizein != data.image[IDmap].md[0].size[0] || ysizein != data.image[IDmap].md[0].size[1]))
     {
-        printf("ERROR: xsize, ysize for %s (%d, %d) does not match %s (%d, %d)\n",
-               inputstream_name, xsizein, ysizein, IDmap_name, data.image[IDmap].md[0].size[0],
-               data.image[IDmap].md[0].size[0]);
+        printf("ERROR: xsize, ysize for %s (%d, %d) does not match %s (%d, %d)\n", inputstream_name, xsizein, ysizein,
+               IDmap_name, data.image[IDmap].md[0].size[0], data.image[IDmap].md[0].size[0]);
         exit(0);
     }
-    if(reverse == 1 && (xsizeim != data.image[IDmap].md[0].size[0]
-                        || ysizeim != data.image[IDmap].md[0].size[1]))
+    if (reverse == 1 && (xsizeim != data.image[IDmap].md[0].size[0] || ysizeim != data.image[IDmap].md[0].size[1]))
     {
-        printf("ERROR: xsize, ysize for %s (%d, %d) does not match %s (%d, %d)\n",
-               IDout_name, xsizein, ysizein, IDmap_name, data.image[IDmap].md[0].size[0],
-               data.image[IDmap].md[0].size[0]);
+        printf("ERROR: xsize, ysize for %s (%d, %d) does not match %s (%d, %d)\n", IDout_name, xsizein, ysizein,
+               IDmap_name, data.image[IDmap].md[0].size[0], data.image[IDmap].md[0].size[0]);
         exit(0);
     }
-    if(NBslice > 1 && reverse == 1)
+    if (NBslice > 1 && reverse == 1)
     {
         printf("ERROR: Cannot use reverse lookup decode with multiple slices\n");
     }
 
     sizearray[0] = xsizeim;
     sizearray[1] = ysizeim;
-    create_image_ID(IDout_name, 2, sizearray,
-                    data.image[IDin].md[0].datatype, 1, 25, 0, &IDout);
+    create_image_ID(IDout_name, 2, sizearray, data.image[IDin].md[0].datatype, 1, 25, 0, &IDout);
 
     // Copy the keywords over from IDin to IDout
     int NBkw = data.image[IDin].md[0].NBkw;
-    for(int kw = 0; kw < NBkw; ++kw)
+    for (int kw = 0; kw < NBkw; ++kw)
     {
         strcpy(data.image[IDout].kw[kw].name, data.image[IDin].kw[kw].name);
         data.image[IDout].kw[kw].type = data.image[IDin].kw[kw].type;
@@ -240,85 +177,75 @@ imageID COREMOD_MEMORY_PixMapDecode_U(
         strcpy(data.image[IDout].kw[kw].comment, data.image[IDin].kw[kw].comment);
     }
 
-
-
     COREMOD_MEMORY_image_set_createsem(IDout_name, IMAGE_NB_SEMAPHORE);
 
-    dtarray = (double *) malloc(sizeof(double) * NBslice);
-    if(dtarray == NULL)
+    dtarray = (double *)malloc(sizeof(double) * NBslice);
+    if (dtarray == NULL)
     {
         PRINT_ERROR("malloc error");
         abort();
     }
 
-    tarray = (struct timespec *) malloc(sizeof(struct timespec) * NBslice);
-    if(tarray == NULL)
+    tarray = (struct timespec *)malloc(sizeof(struct timespec) * NBslice);
+    if (tarray == NULL)
     {
         PRINT_ERROR("malloc error");
         abort();
     }
 
-
-    nbpixslice = (long *) malloc(sizeof(long) * NBslice);
-    if(nbpixslice == NULL)
+    nbpixslice = (long *)malloc(sizeof(long) * NBslice);
+    if (nbpixslice == NULL)
     {
         PRINT_ERROR("malloc error");
         abort();
     }
 
-    if((fp = fopen(NBpix_fname, "r")) == NULL)
+    if ((fp = fopen(NBpix_fname, "r")) == NULL)
     {
         printf("ERROR : cannot open file \"%s\"\n", NBpix_fname);
         exit(0);
     }
 
-    for(slice = 0; slice < NBslice; slice++)
+    for (slice = 0; slice < NBslice; slice++)
     {
         int fscanfcnt = fscanf(fp, "%ld %ld %ld\n", &tmpl0, &nbpixslice[slice], &tmpl1);
-        if(fscanfcnt == EOF)
+        if (fscanfcnt == EOF)
         {
-            if(ferror(fp))
+            if (ferror(fp))
             {
                 perror("fscanf");
             }
             else
             {
-                fprintf(stderr,
-                        "Error: fscanf reached end of file, no matching characters, no matching failure\n");
+                fprintf(stderr, "Error: fscanf reached end of file, no matching characters, no matching failure\n");
             }
             return RETURN_FAILURE;
         }
-        else if(fscanfcnt != 3)
+        else if (fscanfcnt != 3)
         {
-            fprintf(stderr,
-                    "Error: fscanf successfully matched and assigned %i input items, 2 expected\n",
-                    fscanfcnt);
+            fprintf(stderr, "Error: fscanf successfully matched and assigned %i input items, 2 expected\n", fscanfcnt);
             return RETURN_FAILURE;
         }
-
-
     }
     fclose(fp);
 
-    for(slice = 0; slice < NBslice; slice++)
+    for (slice = 0; slice < NBslice; slice++)
     {
         printf("Slice %5ld   : %5ld pix\n", slice, nbpixslice[slice]);
     }
 
-    if(reverse == 0)    // Only for legacy mode
+    if (reverse == 0) // Only for legacy mode
     {
-        create_image_ID("outpixsl", 2, sizearray, _DATATYPE_UINT16, 0,
-                        0, 0, &IDout_pixslice);
+        create_image_ID("outpixsl", 2, sizearray, _DATATYPE_UINT16, 0, 0, 0, &IDout_pixslice);
 
-        for(slice = 0; slice < NBslice; slice++)
+        for (slice = 0; slice < NBslice; slice++)
         {
-            sliceii = slice * data.image[IDmap].md[0].size[0] *
-                      data.image[IDmap].md[0].size[1];
-            for(ii = 0; ii < nbpixslice[slice]; ii++)
+            sliceii = slice * data.image[IDmap].md[0].size[0] * data.image[IDmap].md[0].size[1];
+            for (ii = 0; ii < nbpixslice[slice]; ii++)
             {
                 // ocam2kpixi files MUST now be in int32 - otherwise we'll overflow in 240x240
-                data.image[IDout_pixslice].array.UI16[ data.image[IDmap].array.UI32[sliceii +
-                                                       ii] ] = (unsigned short)(1 + slice);
+                data.image[IDout_pixslice].array.UI16[data.image[IDmap].array.UI32[sliceii + ii]] =
+                    (unsigned short)(1 + slice);
             }
         }
 
@@ -326,27 +253,21 @@ imageID COREMOD_MEMORY_PixMapDecode_U(
         delete_image_ID("outpixsl", DELETE_IMAGE_ERRMODE_WARNING);
     }
 
-
-
-
-
     processinfo_WriteMessage(processinfo, "Starting loop");
 
     // ==================================
     // STARTING LOOP
     // ==================================
-    processinfo_loopstart(
-        processinfo); // Notify processinfo that we are entering loop
-
+    processinfo_loopstart(processinfo); // Notify processinfo that we are entering loop
 
     // long loopcnt = 0;
-    while(loopOK == 1)
+    while (loopOK == 1)
     {
         loopOK = processinfo_loopstep(processinfo);
 
-        if(data.image[IDin].md[0].sem == 0)
+        if (data.image[IDin].md[0].sem == 0)
         {
-            while(data.image[IDin].md[0].cnt0 == cnt)   // test if new frame exists
+            while (data.image[IDin].md[0].cnt0 == cnt) // test if new frame exists
             {
                 usleep(5);
             }
@@ -354,7 +275,7 @@ imageID COREMOD_MEMORY_PixMapDecode_U(
         }
         else
         {
-            if(clock_gettime(CLOCK_REALTIME, &ts) == -1)
+            if (clock_gettime(CLOCK_REALTIME, &ts) == -1)
             {
                 perror("clock_gettime");
                 exit(EXIT_FAILURE);
@@ -363,10 +284,10 @@ imageID COREMOD_MEMORY_PixMapDecode_U(
 
             semr = ImageStreamIO_semtimedwait(&data.image[IDin], in_semwaitindex, &ts);
 
-            if(processinfo->loopcnt == 0)
+            if (processinfo->loopcnt == 0)
             {
                 sem_getvalue(data.image[IDin].semptr[in_semwaitindex], &semval);
-                for(scnt = 0; scnt < semval; scnt++)
+                for (scnt = 0; scnt < semval; scnt++)
                 {
                     sem_trywait(data.image[IDin].semptr[in_semwaitindex]);
                 }
@@ -375,17 +296,17 @@ imageID COREMOD_MEMORY_PixMapDecode_U(
 
         processinfo_exec_start(processinfo);
 
-        if(processinfo_compute_status(processinfo) == 1)
+        if (processinfo_compute_status(processinfo) == 1)
         {
-            if(semr == 0)
+            if (semr == 0)
             {
                 slice = data.image[IDin].md[0].cnt1;
-                if(slice > oldslice + 1)
+                if (slice > oldslice + 1)
                 {
                     slice = oldslice + 1;
                 }
 
-                if(oldslice == NBslice - 1)
+                if (oldslice == NBslice - 1)
                 {
                     slice = 0;
                 }
@@ -394,22 +315,21 @@ imageID COREMOD_MEMORY_PixMapDecode_U(
                 //  dtarray[slice] = 1.0*tarray[slice].tv_sec + 1.0e-9*tarray[slice].tv_nsec;
                 data.image[IDout].md[0].write = 1;
 
-                if(reverse == 0)    // legacy forward lookup mode
+                if (reverse == 0) // legacy forward lookup mode
                 {
-                    if(slice < NBslice)
+                    if (slice < NBslice)
                     {
-                        sliceii = slice * data.image[IDmap].md[0].size[0] *
-                                  data.image[IDmap].md[0].size[1];
-                        for(ii = 0; ii < nbpixslice[slice]; ii++)
+                        sliceii = slice * data.image[IDmap].md[0].size[0] * data.image[IDmap].md[0].size[1];
+                        for (ii = 0; ii < nbpixslice[slice]; ii++)
                         {
-                            data.image[IDout].array.UI16[data.image[IDmap].array.UI32[sliceii + ii] ] =
+                            data.image[IDout].array.UI16[data.image[IDmap].array.UI32[sliceii + ii]] =
                                 data.image[IDin].array.UI16[sliceii + ii];
                         }
                     }
                 }
-                else     // reverse == 1, full image assumed (at least given how ocam is scrambled)
+                else // reverse == 1, full image assumed (at least given how ocam is scrambled)
                 {
-                    for(ii = 0; ii < nbpixout; ++ii)
+                    for (ii = 0; ii < nbpixout; ++ii)
                     {
                         data.image[IDout].array.UI16[ii] =
                             data.image[IDin].array.UI16[data.image[IDmap].array.UI32[ii]];
@@ -417,27 +337,27 @@ imageID COREMOD_MEMORY_PixMapDecode_U(
                 }
 
                 // Copy the value of the keywords
-                for(int kw = 0; kw < NBkw; ++kw)
+                for (int kw = 0; kw < NBkw; ++kw)
                 {
                     data.image[IDout].kw[kw].value = data.image[IDin].kw[kw].value;
                 }
 
-                if(slice == NBslice - 1)
+                if (slice == NBslice - 1)
                 {
                     COREMOD_MEMORY_image_set_sempost_byID(IDout, -1);
-                    data.image[IDout].md[0].cnt0 ++;
+                    data.image[IDout].md[0].cnt0++;
                 }
 
                 data.image[IDout].md[0].cnt1 = slice;
 
                 sem_getvalue(data.image[IDout].semptr[2], &semval);
-                if(semval < SEMAPHORE_MAXVAL)
+                if (semval < SEMAPHORE_MAXVAL)
                 {
                     sem_post(data.image[IDout].semptr[2]);
                 }
 
                 sem_getvalue(data.image[IDout].semptr[3], &semval);
-                if(semval < SEMAPHORE_MAXVAL)
+                if (semval < SEMAPHORE_MAXVAL)
                 {
                     sem_post(data.image[IDout].semptr[3]);
                 }
@@ -448,7 +368,6 @@ imageID COREMOD_MEMORY_PixMapDecode_U(
             }
         }
 
-
         processinfo_exec_end(processinfo);
     }
 
@@ -468,8 +387,3 @@ imageID COREMOD_MEMORY_PixMapDecode_U(
 
     return IDout;
 }
-
-
-
-
-
diff --git a/src/COREMOD_memory/stream_pixmapdecode.h b/src/COREMOD_memory/stream_pixmapdecode.h
index dde1549b..ca957502 100644
--- a/src/COREMOD_memory/stream_pixmapdecode.h
+++ b/src/COREMOD_memory/stream_pixmapdecode.h
@@ -1,17 +1,8 @@
 /** @file stream_pixmapdecode.h
  */
 
-
 errno_t stream_pixmapdecode_addCLIcmd();
 
-
-imageID COREMOD_MEMORY_PixMapDecode_U(
-    const char *inputstream_name,
-    uint32_t    xsizeim,
-    uint32_t    ysizeim,
-    const char *NBpix_fname,
-    const char *IDmap_name,
-    const char *IDout_name,
-    const char *IDout_pixslice_fname,
-    uint32_t    reverse
-);
+imageID COREMOD_MEMORY_PixMapDecode_U(const char *inputstream_name, uint32_t xsizeim, uint32_t ysizeim,
+                                      const char *NBpix_fname, const char *IDmap_name, const char *IDout_name,
+                                      const char *IDout_pixslice_fname, uint32_t reverse);
diff --git a/src/COREMOD_memory/stream_poke.c b/src/COREMOD_memory/stream_poke.c
index 20c2b594..917069e3 100644
--- a/src/COREMOD_memory/stream_poke.c
+++ b/src/COREMOD_memory/stream_poke.c
@@ -3,8 +3,6 @@
  * @brief   poke image stream
  */
 
-
-
 #include "CommandLineInterface/CLIcore.h"
 #include "CommandLineInterface/timeutils.h"
 
@@ -13,41 +11,16 @@
 
 #include "COREMOD_tools/COREMOD_tools.h"
 
-
-
-
-
 // variables local to this translation unit
 static char *inimname;
 
+static CLICMDARGDEF farg[] = {
+    {CLIARG_IMG, ".in_sname", "input stream", "ims1", CLIARG_VISIBLE_DEFAULT, (void **)&inimname, NULL}};
 
-
-
-static CLICMDARGDEF farg[] =
-{
-    {
-        CLIARG_IMG,  ".in_sname", "input stream", "ims1",
-        CLIARG_VISIBLE_DEFAULT,
-        (void **) &inimname, NULL
-    }
-};
-
-static CLICMDDATA CLIcmddata =
-{
-    "shmimpoke",
-    "update stream without changing content",
-    CLICMD_FIELDS_DEFAULTS
-};
-
+static CLICMDDATA CLIcmddata = {"shmimpoke", "update stream without changing content", CLICMD_FIELDS_DEFAULTS};
 
 // detailed help
-static errno_t help_function()
-{
-    return RETURN_SUCCESS;
-}
-
-
-
+static errno_t help_function() { return RETURN_SUCCESS; }
 
 // Wrapper function, used by all CLI calls
 static errno_t compute_function()
@@ -65,13 +38,11 @@ static errno_t compute_function()
     return RETURN_SUCCESS;
 }
 
-
-
-
 INSERT_STD_FPSCLIfunctions
 
-// Register function in CLI
-errno_t CLIADDCMD_COREMOD_memory__stream_poke()
+    // Register function in CLI
+    errno_t
+    CLIADDCMD_COREMOD_memory__stream_poke()
 {
     INSERT_STD_CLIREGISTERFUNC
 
diff --git a/src/COREMOD_memory/stream_poke.h b/src/COREMOD_memory/stream_poke.h
index 8c28bfac..036630df 100644
--- a/src/COREMOD_memory/stream_poke.h
+++ b/src/COREMOD_memory/stream_poke.h
@@ -17,4 +17,4 @@ imageID COREMOD_MEMORY_streamPoke(
 
 errno_t CLIADDCMD_COREMOD_memory__stream_poke();
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/COREMOD_memory/stream_sem.c b/src/COREMOD_memory/stream_sem.c
index 558c39b6..55c98ab1 100644
--- a/src/COREMOD_memory/stream_sem.c
+++ b/src/COREMOD_memory/stream_sem.c
@@ -3,7 +3,6 @@
  * @brief   stream semaphores
  */
 
-
 #include <pthread.h>
 
 #include "CommandLineInterface/CLIcore.h"
@@ -11,93 +10,44 @@
 #include "list_image.h"
 #include "read_shmim.h"
 
-
-
-
 static pthread_t *thrarray_semwait;
 static long NB_thrarray_semwait;
 
-
-
-
 // ==========================================
 // Forward declaration(s)
 // ==========================================
 
+imageID COREMOD_MEMORY_image_set_createsem(const char *IDname, long NBsem);
 
-imageID COREMOD_MEMORY_image_set_createsem(
-    const char *IDname,
-    long        NBsem
-);
-
-
-imageID COREMOD_MEMORY_image_seminfo(
-    const char *IDname
-);
+imageID COREMOD_MEMORY_image_seminfo(const char *IDname);
 
-imageID COREMOD_MEMORY_image_set_sempost(
-    const char *IDname,
-    long        index
-);
+imageID COREMOD_MEMORY_image_set_sempost(const char *IDname, long index);
 
-imageID COREMOD_MEMORY_image_set_sempost_byID(
-    imageID ID,
-    long    index
-);
+imageID COREMOD_MEMORY_image_set_sempost_byID(imageID ID, long index);
 
-imageID COREMOD_MEMORY_image_set_sempost_excl_byID(
-    imageID ID,
-    long    index
-);
+imageID COREMOD_MEMORY_image_set_sempost_excl_byID(imageID ID, long index);
 
-imageID COREMOD_MEMORY_image_set_sempost_loop(
-    const char *IDname,
-    long index,
-    long dtus
-);
+imageID COREMOD_MEMORY_image_set_sempost_loop(const char *IDname, long index, long dtus);
 
-imageID COREMOD_MEMORY_image_set_semwait(
-    const char *IDname,
-    long index
-);
+imageID COREMOD_MEMORY_image_set_semwait(const char *IDname, long index);
 
-void *waitforsemID(
-    void *ID
-);
+void *waitforsemID(void *ID);
 
-errno_t COREMOD_MEMORY_image_set_semwait_OR_IDarray(
-    imageID *IDarray,
-    long     NB_ID
-);
-
-errno_t COREMOD_MEMORY_image_set_semflush_IDarray(
-    imageID *IDarray,
-    long     NB_ID
-);
-
-imageID COREMOD_MEMORY_image_set_semflush(
-    const char *IDname,
-    long        index
-);
+errno_t COREMOD_MEMORY_image_set_semwait_OR_IDarray(imageID *IDarray, long NB_ID);
 
+errno_t COREMOD_MEMORY_image_set_semflush_IDarray(imageID *IDarray, long NB_ID);
 
+imageID COREMOD_MEMORY_image_set_semflush(const char *IDname, long index);
 
 // ==========================================
 // Command line interface wrapper function(s)
 // ==========================================
 
-
 static errno_t COREMOD_MEMORY_image_set_createsem__cli()
 {
-    if(0
-            + CLI_checkarg(1, CLIARG_IMG)
-            + CLI_checkarg(2, CLIARG_LONG)
-            == 0)
+    if (0 + CLI_checkarg(1, CLIARG_IMG) + CLI_checkarg(2, CLIARG_LONG) == 0)
     {
-        COREMOD_MEMORY_image_set_createsem(
-            data.cmdargtoken[1].val.string,
-            data.cmdargtoken[2].val.numl
-        );
+        COREMOD_MEMORY_image_set_createsem(data.cmdargtoken[1].val.string, data.cmdargtoken[2].val.numl);
         return CLICMD_SUCCESS;
     }
     else
@@ -106,11 +56,9 @@ static errno_t COREMOD_MEMORY_image_set_createsem__cli()
     }
 }
 
-
 static errno_t COREMOD_MEMORY_image_seminfo__cli()
 {
-    if(0
-            + CLI_checkarg(1, CLIARG_IMG) == 0)
+    if (0 + CLI_checkarg(1, CLIARG_IMG) == 0)
     {
         COREMOD_MEMORY_image_seminfo(data.cmdargtoken[1].val.string);
         return CLICMD_SUCCESS;
@@ -121,18 +69,11 @@ static errno_t COREMOD_MEMORY_image_seminfo__cli()
     }
 }
 
-
 static errno_t COREMOD_MEMORY_image_set_sempost__cli()
 {
-    if(0
-            + CLI_checkarg(1, CLIARG_IMG)
-            + CLI_checkarg(2, CLIARG_LONG)
-            == 0)
+    if (0 + CLI_checkarg(1, CLIARG_IMG) + CLI_checkarg(2, CLIARG_LONG) == 0)
     {
-        COREMOD_MEMORY_image_set_sempost(
-            data.cmdargtoken[1].val.string,
-            data.cmdargtoken[2].val.numl
-        );
+        COREMOD_MEMORY_image_set_sempost(data.cmdargtoken[1].val.string, data.cmdargtoken[2].val.numl);
         return CLICMD_SUCCESS;
     }
     else
@@ -141,20 +82,12 @@ static errno_t COREMOD_MEMORY_image_set_sempost__cli()
     }
 }
 
-
 static errno_t COREMOD_MEMORY_image_set_sempost_loop__cli()
 {
-    if(0
-            + CLI_checkarg(1, CLIARG_IMG)
-            + CLI_checkarg(2, CLIARG_LONG)
-            + CLI_checkarg(3, CLIARG_LONG)
-            == 0)
+    if (0 + CLI_checkarg(1, CLIARG_IMG) + CLI_checkarg(2, CLIARG_LONG) + CLI_checkarg(3, CLIARG_LONG) == 0)
     {
-        COREMOD_MEMORY_image_set_sempost_loop(
-            data.cmdargtoken[1].val.string,
-            data.cmdargtoken[2].val.numl,
-            data.cmdargtoken[3].val.numl
-        );
+        COREMOD_MEMORY_image_set_sempost_loop(data.cmdargtoken[1].val.string, data.cmdargtoken[2].val.numl,
+                                              data.cmdargtoken[3].val.numl);
         return CLICMD_SUCCESS;
     }
     else
@@ -163,18 +96,11 @@ static errno_t COREMOD_MEMORY_image_set_sempost_loop__cli()
     }
 }
 
-
-
 static errno_t COREMOD_MEMORY_image_set_semwait__cli()
 {
-    if(0
-            + CLI_checkarg(1, CLIARG_IMG)
-            + CLI_checkarg(2, CLIARG_LONG)
-            == 0)
+    if (0 + CLI_checkarg(1, CLIARG_IMG) + CLI_checkarg(2, CLIARG_LONG) == 0)
     {
-        COREMOD_MEMORY_image_set_semwait(
-            data.cmdargtoken[1].val.string,
-            data.cmdargtoken[2].val.numl);
+        COREMOD_MEMORY_image_set_semwait(data.cmdargtoken[1].val.string, data.cmdargtoken[2].val.numl);
         return CLICMD_SUCCESS;
     }
     else
@@ -183,18 +109,11 @@ static errno_t COREMOD_MEMORY_image_set_semwait__cli()
     }
 }
 
-
 static errno_t COREMOD_MEMORY_image_set_semflush__cli()
 {
-    if(0
-            + CLI_checkarg(1, CLIARG_IMG)
-            + CLI_checkarg(2, CLIARG_LONG)
-            == 0)
+    if (0 + CLI_checkarg(1, CLIARG_IMG) + CLI_checkarg(2, CLIARG_LONG) == 0)
     {
-        COREMOD_MEMORY_image_set_semflush(
-            data.cmdargtoken[1].val.string,
-            data.cmdargtoken[2].val.numl
-        );
+        COREMOD_MEMORY_image_set_semflush(data.cmdargtoken[1].val.string, data.cmdargtoken[2].val.numl);
         return CLICMD_SUCCESS;
     }
     else
@@ -203,97 +122,49 @@ static errno_t COREMOD_MEMORY_image_set_semflush__cli()
     }
 }
 
-
-
-
 // ==========================================
 // Register CLI command(s)
 // ==========================================
 
 errno_t stream_sem_addCLIcmd()
 {
-    RegisterCLIcommand(
-        "imsetcreatesem",
-        __FILE__,
-        COREMOD_MEMORY_image_set_createsem__cli,
-        "create image semaphore",
-        "<image> <NBsem>",
-        "imsetcreatesem im1 5",
-        "long COREMOD_MEMORY_image_set_createsem(const char *IDname, long NBsem)");
-
-    RegisterCLIcommand(
-        "imseminfo",
-        __FILE__,
-        COREMOD_MEMORY_image_seminfo__cli,
-        "display semaphore info",
-        "<image>",
-        "imseminfo im1",
-        "long COREMOD_MEMORY_image_seminfo(const char *IDname)");
-
-    RegisterCLIcommand(
-        "imsetsempost",
-        __FILE__,
-        COREMOD_MEMORY_image_set_sempost__cli,
-        "post image semaphore. If sem index = -1, post all semaphores",
-        "<image> <sem index>",
-        "imsetsempost im1 2",
-        "long COREMOD_MEMORY_image_set_sempost(const char *IDname, long index)");
-
-    RegisterCLIcommand(
-        "imsetsempostl",
-        __FILE__,
-        COREMOD_MEMORY_image_set_sempost_loop__cli,
-        "post image semaphore loop. If sem index = -1, post all semaphores",
-        "<image> <sem index> <time interval [us]>",
-        "imsetsempostl im1 -1 1000",
-        "long COREMOD_MEMORY_image_set_sempost_loop(const char *IDname, long index, long dtus)");
-
-    RegisterCLIcommand(
-        "imsetsemwait",
-        __FILE__,
-        COREMOD_MEMORY_image_set_semwait__cli,
-        "wait image semaphore",
-        "<image>",
-        "imsetsemwait im1",
-        "long COREMOD_MEMORY_image_set_semwait(const char *IDname)");
-
-    RegisterCLIcommand(
-        "imsetsemflush",
-        __FILE__,
-        COREMOD_MEMORY_image_set_semflush__cli,
-        "flush image semaphore",
-        "<image> <sem index>",
-        "imsetsemflush im1 0",
-        "long COREMOD_MEMORY_image_set_semflush(const char *IDname, long index)");   
-
-    return RETURN_SUCCESS;
-}
-
-
-
-
-
+    RegisterCLIcommand("imsetcreatesem", __FILE__, COREMOD_MEMORY_image_set_createsem__cli, "create image semaphore",
+                       "<image> <NBsem>", "imsetcreatesem im1 5",
+                       "long COREMOD_MEMORY_image_set_createsem(const char *IDname, long NBsem)");
 
+    RegisterCLIcommand("imseminfo", __FILE__, COREMOD_MEMORY_image_seminfo__cli, "display semaphore info", "<image>",
+                       "imseminfo im1", "long COREMOD_MEMORY_image_seminfo(const char *IDname)");
 
+    RegisterCLIcommand("imsetsempost", __FILE__, COREMOD_MEMORY_image_set_sempost__cli,
+                       "post image semaphore. If sem index = -1, post all semaphores", "<image> <sem index>",
+                       "imsetsempost im1 2", "long COREMOD_MEMORY_image_set_sempost(const char *IDname, long index)");
 
+    RegisterCLIcommand("imsetsempostl", __FILE__, COREMOD_MEMORY_image_set_sempost_loop__cli,
+                       "post image semaphore loop. If sem index = -1, post all semaphores",
+                       "<image> <sem index> <time interval [us]>", "imsetsempostl im1 -1 1000",
+                       "long COREMOD_MEMORY_image_set_sempost_loop(const char *IDname, long index, long dtus)");
 
+    RegisterCLIcommand("imsetsemwait", __FILE__, COREMOD_MEMORY_image_set_semwait__cli, "wait image semaphore",
+                       "<image>", "imsetsemwait im1", "long COREMOD_MEMORY_image_set_semwait(const char *IDname)");
 
+    RegisterCLIcommand("imsetsemflush", __FILE__, COREMOD_MEMORY_image_set_semflush__cli, "flush image semaphore",
+                       "<image> <sem index>", "imsetsemflush im1 0",
+                       "long COREMOD_MEMORY_image_set_semflush(const char *IDname, long index)");
 
+    return RETURN_SUCCESS;
+}
 
 /**
  * @see ImageStreamIO_createsem
  */
 
-imageID COREMOD_MEMORY_image_set_createsem(
-    const char *IDname,
-    long        NBsem
-)
+imageID COREMOD_MEMORY_image_set_createsem(const char *IDname, long NBsem)
 {
     imageID ID;
 
     ID = image_ID(IDname);
 
-    if(ID != -1)
+    if (ID != -1)
     {
         ImageStreamIO_createsem(&data.image[ID], NBsem);
     }
@@ -301,34 +172,27 @@ imageID COREMOD_MEMORY_image_set_createsem(
     return ID;
 }
 
-
-
-
-imageID COREMOD_MEMORY_image_seminfo(
-    const char *IDname
-)
+imageID COREMOD_MEMORY_image_seminfo(const char *IDname)
 {
     imageID ID;
 
-
     ID = image_ID(IDname);
 
     printf("  NB SEMAPHORES = %3d \n", data.image[ID].md[0].sem);
-    printf(" semWritePID at %p\n", (void *) data.image[ID].semWritePID);
-    printf(" semReadPID  at %p\n", (void *) data.image[ID].semReadPID);
+    printf(" semWritePID at %p\n", (void *)data.image[ID].semWritePID);
+    printf(" semReadPID  at %p\n", (void *)data.image[ID].semReadPID);
     printf("----------------------------------\n");
     printf(" sem    value   writePID   readPID\n");
     printf("----------------------------------\n");
     int s;
-    for(s = 0; s < data.image[ID].md[0].sem; s++)
+    for (s = 0; s < data.image[ID].md[0].sem; s++)
     {
         int semval;
 
         sem_getvalue(data.image[ID].semptr[s], &semval);
 
-        printf("  %2d   %6d   %8d  %8d\n", s, semval,
-               (int) data.image[ID].semWritePID[s], (int) data.image[ID].semReadPID[s]);
-
+        printf("  %2d   %6d   %8d  %8d\n", s, semval, (int)data.image[ID].semWritePID[s],
+               (int)data.image[ID].semReadPID[s]);
     }
     printf("----------------------------------\n");
     int semval;
@@ -339,22 +203,16 @@ imageID COREMOD_MEMORY_image_seminfo(
     return ID;
 }
 
-
-
-
 /**
  * @see ImageStreamIO_sempost
  */
 
-imageID COREMOD_MEMORY_image_set_sempost(
-    const char *IDname,
-    long        index
-)
+imageID COREMOD_MEMORY_image_set_sempost(const char *IDname, long index)
 {
     imageID ID;
 
     ID = image_ID(IDname);
-    if(ID == -1)
+    if (ID == -1)
     {
         ID = read_sharedmem_image(IDname);
     }
@@ -364,56 +222,36 @@ imageID COREMOD_MEMORY_image_set_sempost(
     return ID;
 }
 
-
-
-
-
-
 /**
  * @see ImageStreamIO_sempost
  */
-imageID COREMOD_MEMORY_image_set_sempost_byID(
-    imageID ID,
-    long    index
-)
+imageID COREMOD_MEMORY_image_set_sempost_byID(imageID ID, long index)
 {
     ImageStreamIO_sempost(&data.image[ID], index);
 
     return ID;
 }
 
-
-
 /**
  * @see ImageStreamIO_sempost_excl
  */
-imageID COREMOD_MEMORY_image_set_sempost_excl_byID(
-    imageID ID,
-    long index
-)
+imageID COREMOD_MEMORY_image_set_sempost_excl_byID(imageID ID, long index)
 {
     ImageStreamIO_sempost_excl(&data.image[ID], index);
 
     return ID;
 }
 
-
-
-
 /**
  * @see ImageStreamIO_sempost_loop
  */
 
-imageID COREMOD_MEMORY_image_set_sempost_loop(
-    const char *IDname,
-    long        index,
-    long        dtus
-)
+imageID COREMOD_MEMORY_image_set_sempost_loop(const char *IDname, long index, long dtus)
 {
     imageID ID;
 
     ID = image_ID(IDname);
-    if(ID == -1)
+    if (ID == -1)
     {
         ID = read_sharedmem_image(IDname);
     }
@@ -423,20 +261,15 @@ imageID COREMOD_MEMORY_image_set_sempost_loop(
     return ID;
 }
 
-
-
 /**
  * @see ImageStreamIO_semwait
  */
-imageID COREMOD_MEMORY_image_set_semwait(
-    const char *IDname,
-    long        index
-)
+imageID COREMOD_MEMORY_image_set_semwait(const char *IDname, long index)
 {
     imageID ID;
 
     ID = image_ID(IDname);
-    if(ID == -1)
+    if (ID == -1)
     {
         ID = read_sharedmem_image(IDname);
     }
@@ -446,33 +279,26 @@ imageID COREMOD_MEMORY_image_set_semwait(
     return ID;
 }
 
-
-
-
-
 // only works for sem0
-void *waitforsemID(
-    void *ID
-)
+void *waitforsemID(void *ID)
 {
     pthread_t tid;
     int t;
     //    int semval;
 
-
     pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL);
     tid = pthread_self();
 
     //    sem_getvalue(data.image[(long) ID].semptr, &semval);
     //    printf("tid %u waiting for sem ID %ld   sem = %d   (%s)\n", (unsigned int) tid, (long) ID, semval, data.image[(long) ID].name);
     //    fflush(stdout);
-    sem_wait(data.image[(imageID) ID].semptr[0]);
+    sem_wait(data.image[(imageID)ID].semptr[0]);
     //    printf("tid %u sem ID %ld done\n", (unsigned int) tid, (long) ID);
     //    fflush(stdout);
 
-    for(t = 0; t < NB_thrarray_semwait; t++)
+    for (t = 0; t < NB_thrarray_semwait; t++)
     {
-        if(tid != thrarray_semwait[t])
+        if (tid != thrarray_semwait[t])
         {
             //            printf("tid %u cancel thread %d tid %u\n", (unsigned int) tid, t, (unsigned int) (thrarray_semwait[t]));
             //           fflush(stdout);
@@ -483,32 +309,26 @@ void *waitforsemID(
     pthread_exit(NULL);
 }
 
-
-
-
 /// \brief Wait for multiple images semaphores [OR], only works for sem0
-errno_t COREMOD_MEMORY_image_set_semwait_OR_IDarray(
-    imageID *IDarray,
-    long     NB_ID
-)
+errno_t COREMOD_MEMORY_image_set_semwait_OR_IDarray(imageID *IDarray, long NB_ID)
 {
     int t;
-//    int semval;
+    //    int semval;
 
     //   printf("======== ENTER COREMOD_MEMORY_image_set_semwait_OR_IDarray [%ld] =======\n", NB_ID);
     //   fflush(stdout);
 
-    thrarray_semwait = (pthread_t *) malloc(sizeof(pthread_t) * NB_ID);
+    thrarray_semwait = (pthread_t *)malloc(sizeof(pthread_t) * NB_ID);
     NB_thrarray_semwait = NB_ID;
 
-    for(t = 0; t < NB_ID; t++)
+    for (t = 0; t < NB_ID; t++)
     {
         //      printf("thread %d create, ID = %ld\n", t, IDarray[t]);
         //      fflush(stdout);
         pthread_create(&thrarray_semwait[t], NULL, waitforsemID, (void *)IDarray[t]);
     }
 
-    for(t = 0; t < NB_ID; t++)
+    for (t = 0; t < NB_ID; t++)
     {
         //         printf("thread %d tid %u join waiting\n", t, (unsigned int) thrarray_semwait[t]);
         //fflush(stdout);
@@ -523,32 +343,23 @@ errno_t COREMOD_MEMORY_image_set_semwait_OR_IDarray(
     return RETURN_SUCCESS;
 }
 
-
-
-
-
-
-
 /// \brief flush multiple semaphores
-errno_t COREMOD_MEMORY_image_set_semflush_IDarray(
-    imageID *IDarray,
-    long     NB_ID
-)
+errno_t COREMOD_MEMORY_image_set_semflush_IDarray(imageID *IDarray, long NB_ID)
 {
     long i, cnt;
     int semval;
     int s;
 
     list_image_ID();
-    for(i = 0; i < NB_ID; i++)
+    for (i = 0; i < NB_ID; i++)
     {
-        for(s = 0; s < data.image[IDarray[i]].md[0].sem; s++)
+        for (s = 0; s < data.image[IDarray[i]].md[0].sem; s++)
         {
             sem_getvalue(data.image[IDarray[i]].semptr[s], &semval);
-            printf("sem %d/%d of %s [%ld] = %d\n", s, data.image[IDarray[i]].md[0].sem,
-                   data.image[IDarray[i]].name, IDarray[i], semval);
+            printf("sem %d/%d of %s [%ld] = %d\n", s, data.image[IDarray[i]].md[0].sem, data.image[IDarray[i]].name,
+                   IDarray[i], semval);
             fflush(stdout);
-            for(cnt = 0; cnt < semval; cnt++)
+            for (cnt = 0; cnt < semval; cnt++)
             {
                 sem_trywait(data.image[IDarray[i]].semptr[s]);
             }
@@ -558,28 +369,19 @@ errno_t COREMOD_MEMORY_image_set_semflush_IDarray(
     return RETURN_SUCCESS;
 }
 
-
-
 /// set semaphore value to 0
 // if index <0, flush all image semaphores
-imageID COREMOD_MEMORY_image_set_semflush(
-    const char *IDname,
-    long        index
-)
+imageID COREMOD_MEMORY_image_set_semflush(const char *IDname, long index)
 {
     imageID ID;
 
     ID = image_ID(IDname);
-    if(ID == -1)
+    if (ID == -1)
     {
         ID = read_sharedmem_image(IDname);
     }
 
     ImageStreamIO_semflush(&data.image[ID], index);
 
-
     return ID;
 }
-
-
-
diff --git a/src/COREMOD_memory/stream_sem.h b/src/COREMOD_memory/stream_sem.h
index 02408576..a1cc3c4a 100644
--- a/src/COREMOD_memory/stream_sem.h
+++ b/src/COREMOD_memory/stream_sem.h
@@ -2,62 +2,26 @@
  * @file    stream_sem.h
  */
 
-
 errno_t stream_sem_addCLIcmd();
 
+imageID COREMOD_MEMORY_image_set_createsem(const char *IDname, long NBsem);
 
+imageID COREMOD_MEMORY_image_seminfo(const char *IDname);
 
-imageID COREMOD_MEMORY_image_set_createsem(
-    const char *IDname,
-    long        NBsem
-);
-
-
-imageID COREMOD_MEMORY_image_seminfo(
-    const char *IDname
-);
-
-imageID COREMOD_MEMORY_image_set_sempost(
-    const char *IDname,
-    long        index
-);
+imageID COREMOD_MEMORY_image_set_sempost(const char *IDname, long index);
 
-imageID COREMOD_MEMORY_image_set_sempost_byID(
-    imageID ID,
-    long    index
-);
+imageID COREMOD_MEMORY_image_set_sempost_byID(imageID ID, long index);
 
-imageID COREMOD_MEMORY_image_set_sempost_excl_byID(
-    imageID ID,
-    long    index
-);
+imageID COREMOD_MEMORY_image_set_sempost_excl_byID(imageID ID, long index);
 
-imageID COREMOD_MEMORY_image_set_sempost_loop(
-    const char *IDname,
-    long index,
-    long dtus
-);
+imageID COREMOD_MEMORY_image_set_sempost_loop(const char *IDname, long index, long dtus);
 
-imageID COREMOD_MEMORY_image_set_semwait(
-    const char *IDname,
-    long index
-);
+imageID COREMOD_MEMORY_image_set_semwait(const char *IDname, long index);
 
-void *waitforsemID(
-    void *ID
-);
+void *waitforsemID(void *ID);
 
-errno_t COREMOD_MEMORY_image_set_semwait_OR_IDarray(
-    imageID *IDarray,
-    long     NB_ID
-);
+errno_t COREMOD_MEMORY_image_set_semwait_OR_IDarray(imageID *IDarray, long NB_ID);
 
-errno_t COREMOD_MEMORY_image_set_semflush_IDarray(
-    imageID *IDarray,
-    long     NB_ID
-);
+errno_t COREMOD_MEMORY_image_set_semflush_IDarray(imageID *IDarray, long NB_ID);
 
-imageID COREMOD_MEMORY_image_set_semflush(
-    const char *IDname,
-    long        index
-);
+imageID COREMOD_MEMORY_image_set_semflush(const char *IDname, long index);
diff --git a/src/COREMOD_memory/stream_updateloop.c b/src/COREMOD_memory/stream_updateloop.c
index 1e4b9300..322384ff 100644
--- a/src/COREMOD_memory/stream_updateloop.c
+++ b/src/COREMOD_memory/stream_updateloop.c
@@ -3,75 +3,39 @@
 
 #include <sched.h>
 
-
 #include "CommandLineInterface/CLIcore.h"
 #include "CommandLineInterface/timeutils.h"
 
+#include "create_image.h"
 #include "image_ID.h"
 #include "stream_sem.h"
-#include "create_image.h"
 
 #include "COREMOD_tools/COREMOD_tools.h"
 
-
-
 // ==========================================
 // Forward declaration(s)
 // ==========================================
 
+errno_t COREMOD_MEMORY_image_streamburst(const char *IDin_name, const char *IDout_name, long periodus);
 
+imageID COREMOD_MEMORY_image_streamupdateloop(const char *IDinname, const char *IDoutname, long usperiod, long NBcubes,
+                                              long period, long offsetus, const char *IDsync_name, int semtrig,
+                                              int timingmode);
 
-errno_t COREMOD_MEMORY_image_streamburst(
-    const char *IDin_name,
-    const char *IDout_name,
-    long        periodus
-);
-
-
-imageID COREMOD_MEMORY_image_streamupdateloop(
-    const char *IDinname,
-    const char *IDoutname,
-    long        usperiod,
-    long        NBcubes,
-    long        period,
-    long        offsetus,
-    const char *IDsync_name,
-    int         semtrig,
-    int         timingmode
-);
-
-
-imageID COREMOD_MEMORY_image_streamupdateloop_semtrig(
-    const char *IDinname,
-    const char *IDoutname,
-    long        period,
-    long        offsetus,
-    const char *IDsync_name,
-    int         semtrig,
-    int         timingmode
-);
-
-
-
+imageID COREMOD_MEMORY_image_streamupdateloop_semtrig(const char *IDinname, const char *IDoutname, long period,
+                                                      long offsetus, const char *IDsync_name, int semtrig,
+                                                      int timingmode);
 
 // ==========================================
 // Command line interface wrapper function(s)
 // ==========================================
 
-
 static errno_t COREMOD_MEMORY_image_streamburst__cli()
 {
-    if(0
-            + CLI_checkarg(1, CLIARG_IMG)
-            + CLI_checkarg(2, CLIARG_IMG)
-            + CLI_checkarg(3, CLIARG_LONG)
-            == 0)
+    if (0 + CLI_checkarg(1, CLIARG_IMG) + CLI_checkarg(2, CLIARG_IMG) + CLI_checkarg(3, CLIARG_LONG) == 0)
     {
-        COREMOD_MEMORY_image_streamburst(
-            data.cmdargtoken[1].val.string,
-            data.cmdargtoken[2].val.string,
-            data.cmdargtoken[3].val.numl
-        );
+        COREMOD_MEMORY_image_streamburst(data.cmdargtoken[1].val.string, data.cmdargtoken[2].val.string,
+                                         data.cmdargtoken[3].val.numl);
         return CLICMD_SUCCESS;
     }
     else
@@ -80,33 +44,17 @@ static errno_t COREMOD_MEMORY_image_streamburst__cli()
     }
 }
 
-
-
 static errno_t COREMOD_MEMORY_image_streamupdateloop__cli()
 {
-    if(0
-            + CLI_checkarg(1, CLIARG_IMG)
-            + CLI_checkarg(2, CLIARG_STR)
-            + CLI_checkarg(3, CLIARG_LONG)
-            + CLI_checkarg(4, CLIARG_LONG)
-            + CLI_checkarg(5, CLIARG_LONG)
-            + CLI_checkarg(6, CLIARG_LONG)
-            + CLI_checkarg(7, CLIARG_STR)
-            + CLI_checkarg(8, CLIARG_LONG)
-            + CLI_checkarg(9, CLIARG_LONG)
-            == 0)
+    if (0 + CLI_checkarg(1, CLIARG_IMG) + CLI_checkarg(2, CLIARG_STR) + CLI_checkarg(3, CLIARG_LONG) +
+            CLI_checkarg(4, CLIARG_LONG) + CLI_checkarg(5, CLIARG_LONG) + CLI_checkarg(6, CLIARG_LONG) +
+            CLI_checkarg(7, CLIARG_STR) + CLI_checkarg(8, CLIARG_LONG) + CLI_checkarg(9, CLIARG_LONG) ==
+        0)
     {
         COREMOD_MEMORY_image_streamupdateloop(
-            data.cmdargtoken[1].val.string,
-            data.cmdargtoken[2].val.string,
-            data.cmdargtoken[3].val.numl,
-            data.cmdargtoken[4].val.numl,
-            data.cmdargtoken[5].val.numl,
-            data.cmdargtoken[6].val.numl,
-            data.cmdargtoken[7].val.string,
-            data.cmdargtoken[8].val.numl,
-            data.cmdargtoken[9].val.numl
-        );
+            data.cmdargtoken[1].val.string, data.cmdargtoken[2].val.string, data.cmdargtoken[3].val.numl,
+            data.cmdargtoken[4].val.numl, data.cmdargtoken[5].val.numl, data.cmdargtoken[6].val.numl,
+            data.cmdargtoken[7].val.string, data.cmdargtoken[8].val.numl, data.cmdargtoken[9].val.numl);
         return CLICMD_SUCCESS;
     }
     else
@@ -115,29 +63,17 @@ static errno_t COREMOD_MEMORY_image_streamupdateloop__cli()
     }
 }
 
-
-
 static errno_t COREMOD_MEMORY_image_streamupdateloop_semtrig__cli()
 {
-    if(0
-            + CLI_checkarg(1, CLIARG_IMG)
-            + CLI_checkarg(2, CLIARG_STR)
-            + CLI_checkarg(3, CLIARG_LONG)
-            + CLI_checkarg(4, CLIARG_LONG)
-            + CLI_checkarg(5, CLIARG_STR)
-            + CLI_checkarg(6, CLIARG_LONG)
-            + CLI_checkarg(7, CLIARG_LONG)
-            == 0)
+    if (0 + CLI_checkarg(1, CLIARG_IMG) + CLI_checkarg(2, CLIARG_STR) + CLI_checkarg(3, CLIARG_LONG) +
+            CLI_checkarg(4, CLIARG_LONG) + CLI_checkarg(5, CLIARG_STR) + CLI_checkarg(6, CLIARG_LONG) +
+            CLI_checkarg(7, CLIARG_LONG) ==
+        0)
     {
-        COREMOD_MEMORY_image_streamupdateloop_semtrig(
-            data.cmdargtoken[1].val.string,
-            data.cmdargtoken[2].val.string,
-            data.cmdargtoken[3].val.numl,
-            data.cmdargtoken[4].val.numl,
-            data.cmdargtoken[5].val.string,
-            data.cmdargtoken[6].val.numl,
-            data.cmdargtoken[7].val.numl
-        );
+        COREMOD_MEMORY_image_streamupdateloop_semtrig(data.cmdargtoken[1].val.string, data.cmdargtoken[2].val.string,
+                                                      data.cmdargtoken[3].val.numl, data.cmdargtoken[4].val.numl,
+                                                      data.cmdargtoken[5].val.string, data.cmdargtoken[6].val.numl,
+                                                      data.cmdargtoken[7].val.numl);
         return CLICMD_SUCCESS;
     }
     else
@@ -146,9 +82,6 @@ static errno_t COREMOD_MEMORY_image_streamupdateloop_semtrig__cli()
     }
 }
 
-
-
-
 // ==========================================
 // Register CLI command(s)
 // ==========================================
@@ -156,71 +89,56 @@ static errno_t COREMOD_MEMORY_image_streamupdateloop_semtrig__cli()
 errno_t stream_updateloop_addCLIcmd()
 {
     RegisterCLIcommand(
-        "streamburst",
-        __FILE__,
-        COREMOD_MEMORY_image_streamburst__cli,
-        "send burst of frames to stream",
-        "<input cube> <output stream> <period[us]>",
-        "streamburst inC outstream 1000",
+        "streamburst", __FILE__, COREMOD_MEMORY_image_streamburst__cli, "send burst of frames to stream",
+        "<input cube> <output stream> <period[us]>", "streamburst inC outstream 1000",
         "errno_t COREMOD_MEMORY_image_streamburst(const char *IDin_name, const char *IDout_name, long periodus)");
 
     RegisterCLIcommand(
-        "creaimstream",
-        __FILE__,
-        COREMOD_MEMORY_image_streamupdateloop__cli,
-        "create 2D image stream from 3D cube",
-        "<image3d in> <image2d out> <interval [us]> <NBcubes> <period> <offsetus> <sync stream name> <semtrig> <timing mode>",
+        "creaimstream", __FILE__, COREMOD_MEMORY_image_streamupdateloop__cli, "create 2D image stream from 3D cube",
+        "<image3d in> <image2d out> <interval [us]> <NBcubes> <period> <offsetus> <sync stream name> <semtrig> <timing "
+        "mode>",
         "creaimstream imcube imstream 1000 3 3 154 ircam1 3 0",
-        "long COREMOD_MEMORY_image_streamupdateloop(const char *IDinname, const char *IDoutname, long usperiod, long NBcubes, long period, long offsetus, const char *IDsync_name, int semtrig, int timingmode)");
+        "long COREMOD_MEMORY_image_streamupdateloop(const char *IDinname, const char *IDoutname, long usperiod, long "
+        "NBcubes, long period, long offsetus, const char *IDsync_name, int semtrig, int timingmode)");
 
     RegisterCLIcommand(
-        "creaimstreamstrig",
-        __FILE__,
-        COREMOD_MEMORY_image_streamupdateloop_semtrig__cli,
+        "creaimstreamstrig", __FILE__, COREMOD_MEMORY_image_streamupdateloop_semtrig__cli,
         "create 2D image stream from 3D cube, use other stream to synchronize",
         "<image3d in> <image2d out> <period [int]> <delay [us]> <sync stream> <sync sem index> <timing mode>",
         "creaimstreamstrig imcube outstream 3 152 streamsync 3 0",
-        "long COREMOD_MEMORY_image_streamupdateloop_semtrig(const char *IDinname, const char *IDoutname, long period, long offsetus, const char *IDsync_name, int semtrig, int timingmode)");
+        "long COREMOD_MEMORY_image_streamupdateloop_semtrig(const char *IDinname, const char *IDoutname, long period, "
+        "long offsetus, const char *IDsync_name, int semtrig, int timingmode)");
 
     return RETURN_SUCCESS;
 }
 
-
-
-
-
 /** @brief Send single burst of frames to stream
  *
  */
 
-errno_t COREMOD_MEMORY_image_streamburst(
-    const char *IDin_name,
-    const char *IDout_name,
-    long        periodus
-)
+errno_t COREMOD_MEMORY_image_streamburst(const char *IDin_name, const char *IDout_name, long periodus)
 {
     imageID IDin;
     imageID IDout;
 
-    int        RT_priority = 80; //any number from 0-99
-    struct     sched_param schedpar;
+    int RT_priority = 80; //any number from 0-99
+    struct sched_param schedpar;
 
-    char      *ptr0s; // source start 3D array ptr
-    char      *ptr0; // source
-    char      *ptr1; // dest
-    long       framesize;
+    char *ptr0s; // source start 3D array ptr
+    char *ptr0;  // source
+    char *ptr1;  // dest
+    long framesize;
 
     struct timespec tim;
 
     schedpar.sched_priority = RT_priority;
     sched_setscheduler(0, SCHED_FIFO, &schedpar);
 
-
     IDin = image_ID(IDin_name);
     long naxis = data.image[IDin].md[0].naxis;
     uint32_t *arraysize;
-    arraysize = (uint32_t *) malloc(sizeof(uint32_t) * 3);
-    if(naxis != 3)
+    arraysize = (uint32_t *)malloc(sizeof(uint32_t) * 3);
+    if (naxis != 3)
     {
         printf("ERROR: input image %s should be 3D\n", IDin_name);
         exit(0);
@@ -233,119 +151,103 @@ errno_t COREMOD_MEMORY_image_streamburst(
 
     // check that IDout has same format
     IDout = image_ID(IDout_name);
-    if(data.image[IDout].md[0].size[0] != data.image[IDin].md[0].size[0])
+    if (data.image[IDout].md[0].size[0] != data.image[IDin].md[0].size[0])
     {
         printf("ERROR: in and out have different size\n");
         free(arraysize);
         return RETURN_FAILURE;
     }
-    if(data.image[IDout].md[0].size[1] != data.image[IDin].md[0].size[1])
+    if (data.image[IDout].md[0].size[1] != data.image[IDin].md[0].size[1])
     {
         printf("ERROR: in and out have different size\n");
         free(arraysize);
         return RETURN_FAILURE;
     }
-    if(data.image[IDout].md[0].datatype != data.image[IDin].md[0].datatype)
+    if (data.image[IDout].md[0].datatype != data.image[IDin].md[0].datatype)
     {
         printf("ERROR: in and out have different datatype\n");
         free(arraysize);
         return RETURN_FAILURE;
     }
 
-
-    switch(datatype)
+    switch (datatype)
     {
     case _DATATYPE_INT8:
-        ptr0s = (char *) data.image[IDin].array.SI8;
-        ptr1 = (char *) data.image[IDout].array.SI8;
-        framesize = data.image[IDin].md[0].size[0] *
-                    data.image[IDin].md[0].size[1] * SIZEOF_DATATYPE_INT8;
+        ptr0s = (char *)data.image[IDin].array.SI8;
+        ptr1 = (char *)data.image[IDout].array.SI8;
+        framesize = data.image[IDin].md[0].size[0] * data.image[IDin].md[0].size[1] * SIZEOF_DATATYPE_INT8;
         break;
 
     case _DATATYPE_UINT8:
-        ptr0s = (char *) data.image[IDin].array.UI8;
-        ptr1 = (char *) data.image[IDout].array.UI8;
-        framesize = data.image[IDin].md[0].size[0] *
-                    data.image[IDin].md[0].size[1] * SIZEOF_DATATYPE_UINT8;
+        ptr0s = (char *)data.image[IDin].array.UI8;
+        ptr1 = (char *)data.image[IDout].array.UI8;
+        framesize = data.image[IDin].md[0].size[0] * data.image[IDin].md[0].size[1] * SIZEOF_DATATYPE_UINT8;
         break;
 
     case _DATATYPE_INT16:
-        ptr0s = (char *) data.image[IDin].array.SI16;
-        ptr1 = (char *) data.image[IDout].array.SI16;
-        framesize = data.image[IDin].md[0].size[0] *
-                    data.image[IDin].md[0].size[1] * SIZEOF_DATATYPE_INT16;
+        ptr0s = (char *)data.image[IDin].array.SI16;
+        ptr1 = (char *)data.image[IDout].array.SI16;
+        framesize = data.image[IDin].md[0].size[0] * data.image[IDin].md[0].size[1] * SIZEOF_DATATYPE_INT16;
         break;
 
     case _DATATYPE_UINT16:
-        ptr0s = (char *) data.image[IDin].array.UI16;
-        ptr1 = (char *) data.image[IDout].array.UI16;
-        framesize = data.image[IDin].md[0].size[0] *
-                    data.image[IDin].md[0].size[1] * SIZEOF_DATATYPE_UINT16;
+        ptr0s = (char *)data.image[IDin].array.UI16;
+        ptr1 = (char *)data.image[IDout].array.UI16;
+        framesize = data.image[IDin].md[0].size[0] * data.image[IDin].md[0].size[1] * SIZEOF_DATATYPE_UINT16;
         break;
 
     case _DATATYPE_INT32:
-        ptr0s = (char *) data.image[IDin].array.SI32;
-        ptr1 = (char *) data.image[IDout].array.SI32;
-        framesize = data.image[IDin].md[0].size[0] *
-                    data.image[IDin].md[0].size[1] * SIZEOF_DATATYPE_INT32;
+        ptr0s = (char *)data.image[IDin].array.SI32;
+        ptr1 = (char *)data.image[IDout].array.SI32;
+        framesize = data.image[IDin].md[0].size[0] * data.image[IDin].md[0].size[1] * SIZEOF_DATATYPE_INT32;
         break;
 
     case _DATATYPE_UINT32:
-        ptr0s = (char *) data.image[IDin].array.UI32;
-        ptr1 = (char *) data.image[IDout].array.UI32;
-        framesize = data.image[IDin].md[0].size[0] *
-                    data.image[IDin].md[0].size[1] * SIZEOF_DATATYPE_UINT32;
+        ptr0s = (char *)data.image[IDin].array.UI32;
+        ptr1 = (char *)data.image[IDout].array.UI32;
+        framesize = data.image[IDin].md[0].size[0] * data.image[IDin].md[0].size[1] * SIZEOF_DATATYPE_UINT32;
         break;
 
     case _DATATYPE_INT64:
-        ptr0s = (char *) data.image[IDin].array.SI64;
-        ptr1 = (char *) data.image[IDout].array.SI64;
-        framesize = data.image[IDin].md[0].size[0] *
-                    data.image[IDin].md[0].size[1] * SIZEOF_DATATYPE_INT64;
+        ptr0s = (char *)data.image[IDin].array.SI64;
+        ptr1 = (char *)data.image[IDout].array.SI64;
+        framesize = data.image[IDin].md[0].size[0] * data.image[IDin].md[0].size[1] * SIZEOF_DATATYPE_INT64;
         break;
 
     case _DATATYPE_UINT64:
-        ptr0s = (char *) data.image[IDin].array.UI64;
-        ptr1 = (char *) data.image[IDout].array.UI64;
-        framesize = data.image[IDin].md[0].size[0] *
-                    data.image[IDin].md[0].size[1] * SIZEOF_DATATYPE_UINT64;
+        ptr0s = (char *)data.image[IDin].array.UI64;
+        ptr1 = (char *)data.image[IDout].array.UI64;
+        framesize = data.image[IDin].md[0].size[0] * data.image[IDin].md[0].size[1] * SIZEOF_DATATYPE_UINT64;
         break;
 
-
     case _DATATYPE_FLOAT:
-        ptr0s = (char *) data.image[IDin].array.F;
-        ptr1 = (char *) data.image[IDout].array.F;
-        framesize = data.image[IDin].md[0].size[0] *
-                    data.image[IDin].md[0].size[1] * sizeof(float);
+        ptr0s = (char *)data.image[IDin].array.F;
+        ptr1 = (char *)data.image[IDout].array.F;
+        framesize = data.image[IDin].md[0].size[0] * data.image[IDin].md[0].size[1] * sizeof(float);
         break;
 
     case _DATATYPE_DOUBLE:
-        ptr0s = (char *) data.image[IDin].array.D;
-        ptr1 = (char *) data.image[IDout].array.D;
-        framesize = data.image[IDin].md[0].size[0] *
-                    data.image[IDin].md[0].size[1] * sizeof(double);
+        ptr0s = (char *)data.image[IDin].array.D;
+        ptr1 = (char *)data.image[IDout].array.D;
+        framesize = data.image[IDin].md[0].size[0] * data.image[IDin].md[0].size[1] * sizeof(double);
         break;
-
     }
 
-
     tim.tv_sec = 0;
     tim.tv_nsec = (long)(1000 * periodus);
 
-
-    for(int slice = 0; slice < NBslice; slice++)
+    for (int slice = 0; slice < NBslice; slice++)
     {
-        if(nanosleep(&tim, NULL) < 0)
+        if (nanosleep(&tim, NULL) < 0)
         {
             printf("Nano sleep system call failed \n");
         }
 
-
         ptr0 = ptr0s + slice * framesize;
 
         ptr0 = ptr0s + slice * framesize;
         data.image[IDout].md[0].write = 1;
-        memcpy((void *) ptr1, (void *) ptr0, framesize);
+        memcpy((void *)ptr1, (void *)ptr0, framesize);
         data.image[IDout].md[0].cnt1 = slice;
         data.image[IDout].md[0].cnt0++;
         data.image[IDout].md[0].write = 0;
@@ -357,11 +259,6 @@ errno_t COREMOD_MEMORY_image_streamburst(
     return RETURN_SUCCESS;
 }
 
-
-
-
-
-
 /** @brief takes a 3Dimage(s) (circular buffer(s)) and writes slices to a 2D image with time interval specified in us
  *
  *
@@ -380,51 +277,41 @@ errno_t COREMOD_MEMORY_image_streamburst(
  *
  *
  */
-imageID COREMOD_MEMORY_image_streamupdateloop(
-    const char *IDinname,
-    const char *IDoutname,
-    long        usperiod,
-    long        NBcubes,
-    long        period,
-    long        offsetus,
-    const char *IDsync_name,
-    int         semtrig,
-    __attribute__((unused)) int         timingmode
-)
+imageID COREMOD_MEMORY_image_streamupdateloop(const char *IDinname, const char *IDoutname, long usperiod, long NBcubes,
+                                              long period, long offsetus, const char *IDsync_name, int semtrig,
+                                              __attribute__((unused)) int timingmode)
 {
-    imageID   *IDin;
-    long       cubeindex;
-    char       imname[200];
-    long       IDsync;
-    unsigned long long  cntsync;
-    long       pcnt = 0;
-    long       offsetfr = 0;
-    long       offsetfrcnt = 0;
-    int        cntDelayMode = 0;
-
-    imageID    IDout;
-    long       kk;
-    uint32_t  *arraysize;
-    long       naxis;
-    uint8_t    datatype;
-    char      *ptr0s; // source start 3D array ptr
-    char      *ptr0; // source
-    char      *ptr1; // dest
-    long       framesize;
-//    int        semval;
-
-    int        RT_priority = 80; //any number from 0-99
-    struct     sched_param schedpar;
-
-    long       twait1;
-    struct     timespec t0;
-    struct     timespec t1;
-    double     tdiffv;
-    struct     timespec tdiff;
-
-    int        SyncSlice = 0;
+    imageID *IDin;
+    long cubeindex;
+    char imname[200];
+    long IDsync;
+    unsigned long long cntsync;
+    long pcnt = 0;
+    long offsetfr = 0;
+    long offsetfrcnt = 0;
+    int cntDelayMode = 0;
+
+    imageID IDout;
+    long kk;
+    uint32_t *arraysize;
+    long naxis;
+    uint8_t datatype;
+    char *ptr0s; // source start 3D array ptr
+    char *ptr0;  // source
+    char *ptr1;  // dest
+    long framesize;
+    //    int        semval;
+
+    int RT_priority = 80; //any number from 0-99
+    struct sched_param schedpar;
 
+    long twait1;
+    struct timespec t0;
+    struct timespec t1;
+    double tdiffv;
+    struct timespec tdiff;
 
+    int SyncSlice = 0;
 
     schedpar.sched_priority = RT_priority;
 #ifndef __MACH__
@@ -432,9 +319,8 @@ imageID COREMOD_MEMORY_image_streamupdateloop(
                        &schedpar); //other option is SCHED_RR, might be faster
 #endif
 
-
     PROCESSINFO *processinfo;
-    if(data.processinfo == 1)
+    if (data.processinfo == 1)
     {
         // CREATE PROCESSINFO ENTRY
         // see processtools.c in module CommandLineInterface for details
@@ -445,7 +331,7 @@ imageID COREMOD_MEMORY_image_streamupdateloop(
         processinfo->loopstat = 0; // loop initialization
 
         strcpy(processinfo->source_FUNCTION, __FUNCTION__);
-        strcpy(processinfo->source_FILE,     __FILE__);
+        strcpy(processinfo->source_FILE, __FILE__);
         processinfo->source_LINE = __LINE__;
 
         char msgstring[200];
@@ -453,26 +339,22 @@ imageID COREMOD_MEMORY_image_streamupdateloop(
         processinfo_WriteMessage(processinfo, msgstring);
     }
 
-
-
-
-    if(NBcubes < 1)
+    if (NBcubes < 1)
     {
         printf("ERROR: invalid number of input cubes, needs to be >0");
         return RETURN_FAILURE;
     }
 
-
     int sync_semwaitindex;
-    IDin = (long *) malloc(sizeof(long) * NBcubes);
+    IDin = (long *)malloc(sizeof(long) * NBcubes);
     SyncSlice = 0;
-    if(NBcubes == 1)
+    if (NBcubes == 1)
     {
         IDin[0] = image_ID(IDinname);
 
         // in single cube mode, optional sync stream drives updates to next slice within cube
         IDsync = image_ID(IDsync_name);
-        if(IDsync != -1)
+        if (IDsync != -1)
         {
             SyncSlice = 1;
             sync_semwaitindex = ImageStreamIO_getsemwaitindex(&data.image[IDsync], semtrig);
@@ -483,7 +365,7 @@ imageID COREMOD_MEMORY_image_streamupdateloop(
         IDsync = image_ID(IDsync_name);
         sync_semwaitindex = ImageStreamIO_getsemwaitindex(&data.image[IDsync], semtrig);
 
-        for(cubeindex = 0; cubeindex < NBcubes; cubeindex++)
+        for (cubeindex = 0; cubeindex < NBcubes; cubeindex++)
         {
             sprintf(imname, "%s_%03ld", IDinname, cubeindex);
             IDin[cubeindex] = image_ID(imname);
@@ -493,17 +375,14 @@ imageID COREMOD_MEMORY_image_streamupdateloop(
         printf("FRAMES OFFSET = %ld\n", offsetfr);
     }
 
-
-
     printf("SyncSlice = %d\n", SyncSlice);
 
     printf("Creating / connecting to image stream ...\n");
     fflush(stdout);
 
-
     naxis = data.image[IDin[0]].md[0].naxis;
-    arraysize = (uint32_t *) malloc(sizeof(uint32_t) * 3);
-    if(naxis != 3)
+    arraysize = (uint32_t *)malloc(sizeof(uint32_t) * 3);
+    if (naxis != 3)
     {
         printf("ERROR: input image %s should be 3D\n", IDinname);
         exit(0);
@@ -512,12 +391,10 @@ imageID COREMOD_MEMORY_image_streamupdateloop(
     arraysize[1] = data.image[IDin[0]].md[0].size[1];
     arraysize[2] = data.image[IDin[0]].md[0].size[2];
 
-
-
     datatype = data.image[IDin[0]].md[0].datatype;
 
     IDout = image_ID(IDoutname);
-    if(IDout == -1)
+    if (IDout == -1)
     {
         create_image_ID(IDoutname, 2, arraysize, datatype, 1, 0, 0, &IDout);
         COREMOD_MEMORY_image_set_createsem(IDoutname, IMAGE_NB_SEMAPHORE);
@@ -525,7 +402,7 @@ imageID COREMOD_MEMORY_image_streamupdateloop(
 
     cubeindex = 0;
     pcnt = 0;
-    if(NBcubes > 1)
+    if (NBcubes > 1)
     {
         cntsync = data.image[IDsync].md[0].cnt0;
     }
@@ -534,57 +411,53 @@ imageID COREMOD_MEMORY_image_streamupdateloop(
     kk = 0;
     cntDelayMode = 0;
 
-
-
-    if(data.processinfo == 1)
+    if (data.processinfo == 1)
     {
-        processinfo->loopstat = 1;    // loop running
+        processinfo->loopstat = 1; // loop running
     }
     int loopOK = 1;
     int loopCTRLexit = 0; // toggles to 1 when loop is set to exit cleanly
     long loopcnt = 0;
 
-    while(loopOK == 1)
+    while (loopOK == 1)
     {
 
         // processinfo control
-        if(data.processinfo == 1)
+        if (data.processinfo == 1)
         {
-            while(processinfo->CTRLval == 1)  // pause
+            while (processinfo->CTRLval == 1) // pause
             {
                 usleep(50);
             }
 
-            if(processinfo->CTRLval == 2) // single iteration
+            if (processinfo->CTRLval == 2) // single iteration
             {
                 processinfo->CTRLval = 1;
             }
 
-            if(processinfo->CTRLval == 3) // exit loop
+            if (processinfo->CTRLval == 3) // exit loop
             {
                 loopCTRLexit = 1;
             }
         }
 
-
-
-        if(NBcubes > 1)
+        if (NBcubes > 1)
         {
-            if(cntsync != data.image[IDsync].md[0].cnt0)
+            if (cntsync != data.image[IDsync].md[0].cnt0)
             {
                 pcnt++;
                 cntsync = data.image[IDsync].md[0].cnt0;
             }
-            if(pcnt == period)
+            if (pcnt == period)
             {
                 pcnt = 0;
                 offsetfrcnt = 0;
                 cntDelayMode = 1;
             }
 
-            if(cntDelayMode == 1)
+            if (cntDelayMode == 1)
             {
-                if(offsetfrcnt < offsetfr)
+                if (offsetfrcnt < offsetfr)
                 {
                     offsetfrcnt++;
                 }
@@ -595,111 +468,103 @@ imageID COREMOD_MEMORY_image_streamupdateloop(
                     kk = 0;
                 }
             }
-            if(cubeindex == NBcubes)
+            if (cubeindex == NBcubes)
             {
                 cubeindex = 0;
             }
         }
 
-
-        switch(datatype)
+        switch (datatype)
         {
 
         case _DATATYPE_INT8:
-            ptr0s = (char *) data.image[IDin[cubeindex]].array.SI8;
-            ptr1 = (char *) data.image[IDout].array.SI8;
-            framesize = data.image[IDin[cubeindex]].md[0].size[0] *
-                        data.image[IDin[cubeindex]].md[0].size[1] * SIZEOF_DATATYPE_INT8;
+            ptr0s = (char *)data.image[IDin[cubeindex]].array.SI8;
+            ptr1 = (char *)data.image[IDout].array.SI8;
+            framesize = data.image[IDin[cubeindex]].md[0].size[0] * data.image[IDin[cubeindex]].md[0].size[1] *
+                        SIZEOF_DATATYPE_INT8;
             break;
 
         case _DATATYPE_UINT8:
-            ptr0s = (char *) data.image[IDin[cubeindex]].array.UI8;
-            ptr1 = (char *) data.image[IDout].array.UI8;
-            framesize = data.image[IDin[cubeindex]].md[0].size[0] *
-                        data.image[IDin[cubeindex]].md[0].size[1] * SIZEOF_DATATYPE_UINT8;
+            ptr0s = (char *)data.image[IDin[cubeindex]].array.UI8;
+            ptr1 = (char *)data.image[IDout].array.UI8;
+            framesize = data.image[IDin[cubeindex]].md[0].size[0] * data.image[IDin[cubeindex]].md[0].size[1] *
+                        SIZEOF_DATATYPE_UINT8;
             break;
 
         case _DATATYPE_INT16:
-            ptr0s = (char *) data.image[IDin[cubeindex]].array.SI16;
-            ptr1 = (char *) data.image[IDout].array.SI16;
-            framesize = data.image[IDin[cubeindex]].md[0].size[0] *
-                        data.image[IDin[cubeindex]].md[0].size[1] * SIZEOF_DATATYPE_INT16;
+            ptr0s = (char *)data.image[IDin[cubeindex]].array.SI16;
+            ptr1 = (char *)data.image[IDout].array.SI16;
+            framesize = data.image[IDin[cubeindex]].md[0].size[0] * data.image[IDin[cubeindex]].md[0].size[1] *
+                        SIZEOF_DATATYPE_INT16;
             break;
 
         case _DATATYPE_UINT16:
-            ptr0s = (char *) data.image[IDin[cubeindex]].array.UI16;
-            ptr1 = (char *) data.image[IDout].array.UI16;
-            framesize = data.image[IDin[cubeindex]].md[0].size[0] *
-                        data.image[IDin[cubeindex]].md[0].size[1] * SIZEOF_DATATYPE_UINT16;
+            ptr0s = (char *)data.image[IDin[cubeindex]].array.UI16;
+            ptr1 = (char *)data.image[IDout].array.UI16;
+            framesize = data.image[IDin[cubeindex]].md[0].size[0] * data.image[IDin[cubeindex]].md[0].size[1] *
+                        SIZEOF_DATATYPE_UINT16;
             break;
 
         case _DATATYPE_INT32:
-            ptr0s = (char *) data.image[IDin[cubeindex]].array.SI32;
-            ptr1 = (char *) data.image[IDout].array.SI32;
-            framesize = data.image[IDin[cubeindex]].md[0].size[0] *
-                        data.image[IDin[cubeindex]].md[0].size[1] * SIZEOF_DATATYPE_INT32;
+            ptr0s = (char *)data.image[IDin[cubeindex]].array.SI32;
+            ptr1 = (char *)data.image[IDout].array.SI32;
+            framesize = data.image[IDin[cubeindex]].md[0].size[0] * data.image[IDin[cubeindex]].md[0].size[1] *
+                        SIZEOF_DATATYPE_INT32;
             break;
 
         case _DATATYPE_UINT32:
-            ptr0s = (char *) data.image[IDin[cubeindex]].array.UI32;
-            ptr1 = (char *) data.image[IDout].array.UI32;
-            framesize = data.image[IDin[cubeindex]].md[0].size[0] *
-                        data.image[IDin[cubeindex]].md[0].size[1] * SIZEOF_DATATYPE_UINT32;
+            ptr0s = (char *)data.image[IDin[cubeindex]].array.UI32;
+            ptr1 = (char *)data.image[IDout].array.UI32;
+            framesize = data.image[IDin[cubeindex]].md[0].size[0] * data.image[IDin[cubeindex]].md[0].size[1] *
+                        SIZEOF_DATATYPE_UINT32;
             break;
 
         case _DATATYPE_INT64:
-            ptr0s = (char *) data.image[IDin[cubeindex]].array.SI64;
-            ptr1 = (char *) data.image[IDout].array.SI64;
-            framesize = data.image[IDin[cubeindex]].md[0].size[0] *
-                        data.image[IDin[cubeindex]].md[0].size[1] * SIZEOF_DATATYPE_INT64;
+            ptr0s = (char *)data.image[IDin[cubeindex]].array.SI64;
+            ptr1 = (char *)data.image[IDout].array.SI64;
+            framesize = data.image[IDin[cubeindex]].md[0].size[0] * data.image[IDin[cubeindex]].md[0].size[1] *
+                        SIZEOF_DATATYPE_INT64;
             break;
 
         case _DATATYPE_UINT64:
-            ptr0s = (char *) data.image[IDin[cubeindex]].array.UI64;
-            ptr1 = (char *) data.image[IDout].array.UI64;
-            framesize = data.image[IDin[cubeindex]].md[0].size[0] *
-                        data.image[IDin[cubeindex]].md[0].size[1] * SIZEOF_DATATYPE_UINT64;
+            ptr0s = (char *)data.image[IDin[cubeindex]].array.UI64;
+            ptr1 = (char *)data.image[IDout].array.UI64;
+            framesize = data.image[IDin[cubeindex]].md[0].size[0] * data.image[IDin[cubeindex]].md[0].size[1] *
+                        SIZEOF_DATATYPE_UINT64;
             break;
 
-
         case _DATATYPE_FLOAT:
-            ptr0s = (char *) data.image[IDin[cubeindex]].array.F;
-            ptr1 = (char *) data.image[IDout].array.F;
-            framesize = data.image[IDin[cubeindex]].md[0].size[0] *
-                        data.image[IDin[cubeindex]].md[0].size[1] * sizeof(float);
+            ptr0s = (char *)data.image[IDin[cubeindex]].array.F;
+            ptr1 = (char *)data.image[IDout].array.F;
+            framesize =
+                data.image[IDin[cubeindex]].md[0].size[0] * data.image[IDin[cubeindex]].md[0].size[1] * sizeof(float);
             break;
 
         case _DATATYPE_DOUBLE:
-            ptr0s = (char *) data.image[IDin[cubeindex]].array.D;
-            ptr1 = (char *) data.image[IDout].array.D;
-            framesize = data.image[IDin[cubeindex]].md[0].size[0] *
-                        data.image[IDin[cubeindex]].md[0].size[1] * sizeof(double);
+            ptr0s = (char *)data.image[IDin[cubeindex]].array.D;
+            ptr1 = (char *)data.image[IDout].array.D;
+            framesize =
+                data.image[IDin[cubeindex]].md[0].size[0] * data.image[IDin[cubeindex]].md[0].size[1] * sizeof(double);
             break;
-
         }
 
-
-
-
         clock_gettime(CLOCK_REALTIME, &t0);
 
         ptr0 = ptr0s + kk * framesize;
         data.image[IDout].md[0].write = 1;
-        memcpy((void *) ptr1, (void *) ptr0, framesize);
+        memcpy((void *)ptr1, (void *)ptr0, framesize);
         data.image[IDout].md[0].cnt1 = kk;
         data.image[IDout].md[0].cnt0++;
         data.image[IDout].md[0].write = 0;
         COREMOD_MEMORY_image_set_sempost_byID(IDout, -1);
 
         kk++;
-        if(kk == data.image[IDin[0]].md[0].size[2])
+        if (kk == data.image[IDin[0]].md[0].size[2])
         {
             kk = 0;
         }
 
-
-
-        if(SyncSlice == 0)
+        if (SyncSlice == 0)
         {
             usleep(twait1);
 
@@ -707,20 +572,20 @@ imageID COREMOD_MEMORY_image_streamupdateloop(
             tdiff = timespec_diff(t0, t1);
             tdiffv = 1.0 * tdiff.tv_sec + 1.0e-9 * tdiff.tv_nsec;
 
-            if(tdiffv < 1.0e-6 * usperiod)
+            if (tdiffv < 1.0e-6 * usperiod)
             {
-                twait1 ++;
+                twait1++;
             }
             else
             {
-                twait1 --;
+                twait1--;
             }
 
-            if(twait1 < 0)
+            if (twait1 < 0)
             {
                 twait1 = 0;
             }
-            if(twait1 > usperiod)
+            if (twait1 > usperiod)
             {
                 twait1 = usperiod;
             }
@@ -730,10 +595,10 @@ imageID COREMOD_MEMORY_image_streamupdateloop(
             sem_wait(data.image[IDsync].semptr[sync_semwaitindex]);
         }
 
-        if(loopCTRLexit == 1)
+        if (loopCTRLexit == 1)
         {
             loopOK = 0;
-            if(data.processinfo == 1)
+            if (data.processinfo == 1)
             {
                 struct timespec tstop;
                 struct tm *tstoptm;
@@ -742,16 +607,16 @@ imageID COREMOD_MEMORY_image_streamupdateloop(
                 clock_gettime(CLOCK_REALTIME, &tstop);
                 tstoptm = gmtime(&tstop.tv_sec);
 
-                sprintf(msgstring, "CTRLexit at %02d:%02d:%02d.%03d", tstoptm->tm_hour,
-                        tstoptm->tm_min, tstoptm->tm_sec, (int)(0.000001 * (tstop.tv_nsec)));
-                strncpy(processinfo->statusmsg, msgstring, STRINGMAXLEN_PROCESSINFO_STATUSMSG-1);
+                sprintf(msgstring, "CTRLexit at %02d:%02d:%02d.%03d", tstoptm->tm_hour, tstoptm->tm_min,
+                        tstoptm->tm_sec, (int)(0.000001 * (tstop.tv_nsec)));
+                strncpy(processinfo->statusmsg, msgstring, STRINGMAXLEN_PROCESSINFO_STATUSMSG - 1);
 
                 processinfo->loopstat = 3; // clean exit
             }
         }
 
         loopcnt++;
-        if(data.processinfo == 1)
+        if (data.processinfo == 1)
         {
             processinfo->loopcnt = loopcnt;
         }
@@ -762,42 +627,29 @@ imageID COREMOD_MEMORY_image_streamupdateloop(
     return IDout;
 }
 
-
-
-
-
-
-
 // takes a 3Dimage (circular buffer) and writes slices to a 2D image synchronized with an image semaphore
-imageID COREMOD_MEMORY_image_streamupdateloop_semtrig(
-    const char *IDinname,
-    const char *IDoutname,
-    long        period,
-    long        offsetus,
-    const char *IDsync_name,
-    int         semtrig,
-    __attribute__((unused)) int         timingmode
-)
+imageID COREMOD_MEMORY_image_streamupdateloop_semtrig(const char *IDinname, const char *IDoutname, long period,
+                                                      long offsetus, const char *IDsync_name, int semtrig,
+                                                      __attribute__((unused)) int timingmode)
 {
-    imageID    IDin;
-    imageID    IDout;
-    imageID    IDsync;
-
-    long       kk;
-    long       kk1;
+    imageID IDin;
+    imageID IDout;
+    imageID IDsync;
 
-    uint32_t  *arraysize;
-    long       naxis;
-    uint8_t    datatype;
-    char      *ptr0s; // source start 3D array ptr
-    char      *ptr0; // source
-    char      *ptr1; // dest
-    long       framesize;
-//    int        semval;
+    long kk;
+    long kk1;
 
-    int        RT_priority = 80; //any number from 0-99
-    struct     sched_param schedpar;
+    uint32_t *arraysize;
+    long naxis;
+    uint8_t datatype;
+    char *ptr0s; // source start 3D array ptr
+    char *ptr0;  // source
+    char *ptr1;  // dest
+    long framesize;
+    //    int        semval;
 
+    int RT_priority = 80; //any number from 0-99
+    struct sched_param schedpar;
 
     schedpar.sched_priority = RT_priority;
 #ifndef __MACH__
@@ -805,14 +657,13 @@ imageID COREMOD_MEMORY_image_streamupdateloop_semtrig(
                        &schedpar); //other option is SCHED_RR, might be faster
 #endif
 
-
     printf("Creating / connecting to image stream ...\n");
     fflush(stdout);
 
     IDin = image_ID(IDinname);
     naxis = data.image[IDin].md[0].naxis;
-    arraysize = (uint32_t *) malloc(sizeof(uint32_t) * 3);
-    if(naxis != 3)
+    arraysize = (uint32_t *)malloc(sizeof(uint32_t) * 3);
+    if (naxis != 3)
     {
         printf("ERROR: input image %s should be 3D\n", IDinname);
         exit(0);
@@ -821,97 +672,79 @@ imageID COREMOD_MEMORY_image_streamupdateloop_semtrig(
     arraysize[1] = data.image[IDin].md[0].size[1];
     arraysize[2] = data.image[IDin].md[0].size[2];
 
-
-
-
-
     datatype = data.image[IDin].md[0].datatype;
 
     IDout = image_ID(IDoutname);
-    if(IDout == -1)
+    if (IDout == -1)
     {
         create_image_ID(IDoutname, 2, arraysize, datatype, 1, 0, 0, &IDout);
         COREMOD_MEMORY_image_set_createsem(IDoutname, IMAGE_NB_SEMAPHORE);
     }
 
-    switch(datatype)
+    switch (datatype)
     {
 
     case _DATATYPE_INT8:
-        ptr0s = (char *) data.image[IDin].array.SI8;
-        ptr1 = (char *) data.image[IDout].array.SI8;
-        framesize = data.image[IDin].md[0].size[0] * data.image[IDin].md[0].size[1] *
-                    SIZEOF_DATATYPE_INT8;
+        ptr0s = (char *)data.image[IDin].array.SI8;
+        ptr1 = (char *)data.image[IDout].array.SI8;
+        framesize = data.image[IDin].md[0].size[0] * data.image[IDin].md[0].size[1] * SIZEOF_DATATYPE_INT8;
         break;
 
     case _DATATYPE_UINT8:
-        ptr0s = (char *) data.image[IDin].array.UI8;
-        ptr1 = (char *) data.image[IDout].array.UI8;
-        framesize = data.image[IDin].md[0].size[0] * data.image[IDin].md[0].size[1] *
-                    SIZEOF_DATATYPE_UINT8;
+        ptr0s = (char *)data.image[IDin].array.UI8;
+        ptr1 = (char *)data.image[IDout].array.UI8;
+        framesize = data.image[IDin].md[0].size[0] * data.image[IDin].md[0].size[1] * SIZEOF_DATATYPE_UINT8;
         break;
 
     case _DATATYPE_INT16:
-        ptr0s = (char *) data.image[IDin].array.SI16;
-        ptr1 = (char *) data.image[IDout].array.SI16;
-        framesize = data.image[IDin].md[0].size[0] * data.image[IDin].md[0].size[1] *
-                    SIZEOF_DATATYPE_INT16;
+        ptr0s = (char *)data.image[IDin].array.SI16;
+        ptr1 = (char *)data.image[IDout].array.SI16;
+        framesize = data.image[IDin].md[0].size[0] * data.image[IDin].md[0].size[1] * SIZEOF_DATATYPE_INT16;
         break;
 
     case _DATATYPE_UINT16:
-        ptr0s = (char *) data.image[IDin].array.UI16;
-        ptr1 = (char *) data.image[IDout].array.UI16;
-        framesize = data.image[IDin].md[0].size[0] * data.image[IDin].md[0].size[1] *
-                    SIZEOF_DATATYPE_UINT16;
+        ptr0s = (char *)data.image[IDin].array.UI16;
+        ptr1 = (char *)data.image[IDout].array.UI16;
+        framesize = data.image[IDin].md[0].size[0] * data.image[IDin].md[0].size[1] * SIZEOF_DATATYPE_UINT16;
         break;
 
     case _DATATYPE_INT32:
-        ptr0s = (char *) data.image[IDin].array.SI32;
-        ptr1 = (char *) data.image[IDout].array.SI32;
-        framesize = data.image[IDin].md[0].size[0] * data.image[IDin].md[0].size[1] *
-                    SIZEOF_DATATYPE_INT32;
+        ptr0s = (char *)data.image[IDin].array.SI32;
+        ptr1 = (char *)data.image[IDout].array.SI32;
+        framesize = data.image[IDin].md[0].size[0] * data.image[IDin].md[0].size[1] * SIZEOF_DATATYPE_INT32;
         break;
 
     case _DATATYPE_UINT32:
-        ptr0s = (char *) data.image[IDin].array.UI32;
-        ptr1 = (char *) data.image[IDout].array.UI32;
-        framesize = data.image[IDin].md[0].size[0] * data.image[IDin].md[0].size[1] *
-                    SIZEOF_DATATYPE_UINT32;
+        ptr0s = (char *)data.image[IDin].array.UI32;
+        ptr1 = (char *)data.image[IDout].array.UI32;
+        framesize = data.image[IDin].md[0].size[0] * data.image[IDin].md[0].size[1] * SIZEOF_DATATYPE_UINT32;
         break;
 
     case _DATATYPE_INT64:
-        ptr0s = (char *) data.image[IDin].array.SI64;
-        ptr1 = (char *) data.image[IDout].array.SI64;
-        framesize = data.image[IDin].md[0].size[0] * data.image[IDin].md[0].size[1] *
-                    SIZEOF_DATATYPE_INT64;
+        ptr0s = (char *)data.image[IDin].array.SI64;
+        ptr1 = (char *)data.image[IDout].array.SI64;
+        framesize = data.image[IDin].md[0].size[0] * data.image[IDin].md[0].size[1] * SIZEOF_DATATYPE_INT64;
         break;
 
     case _DATATYPE_UINT64:
-        ptr0s = (char *) data.image[IDin].array.UI64;
-        ptr1 = (char *) data.image[IDout].array.UI64;
-        framesize = data.image[IDin].md[0].size[0] * data.image[IDin].md[0].size[1] *
-                    SIZEOF_DATATYPE_UINT64;
+        ptr0s = (char *)data.image[IDin].array.UI64;
+        ptr1 = (char *)data.image[IDout].array.UI64;
+        framesize = data.image[IDin].md[0].size[0] * data.image[IDin].md[0].size[1] * SIZEOF_DATATYPE_UINT64;
         break;
 
-
     case _DATATYPE_FLOAT:
-        ptr0s = (char *) data.image[IDin].array.F;
-        ptr1 = (char *) data.image[IDout].array.F;
-        framesize = data.image[IDin].md[0].size[0] * data.image[IDin].md[0].size[1] *
-                    sizeof(float);
+        ptr0s = (char *)data.image[IDin].array.F;
+        ptr1 = (char *)data.image[IDout].array.F;
+        framesize = data.image[IDin].md[0].size[0] * data.image[IDin].md[0].size[1] * sizeof(float);
         break;
 
     case _DATATYPE_DOUBLE:
-        ptr0s = (char *) data.image[IDin].array.D;
-        ptr1 = (char *) data.image[IDout].array.D;
-        framesize = data.image[IDin].md[0].size[0] * data.image[IDin].md[0].size[1] *
-                    sizeof(double);
+        ptr0s = (char *)data.image[IDin].array.D;
+        ptr1 = (char *)data.image[IDout].array.D;
+        framesize = data.image[IDin].md[0].size[0] * data.image[IDin].md[0].size[1] * sizeof(double);
         break;
     }
 
-
-
-
     IDsync = image_ID(IDsync_name);
 
     kk = 0;
@@ -920,23 +753,23 @@ imageID COREMOD_MEMORY_image_streamupdateloop_semtrig(
     int sync_semwaitindex;
     sync_semwaitindex = ImageStreamIO_getsemwaitindex(&data.image[IDin], semtrig);
 
-    while(1)
+    while (1)
     {
         sem_wait(data.image[IDsync].semptr[sync_semwaitindex]);
 
         kk++;
-        if(kk == period) // UPDATE
+        if (kk == period) // UPDATE
         {
             kk = 0;
             kk1++;
-            if(kk1 == data.image[IDin].md[0].size[2])
+            if (kk1 == data.image[IDin].md[0].size[2])
             {
                 kk1 = 0;
             }
             usleep(offsetus);
             ptr0 = ptr0s + kk1 * framesize;
             data.image[IDout].md[0].write = 1;
-            memcpy((void *) ptr1, (void *) ptr0, framesize);
+            memcpy((void *)ptr1, (void *)ptr0, framesize);
             COREMOD_MEMORY_image_set_sempost_byID(IDout, -1);
             data.image[IDout].md[0].cnt0++;
             data.image[IDout].md[0].write = 0;
@@ -948,8 +781,3 @@ imageID COREMOD_MEMORY_image_streamupdateloop_semtrig(
 
     return IDout;
 }
-
-
-
-
-
diff --git a/src/COREMOD_memory/stream_updateloop.h b/src/COREMOD_memory/stream_updateloop.h
index c5fb165d..1d8d1eec 100644
--- a/src/COREMOD_memory/stream_updateloop.h
+++ b/src/COREMOD_memory/stream_updateloop.h
@@ -1,29 +1,12 @@
 /** @file stream_updateloop.h
  */
- 
 
 errno_t stream_updateloop_addCLIcmd();
 
+imageID COREMOD_MEMORY_image_streamupdateloop(const char *IDinname, const char *IDoutname, long usperiod, long NBcubes,
+                                              long period, long offsetus, const char *IDsync_name, int semtrig,
+                                              int timingmode);
 
-imageID COREMOD_MEMORY_image_streamupdateloop(
-    const char *IDinname,
-    const char *IDoutname,
-    long        usperiod,
-    long        NBcubes,
-    long        period,
-    long        offsetus,
-    const char *IDsync_name,
-    int         semtrig,
-    int         timingmode
-);
-
-
-imageID COREMOD_MEMORY_image_streamupdateloop_semtrig(
-    const char *IDinname,
-    const char *IDoutname,
-    long        period,
-    long        offsetus,
-    const char *IDsync_name,
-    int         semtrig,
-    int         timingmode
-);
+imageID COREMOD_MEMORY_image_streamupdateloop_semtrig(const char *IDinname, const char *IDoutname, long period,
+                                                      long offsetus, const char *IDsync_name, int semtrig,
+                                                      int timingmode);
diff --git a/src/COREMOD_memory/variable_ID.c b/src/COREMOD_memory/variable_ID.c
index c881eca6..6b916c8a 100644
--- a/src/COREMOD_memory/variable_ID.c
+++ b/src/COREMOD_memory/variable_ID.c
@@ -3,30 +3,23 @@
  * @brief   find variable ID(s) from name
  */
 
-
 #include "CommandLineInterface/CLIcore.h"
 
-
-
-
-
 /* ID number corresponding to a name */
-variableID variable_ID(
-    const char *name
-)
+variableID variable_ID(const char *name)
 {
     variableID i;
     variableID tmpID;
-    int        loopOK;
+    int loopOK;
 
     i = 0;
     loopOK = 1;
-    while(loopOK == 1)
+    while (loopOK == 1)
     {
-        if(data.variable[i].used == 1)
+        if (data.variable[i].used == 1)
         {
-            if((strncmp(name, data.variable[i].name, strlen(name)) == 0)
-                    && (data.variable[i].name[strlen(name)] == '\0'))
+            if ((strncmp(name, data.variable[i].name, strlen(name)) == 0) &&
+                (data.variable[i].name[strlen(name)] == '\0'))
             {
                 loopOK = 0;
                 tmpID = i;
@@ -34,7 +27,7 @@ variableID variable_ID(
         }
 
         i++;
-        if(i == data.NB_MAX_VARIABLE)
+        if (i == data.NB_MAX_VARIABLE)
         {
             loopOK = 0;
             tmpID = -1;
@@ -44,26 +37,23 @@ variableID variable_ID(
     return tmpID;
 }
 
-
-
-
 /* next available ID number */
 variableID next_avail_variable_ID()
 {
     variableID i;
     variableID ID = -1;
-    int        found = 0;
+    int found = 0;
 
-    for(i = 0; i < data.NB_MAX_VARIABLE; i++)
+    for (i = 0; i < data.NB_MAX_VARIABLE; i++)
     {
-        if((data.variable[i].used == 0) && (found == 0))
+        if ((data.variable[i].used == 0) && (found == 0))
         {
             ID = i;
             found = 1;
         }
     }
 
-    if(ID == -1)
+    if (ID == -1)
     {
         ID = data.NB_MAX_VARIABLE;
     }
@@ -71,20 +61,17 @@ variableID next_avail_variable_ID()
     return ID;
 }
 
-
-
 long compute_variable_memory()
 {
     long totalvmem = 0;
 
-    for(variableID i = 0; i < data.NB_MAX_VARIABLE; i++)
+    for (variableID i = 0; i < data.NB_MAX_VARIABLE; i++)
     {
         totalvmem += sizeof(VARIABLE);
-        if(data.variable[i].used == 1)
+        if (data.variable[i].used == 1)
         {
             totalvmem += 0;
         }
     }
     return totalvmem;
 }
-
diff --git a/src/COREMOD_memory/variable_ID.h b/src/COREMOD_memory/variable_ID.h
index ead805fc..ce6bbf31 100644
--- a/src/COREMOD_memory/variable_ID.h
+++ b/src/COREMOD_memory/variable_ID.h
@@ -2,13 +2,8 @@
  * @file    image_ID.h
  */
 
-
-
-variableID variable_ID(
-    const char *name
-);
-
+variableID variable_ID(const char *name);
 
 variableID next_avail_variable_ID();
 
-long       compute_variable_memory();
+long compute_variable_memory();
diff --git a/src/COREMOD_tools/COREMOD_tools.c b/src/COREMOD_tools/COREMOD_tools.c
index 8bb95e0f..4dbe66dc 100644
--- a/src/COREMOD_tools/COREMOD_tools.c
+++ b/src/COREMOD_tools/COREMOD_tools.c
@@ -7,38 +7,28 @@
  *
  */
 
-
-
 #define MODULE_SHORTNAME_DEFAULT ""
-#define MODULE_DESCRIPTION       "misc tools"
-
-
+#define MODULE_DESCRIPTION "misc tools"
 
-#include "CommandLineInterface/CLIcore.h"
-#include "COREMOD_memory/COREMOD_memory.h"
 #include "COREMOD_tools/COREMOD_tools.h"
+#include "COREMOD_memory/COREMOD_memory.h"
+#include "CommandLineInterface/CLIcore.h"
 
 #include "imdisplay3d.h"
 #include "mvprocCPUset.h"
 #include "statusstat.h"
 
-
-
 INIT_MODULE_LIB(COREMOD_tools)
 
-
-
 static errno_t init_module_CLI()
 {
-	mvprocTset_addCLIcmd();
-	mvprocTsetExt_addCLIcmd();
-	mvprocCPUset_addCLIcmd();
-	mvprocCPUsetExt_addCLIcmd();
-	fileutils_addCLIcmd();
-	imdisplay3d_addCLIcmd();
-	statusstat_addCLIcmd();
+    mvprocTset_addCLIcmd();
+    mvprocTsetExt_addCLIcmd();
+    mvprocCPUset_addCLIcmd();
+    mvprocCPUsetExt_addCLIcmd();
+    fileutils_addCLIcmd();
+    imdisplay3d_addCLIcmd();
+    statusstat_addCLIcmd();
 
     return RETURN_SUCCESS;
 }
-
-
diff --git a/src/COREMOD_tools/COREMOD_tools.h b/src/COREMOD_tools/COREMOD_tools.h
index c081b694..c1f91a05 100644
--- a/src/COREMOD_tools/COREMOD_tools.h
+++ b/src/COREMOD_tools/COREMOD_tools.h
@@ -1,56 +1,13 @@
 #ifndef _TOOLS_H
 #define _TOOLS_H
 
-
 #include "COREMOD_tools/fileutils.h"
 #include "COREMOD_tools/imdisplay3d.h"
-#include "COREMOD_tools/logfunc.h"
 #include "COREMOD_tools/linregress.h"
+#include "COREMOD_tools/logfunc.h"
 #include "COREMOD_tools/mvprocCPUset.h"
 #include "COREMOD_tools/quicksort.h"
 #include "COREMOD_tools/statusstat.h"
 #include "COREMOD_tools/stringutils.h"
 
-
-
 #endif
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/COREMOD_tools/README.md b/src/COREMOD_tools/README.md
index 172cde78..42f40bec 100644
--- a/src/COREMOD_tools/README.md
+++ b/src/COREMOD_tools/README.md
@@ -3,4 +3,3 @@
 # Module COREMOD_tools {#page_module_COREMOD_tools}
 
 Misc tools
-
diff --git a/src/COREMOD_tools/fileutils.c b/src/COREMOD_tools/fileutils.c
index fc679eac..ca4870b7 100644
--- a/src/COREMOD_tools/fileutils.c
+++ b/src/COREMOD_tools/fileutils.c
@@ -2,34 +2,22 @@
  * @file fileutils.c
  */
 
-
 #include <stdio.h>
 #include <stdlib.h>
-#include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/types.h>
 #include <unistd.h>
 
-
-#include "CommandLineInterface/CLIcore.h"
 #include "COREMOD_memory/COREMOD_memory.h"
-
-
+#include "CommandLineInterface/CLIcore.h"
 
 #define SBUFFERSIZE 1000
 
-
-
-
-
 // ==========================================
 // Forward declaration(s)
 // ==========================================
 
-errno_t write_float_file(
-    const char *fname,
-    float       value
-);
-
+errno_t write_float_file(const char *fname, float value);
 
 // ==========================================
 // Command line interface wrapper function(s)
@@ -37,14 +25,9 @@ errno_t write_float_file(
 
 static errno_t write_flot_file_cli()
 {
-    if(0
-            + CLI_checkarg(1, CLIARG_STR_NOT_IMG)
-            + CLI_checkarg(2, CLIARG_FLOAT)
-            == 0)
+    if (0 + CLI_checkarg(1, CLIARG_STR_NOT_IMG) + CLI_checkarg(2, CLIARG_FLOAT) == 0)
     {
-        write_float_file(
-            data.cmdargtoken[1].val.string,
-            data.cmdargtoken[2].val.numf);
+        write_float_file(data.cmdargtoken[1].val.string, data.cmdargtoken[2].val.numf);
 
         return CLICMD_SUCCESS;
     }
@@ -54,78 +37,47 @@ static errno_t write_flot_file_cli()
     }
 }
 
-
-
 // ==========================================
 // Register CLI command(s)
 // ==========================================
 
 errno_t fileutils_addCLIcmd()
 {
-    RegisterCLIcommand(
-        "writef2file",
-        __FILE__,
-        write_flot_file_cli,
-        "write float to file",
-        "<filename> <float variable>",
-        "writef2file val.txt a",
-        "int write_float_file(const char *fname, float value)");
+    RegisterCLIcommand("writef2file", __FILE__, write_flot_file_cli, "write float to file",
+                       "<filename> <float variable>", "writef2file val.txt a",
+                       "int write_float_file(const char *fname, float value)");
 
     return RETURN_SUCCESS;
 }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 int file_exist(char *filename)
 {
-    struct stat   buffer;
+    struct stat buffer;
     return (stat(filename, &buffer) == 0);
 }
 
-
-int create_counter_file(
-    const char *fname,
-    unsigned long NBpts
-)
+int create_counter_file(const char *fname, unsigned long NBpts)
 {
     unsigned long i;
     FILE *fp;
 
-    if((fp = fopen(fname, "w")) == NULL)
+    if ((fp = fopen(fname, "w")) == NULL)
     {
         PRINT_ERROR("cannot create file \"%s\"", fname);
         abort();
     }
 
-    for(i = 0; i < NBpts; i++)
+    for (i = 0; i < NBpts; i++)
     {
         fprintf(fp, "%ld %f\n", i, (double)(1.0 * i / NBpts));
     }
 
     fclose(fp);
 
-    return(0);
+    return (0);
 }
 
-
-
-int read_config_parameter_exists(
-    const char *config_file,
-    const char *keyword
-)
+int read_config_parameter_exists(const char *config_file, const char *keyword)
 {
     FILE *fp;
     char line[1000];
@@ -133,39 +85,31 @@ int read_config_parameter_exists(
     int read;
 
     read = 0;
-    if((fp = fopen(config_file, "r")) == NULL)
+    if ((fp = fopen(config_file, "r")) == NULL)
     {
         PRINT_ERROR("cannot open file \"%s\"", config_file);
         abort();
     }
 
-    while((fgets(line, 1000, fp) != NULL) && (read == 0))
+    while ((fgets(line, 1000, fp) != NULL) && (read == 0))
     {
         sscanf(line, " %20s", keyw);
-        if(strcmp(keyw, keyword) == 0)
+        if (strcmp(keyw, keyword) == 0)
         {
             read = 1;
         }
     }
-    if(read == 0)
+    if (read == 0)
     {
-        PRINT_WARNING("parameter \"%s\" does not exist in file \"%s\"", keyword,
-                      config_file);
+        PRINT_WARNING("parameter \"%s\" does not exist in file \"%s\"", keyword, config_file);
     }
 
     fclose(fp);
 
-    return(read);
+    return (read);
 }
 
-
-
-
-int read_config_parameter(
-    const char *config_file,
-    const char *keyword,
-    char *content
-)
+int read_config_parameter(const char *config_file, const char *keyword, char *content)
 {
     FILE *fp;
     char line[1000];
@@ -174,39 +118,35 @@ int read_config_parameter(
     int read;
 
     read = 0;
-    if((fp = fopen(config_file, "r")) == NULL)
+    if ((fp = fopen(config_file, "r")) == NULL)
     {
         PRINT_ERROR("cannot open file \"%s\"", config_file);
         abort();
     }
 
     strcpy(content, "---");
-    while(fgets(line, 1000, fp) != NULL)
+    while (fgets(line, 1000, fp) != NULL)
     {
         sscanf(line, "%100s %100s", keyw, cont);
-        if(strcmp(keyw, keyword) == 0)
+        if (strcmp(keyw, keyword) == 0)
         {
             strcpy(content, cont);
             read = 1;
         }
         /*      printf("KEYWORD : \"%s\"   CONTENT : \"%s\"\n",keyw,cont);*/
     }
-    if(read == 0)
+    if (read == 0)
     {
-        PRINT_ERROR("parameter \"%s\" does not exist in file \"%s\"", keyword,
-                config_file);
+        PRINT_ERROR("parameter \"%s\" does not exist in file \"%s\"", keyword, config_file);
         sprintf(content, "-");
         //  exit(0);
     }
 
     fclose(fp);
 
-    return(read);
+    return (read);
 }
 
-
-
-
 float read_config_parameter_float(const char *config_file, const char *keyword)
 {
     float value;
@@ -217,7 +157,7 @@ float read_config_parameter_float(const char *config_file, const char *keyword)
     value = atof(content);
     //printf("Value = %g\n",value);
 
-    return(value);
+    return (value);
 }
 
 long read_config_parameter_long(const char *config_file, const char *keyword)
@@ -228,11 +168,9 @@ long read_config_parameter_long(const char *config_file, const char *keyword)
     read_config_parameter(config_file, keyword, content);
     value = atol(content);
 
-    return(value);
+    return (value);
 }
 
-
-
 int read_config_parameter_int(const char *config_file, const char *keyword)
 {
     int value;
@@ -241,76 +179,65 @@ int read_config_parameter_int(const char *config_file, const char *keyword)
     read_config_parameter(config_file, keyword, content);
     value = atoi(content);
 
-    return(value);
+    return (value);
 }
 
-
-
-
-
 long file_number_lines(const char *file_name)
 {
     long cnt;
     int c;
     FILE *fp;
 
-    if((fp = fopen(file_name, "r")) == NULL)
+    if ((fp = fopen(file_name, "r")) == NULL)
     {
         PRINT_ERROR("cannot open file \"%s\"", file_name);
         abort();
     }
 
     cnt = 0;
-    while((c = fgetc(fp)) != EOF)
-        if(c == '\n')
+    while ((c = fgetc(fp)) != EOF)
+        if (c == '\n')
         {
             cnt++;
         }
     fclose(fp);
 
-    return(cnt);
+    return (cnt);
 }
 
-
 FILE *open_file_w(const char *filename)
 {
     FILE *fp;
 
-    if((fp = fopen(filename, "w")) == NULL)
+    if ((fp = fopen(filename, "w")) == NULL)
     {
         PRINT_ERROR("cannot create file \"%s\"", filename);
         abort();
     }
 
-    return(fp);
+    return (fp);
 }
 
-
 FILE *open_file_r(const char *filename)
 {
     FILE *fp;
 
-    if((fp = fopen(filename, "r")) == NULL)
+    if ((fp = fopen(filename, "r")) == NULL)
     {
         PRINT_ERROR("cannot read file \"%s\"", filename);
         abort();
     }
 
-    return(fp);
+    return (fp);
 }
 
-
-errno_t write_1D_array(
-    double *array,
-    long nbpoints,
-    const char *filename
-)
+errno_t write_1D_array(double *array, long nbpoints, const char *filename)
 {
     FILE *fp;
     long ii;
 
     fp = open_file_w(filename);
-    for(ii = 0; ii < nbpoints; ii++)
+    for (ii = 0; ii < nbpoints; ii++)
     {
         fprintf(fp, "%ld\t%f\n", ii, array[ii]);
     }
@@ -319,22 +246,16 @@ errno_t write_1D_array(
     return RETURN_SUCCESS;
 }
 
-
-
-errno_t read_1D_array(
-    double *array,
-    long nbpoints,
-    const char *filename
-)
+errno_t read_1D_array(double *array, long nbpoints, const char *filename)
 {
     FILE *fp;
     long ii;
     long tmpl;
 
     fp = open_file_r(filename);
-    for(ii = 0; ii < nbpoints; ii++)
+    for (ii = 0; ii < nbpoints; ii++)
     {
-        if(fscanf(fp, "%ld\t%lf\n", &tmpl, &array[ii]) != 2)
+        if (fscanf(fp, "%ld\t%lf\n", &tmpl, &array[ii]) != 2)
         {
             PRINT_ERROR("fscanf error");
             exit(0);
@@ -345,22 +266,18 @@ errno_t read_1D_array(
     return RETURN_SUCCESS;
 }
 
-
-
-int read_int_file(
-    const char *fname
-)
+int read_int_file(const char *fname)
 {
     int value;
     FILE *fp;
 
-    if((fp = fopen(fname, "r")) == NULL)
+    if ((fp = fopen(fname, "r")) == NULL)
     {
         value = 0;
     }
     else
     {
-        if(fscanf(fp, "%d", &value) != 1)
+        if (fscanf(fp, "%d", &value) != 1)
         {
             PRINT_ERROR("fscanf error");
             exit(0);
@@ -368,20 +285,14 @@ int read_int_file(
         fclose(fp);
     }
 
-    return(value);
+    return (value);
 }
 
-
-
-
-errno_t write_int_file(
-    const char *fname,
-    int         value
-)
+errno_t write_int_file(const char *fname, int value)
 {
     FILE *fp;
 
-    if((fp = fopen(fname, "w")) == NULL)
+    if ((fp = fopen(fname, "w")) == NULL)
     {
         PRINT_ERROR("cannot create file \"%s\"\n", fname);
         abort();
@@ -393,24 +304,19 @@ errno_t write_int_file(
     return RETURN_SUCCESS;
 }
 
-
-
-errno_t write_float_file(
-    const char *fname,
-    float       value
-)
+errno_t write_float_file(const char *fname, float value)
 {
     FILE *fp;
     int mode = 0; // default, create single file
 
-    if(variable_ID("WRITE2FILE_APPEND") != -1)
+    if (variable_ID("WRITE2FILE_APPEND") != -1)
     {
         mode = 1;
     }
 
-    if(mode == 0)
+    if (mode == 0)
     {
-        if((fp = fopen(fname, "w")) == NULL)
+        if ((fp = fopen(fname, "w")) == NULL)
         {
             PRINT_ERROR("cannot create file \"%s\"\n", fname);
             abort();
@@ -419,9 +325,9 @@ errno_t write_float_file(
         fclose(fp);
     }
 
-    if(mode == 1)
+    if (mode == 1)
     {
-        if((fp = fopen(fname, "a")) == NULL)
+        if ((fp = fopen(fname, "a")) == NULL)
         {
             PRINT_ERROR("cannot create file \"%s\"\n", fname);
             abort();
diff --git a/src/COREMOD_tools/fileutils.h b/src/COREMOD_tools/fileutils.h
index d8a3f35d..0140dd48 100644
--- a/src/COREMOD_tools/fileutils.h
+++ b/src/COREMOD_tools/fileutils.h
@@ -2,20 +2,16 @@
  * @file fileutils.h
  */
 
-
 #ifndef _COREMOD_TOOLS_FILEUTILS_H
 #define _COREMOD_TOOLS_FILEUTILS_H
 
 errno_t fileutils_addCLIcmd();
 
-
 int create_counter_file(const char *fname, unsigned long NBpts);
 
-
 int read_config_parameter_exists(const char *config_file, const char *keyword);
 
-int read_config_parameter(const char *config_file, const char *keyword,
-                          char *content);
+int read_config_parameter(const char *config_file, const char *keyword, char *content);
 
 float read_config_parameter_float(const char *config_file, const char *keyword);
 
@@ -29,35 +25,14 @@ FILE *open_file_w(const char *filename);
 
 FILE *open_file_r(const char *filename);
 
+errno_t write_1D_array(double *array, long nbpoints, const char *filename);
 
-errno_t write_1D_array(
-    double *array,
-    long nbpoints,
-    const char *filename
-);
-
-
-errno_t read_1D_array(
-    double *array,
-    long nbpoints,
-    const char *filename
-);
-
-
-
-int read_int_file(
-    const char *fname
-);
+errno_t read_1D_array(double *array, long nbpoints, const char *filename);
 
-errno_t write_int_file(
-    const char *fname,
-    int         value
-);
+int read_int_file(const char *fname);
 
+errno_t write_int_file(const char *fname, int value);
 
-errno_t write_float_file(
-    const char *fname,
-    float       value
-);
+errno_t write_float_file(const char *fname, float value);
 
 #endif
diff --git a/src/COREMOD_tools/imdisplay3d.c b/src/COREMOD_tools/imdisplay3d.c
index 6e276b2a..93f84566 100644
--- a/src/COREMOD_tools/imdisplay3d.c
+++ b/src/COREMOD_tools/imdisplay3d.c
@@ -2,40 +2,26 @@
  * @file imdisplay3d.c
  */
 
-
-
-#include "CommandLineInterface/CLIcore.h"
 #include "COREMOD_memory/COREMOD_memory.h"
-
+#include "CommandLineInterface/CLIcore.h"
 
 static FILE *fpgnuplot;
 
-
 // ==========================================
 // Forward declaration(s)
 // ==========================================
 
-errno_t COREMOD_TOOLS_imgdisplay3D(
-    const char *IDname,
-    long        step
-);
-
+errno_t COREMOD_TOOLS_imgdisplay3D(const char *IDname, long step);
 
 // ==========================================
 // Command line interface wrapper function(s)
 // ==========================================
 
-
 errno_t COREMOD_TOOLS_imgdisplay3D_cli()
 {
-    if(0
-            + CLI_checkarg(1, CLIARG_IMG)
-            + CLI_checkarg(2, CLIARG_LONG)
-            == 0)
+    if (0 + CLI_checkarg(1, CLIARG_IMG) + CLI_checkarg(2, CLIARG_LONG) == 0)
     {
-        COREMOD_TOOLS_imgdisplay3D(
-            data.cmdargtoken[1].val.string,
-            data.cmdargtoken[2].val.numl);
+        COREMOD_TOOLS_imgdisplay3D(data.cmdargtoken[1].val.string, data.cmdargtoken[2].val.numl);
 
         return CLICMD_SUCCESS;
     }
@@ -45,40 +31,22 @@ errno_t COREMOD_TOOLS_imgdisplay3D_cli()
     }
 }
 
-
-
 // ==========================================
 // Register CLI command(s)
 // ==========================================
 
 errno_t imdisplay3d_addCLIcmd()
 {
-    RegisterCLIcommand(
-        "dispim3d",
-        __FILE__,
-        COREMOD_TOOLS_imgdisplay3D_cli,
-        "display 2D image as 3D surface using gnuplot",
-        "<imname> <step>",
-        "dispim3d im1 5",
-        "int COREMOD_TOOLS_imgdisplay3D(const char *IDname, long step)");
+    RegisterCLIcommand("dispim3d", __FILE__, COREMOD_TOOLS_imgdisplay3D_cli,
+                       "display 2D image as 3D surface using gnuplot", "<imname> <step>", "dispim3d im1 5",
+                       "int COREMOD_TOOLS_imgdisplay3D(const char *IDname, long step)");
 
     return RETURN_SUCCESS;
 }
 
-
-
-
-
-
-
-
-
 // displays 2D image in 3D using gnuplot
 //
-errno_t COREMOD_TOOLS_imgdisplay3D(
-    const char *IDname,
-    long        step
-)
+errno_t COREMOD_TOOLS_imgdisplay3D(const char *IDname, long step)
 {
     imageID ID;
     long xsize, ysize;
@@ -92,7 +60,7 @@ errno_t COREMOD_TOOLS_imgdisplay3D(
 
     snprintf(cmd, 512, "gnuplot");
 
-    if((fpgnuplot = popen(cmd, "w")) == NULL)
+    if ((fpgnuplot = popen(cmd, "w")) == NULL)
     {
         fprintf(stderr, "could not connect to gnuplot\n");
         return -1;
@@ -111,12 +79,11 @@ errno_t COREMOD_TOOLS_imgdisplay3D(
 
     fp = fopen("pts.dat", "w");
     fprintf(fpgnuplot, "splot \"-\" w d notitle\n");
-    for(ii = 0; ii < xsize; ii += step)
+    for (ii = 0; ii < xsize; ii += step)
     {
-        for(jj = 0; jj < xsize; jj += step)
+        for (jj = 0; jj < xsize; jj += step)
         {
-            fprintf(fpgnuplot, "%ld %ld %f\n", ii, jj,
-                    data.image[ID].array.F[jj * xsize + ii]);
+            fprintf(fpgnuplot, "%ld %ld %f\n", ii, jj, data.image[ID].array.F[jj * xsize + ii]);
             fprintf(fp, "%ld %ld %f\n", ii, jj, data.image[ID].array.F[jj * xsize + ii]);
         }
         fprintf(fpgnuplot, "\n");
@@ -126,7 +93,5 @@ errno_t COREMOD_TOOLS_imgdisplay3D(
     fflush(fpgnuplot);
     fclose(fp);
 
-
     return RETURN_SUCCESS;
 }
-
diff --git a/src/COREMOD_tools/imdisplay3d.h b/src/COREMOD_tools/imdisplay3d.h
index e36ccf8e..04aa7254 100644
--- a/src/COREMOD_tools/imdisplay3d.h
+++ b/src/COREMOD_tools/imdisplay3d.h
@@ -1,10 +1,7 @@
 /**
  * @file imdisplay3d.h
  */
- 
+
 errno_t imdisplay3d_addCLIcmd();
- 
-errno_t COREMOD_TOOLS_imgdisplay3D(
-    const char *IDname,
-    long        step
-);
+
+errno_t COREMOD_TOOLS_imgdisplay3D(const char *IDname, long step);
diff --git a/src/COREMOD_tools/linregress.c b/src/COREMOD_tools/linregress.c
index d26b3612..7f9c5232 100644
--- a/src/COREMOD_tools/linregress.c
+++ b/src/COREMOD_tools/linregress.c
@@ -1,18 +1,9 @@
 /** @file linregress.c
  */
 
-
 #include "CommandLineInterface/CLIcore.h"
 
-errno_t lin_regress(
-    double *a,
-    double *b,
-    double *Xi2,
-    double *x,
-    double *y,
-    double *sig,
-    unsigned int nb_points
-)
+errno_t lin_regress(double *a, double *b, double *Xi2, double *x, double *y, double *sig, unsigned int nb_points)
 {
     double S, Sx, Sy, Sxx, Sxy, Syy;
     unsigned int i;
@@ -25,7 +16,7 @@ errno_t lin_regress(
     Syy = 0;
     Sxy = 0;
 
-    for(i = 0; i < nb_points; i++)
+    for (i = 0; i < nb_points; i++)
     {
         S += 1.0 / sig[i] / sig[i];
         Sx += x[i] / sig[i] / sig[i];
@@ -38,10 +29,7 @@ errno_t lin_regress(
     delta = S * Sxx - Sx * Sx;
     *a = (Sxx * Sy - Sx * Sxy) / delta;
     *b = (S * Sxy - Sx * Sy) / delta;
-    *Xi2 = Syy - 2 * (*a) * Sy - 2 * (*a) * (*b) * Sx + (*a) * (*a) * S + 2 *
-           (*a) * (*b) * Sx - (*b) * (*b) * Sxx;
+    *Xi2 = Syy - 2 * (*a) * Sy - 2 * (*a) * (*b) * Sx + (*a) * (*a) * S + 2 * (*a) * (*b) * Sx - (*b) * (*b) * Sxx;
 
     return RETURN_SUCCESS;
 }
-
-
diff --git a/src/COREMOD_tools/linregress.h b/src/COREMOD_tools/linregress.h
index e851c9bf..32a5e63f 100644
--- a/src/COREMOD_tools/linregress.h
+++ b/src/COREMOD_tools/linregress.h
@@ -1,14 +1,4 @@
 /** @file linregress.h
  */
 
-
-
-errno_t lin_regress(
-    double *a,
-    double *b,
-    double *Xi2,
-    double *x,
-    double *y,
-    double *sig,
-    unsigned int nb_points
-);
+errno_t lin_regress(double *a, double *b, double *Xi2, double *x, double *y, double *sig, unsigned int nb_points);
diff --git a/src/COREMOD_tools/logfunc.c b/src/COREMOD_tools/logfunc.c
index 34ee9443..6c0f39b9 100644
--- a/src/COREMOD_tools/logfunc.c
+++ b/src/COREMOD_tools/logfunc.c
@@ -2,15 +2,12 @@
  * @file logfunc.c
  */
 
-
 #include <stdio.h>
-#include <time.h>
-#include <sys/types.h>
 #include <sys/syscall.h>
+#include <sys/types.h>
+#include <time.h>
 #include <unistd.h>
 
-
-
 /**
  * ## Purpose
  *
@@ -74,15 +71,9 @@
  * @warning May slow down code. Only use for debugging. Output file may grow very quickly.
  */
 
-void CORE_logFunctionCall(
-    const int funclevel,
-    const int loglevel,
-    const int logfuncMODE,
-    __attribute__((unused)) const char *FileName,
-    const char *FunctionName,
-    const long line,
-    char *comments
-)
+void CORE_logFunctionCall(const int funclevel, const int loglevel, const int logfuncMODE,
+                          __attribute__((unused)) const char *FileName, const char *FunctionName, const long line,
+                          char *comments)
 {
     time_t tnow;
     struct timespec timenow;
@@ -91,11 +82,11 @@ void CORE_logFunctionCall(
 
     modechar = '?';
 
-    if(logfuncMODE == 0)
+    if (logfuncMODE == 0)
     {
         modechar = '>';
     }
-    else if(logfuncMODE == 1)
+    else if (logfuncMODE == 1)
     {
         modechar = '<';
     }
@@ -104,13 +95,12 @@ void CORE_logFunctionCall(
         modechar = '?';
     }
 
-    if(funclevel <= loglevel)
+    if (funclevel <= loglevel)
     {
-        char  fname[500];
+        char fname[500];
 
         FILE *fp;
 
-
         sprintf(fname, ".%s.funccalls.log", FunctionName);
 
         struct tm *uttime;
@@ -122,16 +112,8 @@ void CORE_logFunctionCall(
         // add custom parameter into string (optional)
 
         fp = fopen(fname, "a");
-        fprintf(fp, "%02d:%02d:%02ld.%09ld  %10d  %10d  %c %40s %6ld   %s\n",
-                uttime->tm_hour, uttime->tm_min, timenow.tv_sec % 60, timenow.tv_nsec,
-                getpid(), (int) tid,
-                modechar, FunctionName, line, comments);
+        fprintf(fp, "%02d:%02d:%02ld.%09ld  %10d  %10d  %c %40s %6ld   %s\n", uttime->tm_hour, uttime->tm_min,
+                timenow.tv_sec % 60, timenow.tv_nsec, getpid(), (int)tid, modechar, FunctionName, line, comments);
         fclose(fp);
     }
-
-
 }
-
-
-
-
diff --git a/src/COREMOD_tools/logfunc.h b/src/COREMOD_tools/logfunc.h
index 961190a5..02751826 100644
--- a/src/COREMOD_tools/logfunc.h
+++ b/src/COREMOD_tools/logfunc.h
@@ -2,12 +2,5 @@
  * @file logfunc.h
  */
 
-void CORE_logFunctionCall(
-    const int funclevel,
-    const int loglevel,
-    const int logfuncMODE,
-    const char *FileName,
-    const char *FunctionName,
-    const long line,
-    char *comments
-);
+void CORE_logFunctionCall(const int funclevel, const int loglevel, const int logfuncMODE, const char *FileName,
+                          const char *FunctionName, const long line, char *comments);
diff --git a/src/COREMOD_tools/mvprocCPUset.c b/src/COREMOD_tools/mvprocCPUset.c
index 8abd4738..c7733e2d 100644
--- a/src/COREMOD_tools/mvprocCPUset.c
+++ b/src/COREMOD_tools/mvprocCPUset.c
@@ -24,8 +24,7 @@ errno_t COREMOD_TOOLS_mvProcTset_cli()
 {
     if (0 + CLI_checkarg(1, CLIARG_STR_NOT_IMG) == 0)
     {
-        COREMOD_TOOLS_mvProcTset(
-            data.cmdargtoken[1].val.string);
+        COREMOD_TOOLS_mvProcTset(data.cmdargtoken[1].val.string);
 
         return CLICMD_SUCCESS;
     }
@@ -38,11 +37,10 @@ errno_t COREMOD_TOOLS_mvProcTset_cli()
 errno_t COREMOD_TOOLS_mvProcTsetExt_cli()
 {
     if (0 + CLI_checkarg(1, CLIARG_LONG) + CLI_checkarg(2, CLIARG_STR_NOT_IMG) == 0)
-        {
-            COREMOD_TOOLS_mvProcTsetExt(data.cmdargtoken[1].val.numl,
-                                        data.cmdargtoken[2].val.string);
-            return CLICMD_SUCCESS;
-        }
+    {
+        COREMOD_TOOLS_mvProcTsetExt(data.cmdargtoken[1].val.numl, data.cmdargtoken[2].val.string);
+        return CLICMD_SUCCESS;
+    }
     else
     {
         return CLICMD_INVALID_ARG;
@@ -53,8 +51,7 @@ errno_t COREMOD_TOOLS_mvProcCPUset_cli()
 {
     if (0 + CLI_checkarg(1, CLIARG_STR_NOT_IMG) == 0)
     {
-        COREMOD_TOOLS_mvProcCPUset(
-            data.cmdargtoken[1].val.string);
+        COREMOD_TOOLS_mvProcCPUset(data.cmdargtoken[1].val.string);
 
         return CLICMD_SUCCESS;
     }
@@ -68,8 +65,7 @@ errno_t COREMOD_TOOLS_mvProcCPUsetExt_cli()
 {
     if (0 + CLI_checkarg(1, CLIARG_LONG) + CLI_checkarg(2, CLIARG_STR_NOT_IMG) + CLI_checkarg(3, CLIARG_LONG) == 0)
     {
-        COREMOD_TOOLS_mvProcCPUsetExt(data.cmdargtoken[1].val.numl,
-                                      data.cmdargtoken[2].val.string,
+        COREMOD_TOOLS_mvProcCPUsetExt(data.cmdargtoken[1].val.numl, data.cmdargtoken[2].val.string,
                                       data.cmdargtoken[3].val.numl);
         return CLICMD_SUCCESS;
     }
@@ -85,56 +81,36 @@ errno_t COREMOD_TOOLS_mvProcCPUsetExt_cli()
 
 errno_t mvprocTset_addCLIcmd()
 {
-    RegisterCLIcommand(
-        "tsetpmove",
-        __FILE__,
-        COREMOD_TOOLS_mvProcTset_cli,
-        "Assign taskset to current process",
-        "<taskset spec list>",
-        "tsetpmove realtime",
-        "int COREMOD_TOOLS_mvProcTset(const char *tsetspec)");
+    RegisterCLIcommand("tsetpmove", __FILE__, COREMOD_TOOLS_mvProcTset_cli, "Assign taskset to current process",
+                       "<taskset spec list>", "tsetpmove realtime",
+                       "int COREMOD_TOOLS_mvProcTset(const char *tsetspec)");
 
     return RETURN_SUCCESS;
 }
 
 errno_t mvprocTsetExt_addCLIcmd()
 {
-    RegisterCLIcommand(
-        "tsetpmoveext",
-        __FILE__,
-        COREMOD_TOOLS_mvProcTsetExt_cli,
-        "Assign taskset for any process",
-        "<PID> <taskset spec list>",
-        "tsetpmoveext 33659 1-5",
-        "int COREMOD_TOOLS_mvProcTsetExt(const int pid, const char *tsetspec)");
+    RegisterCLIcommand("tsetpmoveext", __FILE__, COREMOD_TOOLS_mvProcTsetExt_cli, "Assign taskset for any process",
+                       "<PID> <taskset spec list>", "tsetpmoveext 33659 1-5",
+                       "int COREMOD_TOOLS_mvProcTsetExt(const int pid, const char *tsetspec)");
 
     return RETURN_SUCCESS;
 }
 
 errno_t mvprocCPUset_addCLIcmd()
 {
-    RegisterCLIcommand(
-        "csetpmove",
-        __FILE__,
-        COREMOD_TOOLS_mvProcCPUset_cli,
-        "move current process to CPU set",
-        "<CPU set name>",
-        "csetpmove realtime",
-        "int COREMOD_TOOLS_mvProcCPUset(const char *csetname)");
+    RegisterCLIcommand("csetpmove", __FILE__, COREMOD_TOOLS_mvProcCPUset_cli, "move current process to CPU set",
+                       "<CPU set name>", "csetpmove realtime", "int COREMOD_TOOLS_mvProcCPUset(const char *csetname)");
 
     return RETURN_SUCCESS;
 }
 
 errno_t mvprocCPUsetExt_addCLIcmd()
 {
-    RegisterCLIcommand(
-        "csetandprioext",
-        __FILE__,
-        COREMOD_TOOLS_mvProcCPUsetExt_cli,
-        "move any PID to CPU set and assign RT priority (SCHED_FIFO) - priority ignored if 0",
-        "<PID> <CPU set name> <RT priority>",
-        "csetandprioext 23445 ircam0_edt 80",
-        "int COREMOD_TOOLS_mvProcCPUsetExt(const int pid, const char *csetname, const int rtprio)");
+    RegisterCLIcommand("csetandprioext", __FILE__, COREMOD_TOOLS_mvProcCPUsetExt_cli,
+                       "move any PID to CPU set and assign RT priority (SCHED_FIFO) - priority ignored if 0",
+                       "<PID> <CPU set name> <RT priority>", "csetandprioext 23445 ircam0_edt 80",
+                       "int COREMOD_TOOLS_mvProcCPUsetExt(const int pid, const char *csetname, const int rtprio)");
 
     return RETURN_SUCCESS;
 }
@@ -207,4 +183,4 @@ int COREMOD_TOOLS_mvProcCPUsetExt(const int pid, const char *csetname, const int
     }
 
     return (0);
-}
\ No newline at end of file
+}
diff --git a/src/COREMOD_tools/quicksort.c b/src/COREMOD_tools/quicksort.c
index b5657fe1..1be1c688 100644
--- a/src/COREMOD_tools/quicksort.c
+++ b/src/COREMOD_tools/quicksort.c
@@ -2,36 +2,24 @@
  * @file quicksort.c
  */
 
-
-
-
-int bubble_sort(
-    double *array,
-    unsigned long count
-)
+int bubble_sort(double *array, unsigned long count)
 {
     unsigned long a, b;
     double t;
 
-    for(a = 1; a < count; a++)
-        for(b = count - 1; b >= a; b--)
-            if(array[b - 1] > array[b])
+    for (a = 1; a < count; a++)
+        for (b = count - 1; b >= a; b--)
+            if (array[b - 1] > array[b])
             {
                 t = array[b - 1];
                 array[b - 1] = array[b];
                 array[b] = t;
             }
 
-    return(0);
+    return (0);
 }
 
-
-
-void qs_float(
-    float *array,
-    unsigned long left, 
-    unsigned long right
-)
+void qs_float(float *array, unsigned long left, unsigned long right)
 {
     unsigned long i, j;
     float x, y;
@@ -40,50 +28,41 @@ void qs_float(
     j = right;
     x = array[(left + right) / 2];
 
-
     do
     {
-        while(array[i] < x && i < right)
+        while (array[i] < x && i < right)
         {
             i++;
         }
-        while(x < array[j] && j > left && j > 0)
+        while (x < array[j] && j > left && j > 0)
         {
             j--;
         }
 
-        if(i <= j)
+        if (i <= j)
         {
             y = array[i];
             array[i] = array[j];
             array[j] = y;
             i++;
-            if(j > 0)
+            if (j > 0)
             {
                 j--;
             }
         }
-    }
-    while(i <= j);
+    } while (i <= j);
 
-    if(left < j)
+    if (left < j)
     {
         qs_float(array, left, j);
     }
-    if(i < right)
+    if (i < right)
     {
         qs_float(array, i, right);
     }
 }
 
-
-
-
-void qs_long(
-    long *array,
-    unsigned long left,
-    unsigned long right
-)
+void qs_long(long *array, unsigned long left, unsigned long right)
 {
     register unsigned long i, j;
     long x, y;
@@ -94,45 +73,39 @@ void qs_long(
 
     do
     {
-        while(array[i] < x && i < right)
+        while (array[i] < x && i < right)
         {
             i++;
         }
-        while(x < array[j] && j > left && j > 0)
+        while (x < array[j] && j > left && j > 0)
         {
             j--;
         }
 
-        if(i <= j)
+        if (i <= j)
         {
             y = array[i];
             array[i] = array[j];
             array[j] = y;
             i++;
-            if(j > 0)
+            if (j > 0)
             {
                 j--;
             }
         }
-    }
-    while(i <= j);
+    } while (i <= j);
 
-    if(left < j)
+    if (left < j)
     {
         qs_long(array, left, j);
     }
-    if(i < right)
+    if (i < right)
     {
         qs_long(array, i, right);
     }
 }
 
-
-void qs_double(
-    double *array,
-    unsigned long left,
-    unsigned long right
-)
+void qs_double(double *array, unsigned long left, unsigned long right)
 {
     register unsigned long i, j;
     double x, y;
@@ -143,47 +116,40 @@ void qs_double(
 
     do
     {
-        while(array[i] < x && i < right)
+        while (array[i] < x && i < right)
         {
             i++;
         }
-        while(x < array[j] && j > left && j > 0)
+        while (x < array[j] && j > left && j > 0)
         {
             j--;
         }
 
-        if(i <= j)
+        if (i <= j)
         {
             y = array[i];
             array[i] = array[j];
             array[j] = y;
             i++;
 
-            if(j > 0)
+            if (j > 0)
             {
                 j--;
             }
         }
-    }
-    while(i <= j);
+    } while (i <= j);
 
-    if(left < j)
+    if (left < j)
     {
         qs_double(array, left, j);
     }
-    if(i < right)
+    if (i < right)
     {
         qs_double(array, i, right);
     }
 }
 
-
-
-void qs_ushort(
-    unsigned short *array,
-    unsigned long left,
-    unsigned long right
-)
+void qs_ushort(unsigned short *array, unsigned long left, unsigned long right)
 {
     register unsigned long i, j;
     unsigned short x, y;
@@ -194,49 +160,40 @@ void qs_ushort(
 
     do
     {
-        while(array[i] < x && i < right)
+        while (array[i] < x && i < right)
         {
             i++;
         }
-        while(x < array[j] && j > left && j > 0)
+        while (x < array[j] && j > left && j > 0)
         {
             j--;
         }
 
-        if(i <= j)
+        if (i <= j)
         {
             y = array[i];
             array[i] = array[j];
             array[j] = y;
             i++;
 
-            if(j > 0)
+            if (j > 0)
             {
                 j--;
             }
         }
-    }
-    while(i <= j);
+    } while (i <= j);
 
-    if(left < j)
+    if (left < j)
     {
         qs_ushort(array, left, j);
     }
-    if(i < right)
+    if (i < right)
     {
         qs_ushort(array, i, right);
     }
 }
 
-
-
-void qs3(
-    double *array,
-    double *array1,
-    double *array2,
-    unsigned long left,
-    unsigned long right
-)
+void qs3(double *array, double *array1, double *array2, unsigned long left, unsigned long right)
 {
     register unsigned long i, j;
     double x, y;
@@ -248,16 +205,16 @@ void qs3(
 
     do
     {
-        while(array[i] < x && i < right)
+        while (array[i] < x && i < right)
         {
             i++;
         }
-        while(x < array[j] && j > left && j > 0)
+        while (x < array[j] && j > left && j > 0)
         {
             j--;
         }
 
-        if(i <= j)
+        if (i <= j)
         {
             y = array[i];
             array[i] = array[j];
@@ -273,33 +230,24 @@ void qs3(
 
             i++;
 
-            if(j > 0)
+            if (j > 0)
             {
                 j--;
             }
         }
-    }
-    while(i <= j);
+    } while (i <= j);
 
-    if(left < j)
+    if (left < j)
     {
         qs3(array, array1, array2, left, j);
     }
-    if(i < right)
+    if (i < right)
     {
         qs3(array, array1, array2, i, right);
     }
 }
 
-
-
-void qs3_float(
-    float *array,
-    float *array1,
-    float *array2,
-    unsigned long left,
-    unsigned long right
-)
+void qs3_float(float *array, float *array1, float *array2, unsigned long left, unsigned long right)
 {
     register unsigned long i, j;
     float x, y;
@@ -311,16 +259,16 @@ void qs3_float(
 
     do
     {
-        while(array[i] < x && i < right)
+        while (array[i] < x && i < right)
         {
             i++;
         }
-        while(x < array[j] && j > left && j > 0)
+        while (x < array[j] && j > left && j > 0)
         {
             j--;
         }
 
-        if(i <= j)
+        if (i <= j)
         {
             y = array[i];
             array[i] = array[j];
@@ -336,33 +284,24 @@ void qs3_float(
 
             i++;
 
-            if(j > 0)
+            if (j > 0)
             {
                 j--;
             }
         }
-    }
-    while(i <= j);
+    } while (i <= j);
 
-    if(left < j)
+    if (left < j)
     {
         qs3_float(array, array1, array2, left, j);
     }
-    if(i < right)
+    if (i < right)
     {
         qs3_float(array, array1, array2, i, right);
     }
 }
 
-
-
-void qs3_double(
-    double *array,
-    double *array1,
-    double *array2,
-    unsigned long left,
-    unsigned long right
-)
+void qs3_double(double *array, double *array1, double *array2, unsigned long left, unsigned long right)
 {
     register unsigned long i, j;
     double x, y;
@@ -374,16 +313,16 @@ void qs3_double(
 
     do
     {
-        while(array[i] < x && i < right)
+        while (array[i] < x && i < right)
         {
             i++;
         }
-        while(x < array[j] && j > left && j > 0)
+        while (x < array[j] && j > left && j > 0)
         {
             j--;
         }
 
-        if(i <= j)
+        if (i <= j)
         {
             y = array[i];
             array[i] = array[j];
@@ -399,32 +338,24 @@ void qs3_double(
 
             i++;
 
-            if(j > 0)
+            if (j > 0)
             {
                 j--;
             }
         }
-    }
-    while(i <= j);
+    } while (i <= j);
 
-    if(left < j)
+    if (left < j)
     {
         qs3_double(array, array1, array2, left, j);
     }
-    if(i < right)
+    if (i < right)
     {
         qs3_double(array, array1, array2, i, right);
     }
 }
 
-
-
-void qs2l(
-    double *array,
-    long *array1,
-    unsigned long left,
-    unsigned long right
-)
+void qs2l(double *array, long *array1, unsigned long left, unsigned long right)
 {
     register unsigned long i, j;
     double x, y;
@@ -436,16 +367,16 @@ void qs2l(
 
     do
     {
-        while(array[i] < x && i < right)
+        while (array[i] < x && i < right)
         {
             i++;
         }
-        while(x < array[j] && j > left && j > 0)
+        while (x < array[j] && j > left && j > 0)
         {
             j--;
         }
 
-        if(i <= j)
+        if (i <= j)
         {
             y = array[i];
             array[i] = array[j];
@@ -457,32 +388,24 @@ void qs2l(
 
             i++;
 
-            if(j > 0)
+            if (j > 0)
             {
                 j--;
             }
         }
-    }
-    while(i <= j);
+    } while (i <= j);
 
-    if(left < j)
+    if (left < j)
     {
         qs2l(array, array1, left, j);
     }
-    if(i < right)
+    if (i < right)
     {
         qs2l(array, array1, i, right);
     }
 }
 
-
-
-void qs2ul(
-    double *array,
-    unsigned long *array1,
-    unsigned long left,
-    unsigned long right
-)
+void qs2ul(double *array, unsigned long *array1, unsigned long left, unsigned long right)
 {
     register unsigned long i, j;
     double x, y;
@@ -494,16 +417,16 @@ void qs2ul(
 
     do
     {
-        while(array[i] < x && i < right)
+        while (array[i] < x && i < right)
         {
             i++;
         }
-        while(x < array[j] && j > left && j > 0)
+        while (x < array[j] && j > left && j > 0)
         {
             j--;
         }
 
-        if(i <= j)
+        if (i <= j)
         {
             y = array[i];
             array[i] = array[j];
@@ -514,31 +437,24 @@ void qs2ul(
             array1[j] = l1;
 
             i++;
-            if(j > 0)
+            if (j > 0)
             {
                 j--;
             }
         }
-    }
-    while(i <= j);
+    } while (i <= j);
 
-    if(left < j)
+    if (left < j)
     {
         qs2ul(array, array1, left, j);
     }
-    if(i < right)
+    if (i < right)
     {
         qs2ul(array, array1, i, right);
     }
 }
 
-
-void qs2l_double(
-    double *array,
-    long *array1,
-    unsigned long left,
-    unsigned long right
-)
+void qs2l_double(double *array, long *array1, unsigned long left, unsigned long right)
 {
     register unsigned long i, j;
     double x, y;
@@ -550,16 +466,16 @@ void qs2l_double(
 
     do
     {
-        while(array[i] < x && i < right)
+        while (array[i] < x && i < right)
         {
             i++;
         }
-        while(x < array[j] && j > left && j > 0)
+        while (x < array[j] && j > left && j > 0)
         {
             j--;
         }
 
-        if(i <= j)
+        if (i <= j)
         {
             y = array[i];
             array[i] = array[j];
@@ -571,31 +487,24 @@ void qs2l_double(
 
             i++;
 
-            if(j > 0)
+            if (j > 0)
             {
                 j--;
             }
         }
-    }
-    while(i <= j);
+    } while (i <= j);
 
-    if(left < j)
+    if (left < j)
     {
         qs2l_double(array, array1, left, j);
     }
-    if(i < right)
+    if (i < right)
     {
         qs2l_double(array, array1, i, right);
     }
 }
 
-
-void qs2ul_double(
-    double *array,
-    unsigned long *array1,
-    unsigned long left,
-    unsigned long right
-)
+void qs2ul_double(double *array, unsigned long *array1, unsigned long left, unsigned long right)
 {
     register unsigned long i, j;
     double x, y;
@@ -607,16 +516,16 @@ void qs2ul_double(
 
     do
     {
-        while(array[i] < x && i < right)
+        while (array[i] < x && i < right)
         {
             i++;
         }
-        while(x < array[j] && j > left && j > 0)
+        while (x < array[j] && j > left && j > 0)
         {
             j--;
         }
 
-        if(i <= j)
+        if (i <= j)
         {
             y = array[i];
             array[i] = array[j];
@@ -628,33 +537,24 @@ void qs2ul_double(
 
             i++;
 
-            if(j > 0)
+            if (j > 0)
             {
                 j--;
             }
         }
-    }
-    while(i <= j);
+    } while (i <= j);
 
-    if(left < j)
+    if (left < j)
     {
         qs2ul_double(array, array1, left, j);
     }
-    if(i < right)
+    if (i < right)
     {
         qs2ul_double(array, array1, i, right);
     }
 }
 
-
-
-void qs3ll_double(
-    double *array,
-    long *array1,
-    long *array2,
-    unsigned long left,
-    unsigned long right
-)
+void qs3ll_double(double *array, long *array1, long *array2, unsigned long left, unsigned long right)
 {
     register unsigned long i, j;
     double x, y;
@@ -666,16 +566,16 @@ void qs3ll_double(
 
     do
     {
-        while(array[i] < x && i < right)
+        while (array[i] < x && i < right)
         {
             i++;
         }
-        while(x < array[j] && j > left && j > 0)
+        while (x < array[j] && j > left && j > 0)
         {
             j--;
         }
 
-        if(i <= j)
+        if (i <= j)
         {
             y = array[i];
             array[i] = array[j];
@@ -690,33 +590,25 @@ void qs3ll_double(
             array2[j] = l2;
 
             i++;
-            if(j > 0)
+            if (j > 0)
             {
                 j--;
             }
         }
-    }
-    while(i <= j);
+    } while (i <= j);
 
-    if(left < j)
+    if (left < j)
     {
         qs3ll_double(array, array1, array2, left, j);
     }
-    if(i < right)
+    if (i < right)
     {
         qs3ll_double(array, array1, array2, i, right);
     }
 }
 
-
-
-void qs3ulul_double(
-    double *array,
-    unsigned long *array1,
-    unsigned long *array2,
-    unsigned long left,
-    unsigned long right
-)
+void qs3ulul_double(double *array, unsigned long *array1, unsigned long *array2, unsigned long left,
+                    unsigned long right)
 {
     register unsigned long i, j;
     double x, y;
@@ -728,16 +620,16 @@ void qs3ulul_double(
 
     do
     {
-        while(array[i] < x && i < right)
+        while (array[i] < x && i < right)
         {
             i++;
         }
-        while(x < array[j] && j > left && j > 0)
+        while (x < array[j] && j > left && j > 0)
         {
             j--;
         }
 
-        if(i <= j)
+        if (i <= j)
         {
             y = array[i];
             array[i] = array[j];
@@ -752,143 +644,64 @@ void qs3ulul_double(
             array2[j] = l2;
 
             i++;
-            if(j > 0)
+            if (j > 0)
             {
                 j--;
             }
         }
-    }
-    while(i <= j);
+    } while (i <= j);
 
-    if(left < j)
+    if (left < j)
     {
         qs3ulul_double(array, array1, array2, left, j);
     }
 
-    if(i < right)
+    if (i < right)
     {
         qs3ulul_double(array, array1, array2, i, right);
     }
 }
 
+void quick_sort_float(float *array, unsigned long count) { qs_float(array, 0, count - 1); }
 
+void quick_sort_long(long *array, unsigned long count) { qs_long(array, 0, count - 1); }
 
+void quick_sort_double(double *array, unsigned long count) { qs_double(array, 0, count - 1); }
 
-void quick_sort_float(
-    float *array,
-    unsigned long count
-)
-{
-    qs_float(array, 0, count - 1);
-}
+void quick_sort_ushort(unsigned short *array, unsigned long count) { qs_ushort(array, 0, count - 1); }
 
-void quick_sort_long(
-    long *array,
-    unsigned long count
-)
-{
-    qs_long(array, 0, count - 1);
-}
-
-void quick_sort_double(
-    double *array,
-    unsigned long count
-)
-{
-    qs_double(array, 0, count - 1);
-}
-
-void quick_sort_ushort(
-    unsigned short *array,
-    unsigned long count
-)
-{
-    qs_ushort(array, 0, count - 1);
-}
-
-void quick_sort3(
-    double *array,
-    double *array1,
-    double *array2,
-    unsigned long count
-)
+void quick_sort3(double *array, double *array1, double *array2, unsigned long count)
 {
     qs3(array, array1, array2, 0, count - 1);
 }
 
-void quick_sort3_float(
-    float *array,
-    float *array1,
-    float *array2,
-    unsigned long count
-)
+void quick_sort3_float(float *array, float *array1, float *array2, unsigned long count)
 {
     qs3_float(array, array1, array2, 0, count - 1);
 }
 
-void quick_sort3_double(
-    double *array,
-    double *array1,
-    double *array2,
-    unsigned long count
-)
+void quick_sort3_double(double *array, double *array1, double *array2, unsigned long count)
 {
     qs3_double(array, array1, array2, 0, count - 1);
 }
 
-void quick_sort2l(
-    double *array,
-    long *array1,
-    unsigned long count
-)
-{
-    qs2l(array, array1, 0, count - 1);
-}
+void quick_sort2l(double *array, long *array1, unsigned long count) { qs2l(array, array1, 0, count - 1); }
 
-void quick_sort2ul(
-    double *array,
-    unsigned long *array1,
-    unsigned long count
-)
-{
-    qs2ul(array, array1, 0, count - 1);
-}
+void quick_sort2ul(double *array, unsigned long *array1, unsigned long count) { qs2ul(array, array1, 0, count - 1); }
 
-void quick_sort2l_double(
-    double *array,
-    long *array1,
-    unsigned long count
-)
-{
-    qs2l_double(array, array1, 0, count - 1);
-}
+void quick_sort2l_double(double *array, long *array1, unsigned long count) { qs2l_double(array, array1, 0, count - 1); }
 
-void quick_sort2ul_double(
-    double *array,
-    unsigned long *array1,
-    unsigned long count
-)
+void quick_sort2ul_double(double *array, unsigned long *array1, unsigned long count)
 {
     qs2ul_double(array, array1, 0, count - 1);
 }
 
-void quick_sort3ll_double(
-    double *array,
-    long *array1,
-    long *array2,
-    unsigned long count
-)
+void quick_sort3ll_double(double *array, long *array1, long *array2, unsigned long count)
 {
     qs3ll_double(array, array1, array2, 0, count - 1);
 }
 
-void quick_sort3ulul_double(
-    double *array,
-    unsigned long *array1,
-    unsigned long *array2,
-    unsigned long count
-)
+void quick_sort3ulul_double(double *array, unsigned long *array1, unsigned long *array2, unsigned long count)
 {
     qs3ulul_double(array, array1, array2, 0, count - 1);
 }
-
diff --git a/src/COREMOD_tools/quicksort.h b/src/COREMOD_tools/quicksort.h
index 54a1e3f0..fcdc1e18 100644
--- a/src/COREMOD_tools/quicksort.h
+++ b/src/COREMOD_tools/quicksort.h
@@ -2,8 +2,6 @@
  * @file quicksort.h
  */
 
-
-
 int bubble_sort(double *array, unsigned long count);
 
 void qs_float(float *array, unsigned long left, unsigned long right);
@@ -16,29 +14,20 @@ void quick_sort_long(long *array, unsigned long count);
 void quick_sort_double(double *array, unsigned long count);
 void quick_sort_ushort(unsigned short *array, unsigned long count);
 
-void qs3(double *array, double *array1, double *array2, unsigned long left,
-         unsigned long right);
+void qs3(double *array, double *array1, double *array2, unsigned long left, unsigned long right);
 
-void qs3_double(double *array, double *array1, double *array2,
-                unsigned long left, unsigned long right);
+void qs3_double(double *array, double *array1, double *array2, unsigned long left, unsigned long right);
 
-void quick_sort3(double *array, double *array1, double *array2,
-                 unsigned long count);
-void quick_sort3_float(float *array, float *array1, float *array2,
-                       unsigned long count);
-void quick_sort3_double(double *array, double *array1, double *array2,
-                        unsigned long count);
+void quick_sort3(double *array, double *array1, double *array2, unsigned long count);
+void quick_sort3_float(float *array, float *array1, float *array2, unsigned long count);
+void quick_sort3_double(double *array, double *array1, double *array2, unsigned long count);
 
 void qs2l(double *array, long *array1, unsigned long left, unsigned long right);
 
 void quick_sort2l(double *array, long *array1, unsigned long count);
 
 void quick_sort2l_double(double *array, long *array1, unsigned long count);
-void quick_sort2ul_double(double *array, unsigned long *array1,
-                          unsigned long count);
-
-void quick_sort3ll_double(double *array, long *array1, long *array2,
-                          unsigned long count);
-void quick_sort3ulul_double(double *array, unsigned long *array1,
-                            unsigned long *array2, unsigned long count);
+void quick_sort2ul_double(double *array, unsigned long *array1, unsigned long count);
 
+void quick_sort3ll_double(double *array, long *array1, long *array2, unsigned long count);
+void quick_sort3ulul_double(double *array, unsigned long *array1, unsigned long *array2, unsigned long count);
diff --git a/src/COREMOD_tools/statusstat.c b/src/COREMOD_tools/statusstat.c
index 52c82368..930c7355 100644
--- a/src/COREMOD_tools/statusstat.c
+++ b/src/COREMOD_tools/statusstat.c
@@ -2,10 +2,8 @@
  * @file statusstat.c
  */
 
-
-#include <time.h>
 #include <sched.h>
-
+#include <time.h>
 
 #include "CommandLineInterface/CLIcore.h"
 
@@ -13,34 +11,21 @@
 
 #include "COREMOD_memory/COREMOD_memory.h"
 
-
-
 // ==========================================
 // Forward declaration(s)
 // ==========================================
 
-imageID COREMOD_TOOLS_statusStat(
-    const char *IDstat_name,
-    long        indexmax
-);
-
-
+imageID COREMOD_TOOLS_statusStat(const char *IDstat_name, long indexmax);
 
 // ==========================================
 // Command line interface wrapper function(s)
 // ==========================================
 
-
 errno_t COREMOD_TOOLS_statusStat_cli()
 {
-    if(0
-            + CLI_checkarg(1, CLIARG_IMG)
-            + CLI_checkarg(2, CLIARG_LONG)
-            == 0)
+    if (0 + CLI_checkarg(1, CLIARG_IMG) + CLI_checkarg(2, CLIARG_LONG) == 0)
     {
-        COREMOD_TOOLS_statusStat(
-            data.cmdargtoken[1].val.string,
-            data.cmdargtoken[2].val.numl);
+        COREMOD_TOOLS_statusStat(data.cmdargtoken[1].val.string, data.cmdargtoken[2].val.numl);
 
         return CLICMD_SUCCESS;
     }
@@ -50,8 +35,6 @@ errno_t COREMOD_TOOLS_statusStat_cli()
     }
 }
 
-
-
 // ==========================================
 // Register CLI command(s)
 // ==========================================
@@ -59,41 +42,26 @@ errno_t COREMOD_TOOLS_statusStat_cli()
 errno_t statusstat_addCLIcmd()
 {
 
-    RegisterCLIcommand(
-        "ctsmstats",
-        __FILE__,
-        COREMOD_TOOLS_statusStat_cli,
-        "monitors shared variable status",
-        "<imname> <NBstep>",
-        "ctsmstats imst 100000",
-        "long COREMOD_TOOLS_statusStat(const char *IDstat_name, long indexmax)");
+    RegisterCLIcommand("ctsmstats", __FILE__, COREMOD_TOOLS_statusStat_cli, "monitors shared variable status",
+                       "<imname> <NBstep>", "ctsmstats imst 100000",
+                       "long COREMOD_TOOLS_statusStat(const char *IDstat_name, long indexmax)");
 
     return RETURN_SUCCESS;
 }
 
-
-
-
-
-
-
-
 //
 // watch shared memory status image and perform timing statistics
 //
-imageID COREMOD_TOOLS_statusStat(
-    const char *IDstat_name,
-    long        indexmax
-)
+imageID COREMOD_TOOLS_statusStat(const char *IDstat_name, long indexmax)
 {
-    imageID  IDout;
-    int      RT_priority = 91; //any number from 0-99
-    struct   sched_param schedpar;
-    float    usec0 = 50.0;
-    float    usec1 = 150.0;
+    imageID IDout;
+    int RT_priority = 91; //any number from 0-99
+    struct sched_param schedpar;
+    float usec0 = 50.0;
+    float usec1 = 150.0;
     long long k;
     long long NBkiter = 2000000000;
-    imageID  IDstat;
+    imageID IDstat;
 
     unsigned short st;
 
@@ -106,12 +74,11 @@ imageID COREMOD_TOOLS_statusStat(
 
     long cnttot;
 
-
-
     IDstat = image_ID(IDstat_name);
 
-    sizearray = (uint32_t *) malloc(sizeof(uint32_t) * 2);
-    if(sizearray == NULL) {
+    sizearray = (uint32_t *)malloc(sizeof(uint32_t) * 2);
+    if (sizearray == NULL)
+    {
         PRINT_ERROR("malloc returns NULL pointer");
         abort();
     }
@@ -121,7 +88,7 @@ imageID COREMOD_TOOLS_statusStat(
     create_image_ID("statout", 2, sizearray, _DATATYPE_INT64, 0, 0, 0, &IDout);
     free(sizearray);
 
-    for(st = 0; st < indexmax; st++)
+    for (st = 0; st < indexmax; st++)
     {
         data.image[IDout].array.SI64[st] = 0;
     }
@@ -131,40 +98,38 @@ imageID COREMOD_TOOLS_statusStat(
     sched_setscheduler(0, SCHED_FIFO, &schedpar);
 #endif
 
-
     printf("Measuring status distribution \n");
     fflush(stdout);
 
     clock_gettime(CLOCK_REALTIME, &t1);
-    for(k = 0; k < NBkiter; k++)
+    for (k = 0; k < NBkiter; k++)
     {
         double tdiffv;
 
         usleep((long)(usec0 + usec1 * (1.0 * k / NBkiter)));
         st = data.image[IDstat].array.UI16[0];
-        if(st < indexmax)
+        if (st < indexmax)
         {
             data.image[IDout].array.SI64[st]++;
         }
 
-
         clock_gettime(CLOCK_REALTIME, &t2);
         tdiff = timespec_diff(t1, t2);
         tdiffv = 1.0 * tdiff.tv_sec + 1.0e-9 * tdiff.tv_nsec;
 
-        if(tdiffv > tdiffv1)
+        if (tdiffv > tdiffv1)
         {
             tdiffv1 += tdisplay;
             printf("\n");
             printf("============== %10lld  %d  ==================\n", k, st);
             printf("\n");
             cnttot = 0;
-            for(st = 0; st < indexmax; st++)
+            for (st = 0; st < indexmax; st++)
             {
                 cnttot += data.image[IDout].array.SI64[st];
             }
 
-            for(st = 0; st < indexmax; st++)
+            for (st = 0; st < indexmax; st++)
             {
                 printf("STATUS  %5d    %20ld   %6.3f  \n", st, data.image[IDout].array.SI64[st],
                        100.0 * data.image[IDout].array.SI64[st] / cnttot);
@@ -172,16 +137,13 @@ imageID COREMOD_TOOLS_statusStat(
         }
     }
 
-
     printf("\n");
-    for(st = 0; st < indexmax; st++)
+    for (st = 0; st < indexmax; st++)
     {
         printf("STATUS  %5d    %10ld\n", st, data.image[IDout].array.SI64[st]);
     }
 
     printf("\n");
 
-
-    return(IDout);
+    return (IDout);
 }
-
diff --git a/src/COREMOD_tools/statusstat.h b/src/COREMOD_tools/statusstat.h
index 2d92b170..9834217c 100644
--- a/src/COREMOD_tools/statusstat.h
+++ b/src/COREMOD_tools/statusstat.h
@@ -4,7 +4,4 @@
 
 errno_t statusstat_addCLIcmd();
 
-imageID COREMOD_TOOLS_statusStat(
-    const char *IDstat_name,
-    long        indexmax
-);
+imageID COREMOD_TOOLS_statusStat(const char *IDstat_name, long indexmax);
diff --git a/src/COREMOD_tools/stringutils.c b/src/COREMOD_tools/stringutils.c
index a5a13cc5..4bb68675 100644
--- a/src/COREMOD_tools/stringutils.c
+++ b/src/COREMOD_tools/stringutils.c
@@ -4,20 +4,15 @@
 
 #include <string.h>
 
-int replace_char(
-    char *content,
-    char cin,
-    char cout
-)
+int replace_char(char *content, char cin, char cout)
 {
     unsigned long i;
 
-    for(i = 0; i < strlen(content); i++)
-        if(content[i] == cin)
+    for (i = 0; i < strlen(content); i++)
+        if (content[i] == cin)
         {
             content[i] = cout;
         }
 
-    return(0);
+    return (0);
 }
-
diff --git a/src/COREMOD_tools/stringutils.h b/src/COREMOD_tools/stringutils.h
index 3d5e2f76..2d5a5f76 100644
--- a/src/COREMOD_tools/stringutils.h
+++ b/src/COREMOD_tools/stringutils.h
@@ -2,5 +2,4 @@
  * @file stringutils.h
  */
 
-
 int replace_char(char *content, char cin, char cout);
diff --git a/src/CommandLineInterface/.gitignore b/src/CommandLineInterface/.gitignore
index 4ef7e615..8ea2afd9 100644
--- a/src/CommandLineInterface/.gitignore
+++ b/src/CommandLineInterface/.gitignore
@@ -29,4 +29,4 @@ CacaoProcessTools.egg-info
 build
 _*
 setup.cfg
-.vscode
\ No newline at end of file
+.vscode
diff --git a/src/CommandLineInterface/CHANGELOG.md b/src/CommandLineInterface/CHANGELOG.md
index 29cdcd2b..d2ca956b 100644
--- a/src/CommandLineInterface/CHANGELOG.md
+++ b/src/CommandLineInterface/CHANGELOG.md
@@ -14,4 +14,3 @@ All notable changes to this project will be documented in this file.
 ### Changed
 
 ### Removed
-
diff --git a/src/CommandLineInterface/CLIcore.c b/src/CommandLineInterface/CLIcore.c
index 96c28441..570950ee 100644
--- a/src/CommandLineInterface/CLIcore.c
+++ b/src/CommandLineInterface/CLIcore.c
@@ -4,9 +4,6 @@
  *
  */
 
-
-
-
 /*
  * Exit code
  * 	- 0: no error
@@ -16,68 +13,56 @@
  * 	- 4: system call error
  */
 
-
-
 #define _GNU_SOURCE
 
-
 /* =============================================================================================== */
 /* =============================================================================================== */
 /*                                        HEADER FILES                                             */
 /* =============================================================================================== */
 /* =============================================================================================== */
 
-#include <stdint.h>
-#include <string.h>
 #include <malloc.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include <pthread.h>
-#include <unistd.h>
 #include <stddef.h> // offsetof()
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <sys/resource.h> // getrlimit
 #include <termios.h>
-
-
+#include <unistd.h>
 
 #include <sys/time.h>
 
-
-
-#include <math.h>
 #include <errno.h>
-#include <unistd.h>
-#include <sys/types.h>
+#include <fcntl.h>
 #include <getopt.h>
+#include <math.h>
 #include <ncurses.h>
-#include <sys/stat.h>
-#include <fcntl.h>
 #include <stdbool.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <unistd.h>
 #ifndef __MACH__
 #include <sys/prctl.h>
 #endif
 #include <sched.h>
 #include <signal.h>
 
-#include <readline/readline.h>
 #include <readline/history.h>
+#include <readline/readline.h>
 
-
-# ifdef _OPENMP
-# include <omp.h>
+#ifdef _OPENMP
+#include <omp.h>
 #define OMP_NELEMENT_LIMIT 1000000
-# endif
+#endif
 
 #ifdef _OPENACC
 #include <openacc.h>
 #endif
 
-
-
-#include <gsl/gsl_rng.h> // for random numbers
 #include <fitsio.h>
-
-
+#include <gsl/gsl_rng.h> // for random numbers
 
 #include "CommandLineInterface/CLIcore.h"
 
@@ -85,10 +70,9 @@
 
 #include "ImageStreamIO/ImageStreamIO.h"
 
-#include "COREMOD_memory/COREMOD_memory.h"
-#include "COREMOD_iofits/COREMOD_iofits.h"
 #include "COREMOD_arith/COREMOD_arith.h"
-
+#include "COREMOD_iofits/COREMOD_iofits.h"
+#include "COREMOD_memory/COREMOD_memory.h"
 
 #include "CommandLineInterface/CLIcore_UI.h"
 #include "CommandLineInterface/CLIcore_checkargs.h"
@@ -99,9 +83,6 @@
 #include "CommandLineInterface/CLIcore_setSHMdir.h"
 #include "CommandLineInterface/CLIcore_signals.h"
 
-
-
-
 /*-----------------------------------------
 *       Globals exported to all modules
 */
@@ -110,21 +91,17 @@ DATA __attribute__((used)) data;
 
 pid_t CLIPID;
 
-
 int C_ERRNO;
 
-
 int Verbose = 0;
 int Listimfile = 0;
 
-
 char CLIstartupfilename[200] = "CLIstartup.txt";
 
 // fifo input
 static int fifofd;
 static fd_set cli_fdin_set;
 
-
 /*-----------------------------------------
 *       Forward References
 */
@@ -135,28 +112,11 @@ static void runCLI_free();
 
 static int sigwinch_received = 0;
 
-
-
-
-
-
-
-static int command_line_process_options(
-    int argc,
-    char **argv
-);
-
+static int command_line_process_options(int argc, char **argv);
 
 /// CLI commands
 static int exitCLI();
 
-
-
-
-
-
-
-
 /* =============================================================================================== */
 /* =============================================================================================== */
 /*                                    FUNCTIONS SOURCE CODE                                        */
@@ -164,35 +124,24 @@ static int exitCLI();
 /* =============================================================================================== */
 /** @name CLIcore functions */
 
-
-
-
-
-
-
-
-
-
-
 /// CLI functions
 
 errno_t exitCLI()
 {
 
-    if(data.fifoON == 1)
+    if (data.fifoON == 1)
     {
         EXECUTE_SYSTEM_COMMAND("rm %s", data.fifoname);
     }
 
-
-    if(Listimfile == 1)
+    if (Listimfile == 1)
     {
         EXECUTE_SYSTEM_COMMAND("rm imlist.txt");
     }
 
-    if(data.quiet == 0)
+    if (data.quiet == 0)
     {
-        printf("Closing PID %ld (prompt process)\n", (long) getpid());
+        printf("Closing PID %ld (prompt process)\n", (long)getpid());
     }
     //    exit(0);
     data.CLIloopON = 0; // stop CLI loop
@@ -200,27 +149,16 @@ errno_t exitCLI()
     return RETURN_SUCCESS;
 }
 
-
-
-
-
-
-
-
-
 static errno_t load_so__cli()
 {
     load_sharedobj(data.cmdargtoken[1].val.string);
     return CLICMD_SUCCESS;
 }
 
-
-
-
 static errno_t load_module__cli()
 {
 
-    if(data.cmdargtoken[1].type == 3)
+    if (data.cmdargtoken[1].type == 3)
     {
         load_module_shared(data.cmdargtoken[1].val.string);
         return CLICMD_SUCCESS;
@@ -231,15 +169,10 @@ static errno_t load_module__cli()
     }
 }
 
-
-
 static errno_t CLIcore__load_module_as__cli()
 {
     DEBUG_TRACEPOINT("calling CLI_checkarg");
-    if(0
-            + CLI_checkarg(1, CLIARG_STR)
-            + CLI_checkarg(2, CLIARG_STR)
-            == 0)
+    if (0 + CLI_checkarg(1, CLIARG_STR) + CLI_checkarg(2, CLIARG_STR) == 0)
     {
         strcpy(data.moduleshortname, data.cmdargtoken[2].val.string);
         load_module_shared(data.cmdargtoken[1].val.string);
@@ -251,49 +184,37 @@ static errno_t CLIcore__load_module_as__cli()
     }
 }
 
-
-
-
-
-
 errno_t set_processinfoON()
 {
-    data.processinfo  = 1;
+    data.processinfo = 1;
 
     return RETURN_SUCCESS;
 }
 
 errno_t set_processinfoOFF()
 {
-    data.processinfo  = 0;
+    data.processinfo = 0;
 
     return RETURN_SUCCESS;
 }
 
-
-
 errno_t set_default_precision_single()
 {
-    data.precision  = 0;
+    data.precision = 0;
 
     return RETURN_SUCCESS;
 }
 
-
-
-
 errno_t set_default_precision_double()
 {
-    data.precision  = 1;
+    data.precision = 1;
 
     return RETURN_SUCCESS;
 }
 
-
-
 errno_t milk_usleep__cli()
 {
-    if(data.cmdargtoken[1].type == 2)
+    if (data.cmdargtoken[1].type == 2)
     {
         usleep(data.cmdargtoken[1].val.numl);
         return RETURN_SUCCESS;
@@ -304,18 +225,13 @@ errno_t milk_usleep__cli()
     }
 }
 
-
 errno_t functionparameter_CTRLscreen__cli()
 {
     DEBUG_TRACEPOINT("calling CLI_checkarg");
-    if(
-        (CLI_checkarg(1, CLIARG_LONG) == 0) &&
-        (CLI_checkarg(2, CLIARG_STR) == 0) &&
-        (CLI_checkarg(3, CLIARG_STR) == 0)
-    )
+    if ((CLI_checkarg(1, CLIARG_LONG) == 0) && (CLI_checkarg(2, CLIARG_STR) == 0) && (CLI_checkarg(3, CLIARG_STR) == 0))
     {
-        functionparameter_CTRLscreen((uint32_t) data.cmdargtoken[1].val.numl,
-                                     data.cmdargtoken[2].val.string, data.cmdargtoken[3].val.string);
+        functionparameter_CTRLscreen((uint32_t)data.cmdargtoken[1].val.numl, data.cmdargtoken[2].val.string,
+                                     data.cmdargtoken[3].val.string);
         return RETURN_SUCCESS;
     }
     else
@@ -326,16 +242,12 @@ errno_t functionparameter_CTRLscreen__cli()
     return RETURN_SUCCESS;
 }
 
-
-
 errno_t function_parameter_structure_load__cli()
 {
     DEBUG_TRACEPOINT("calling CLI_checkarg");
-    if(CLI_checkarg(1, CLIARG_STR) == 0)
+    if (CLI_checkarg(1, CLIARG_STR) == 0)
     {
-        function_parameter_structure_load(
-            data.cmdargtoken[1].val.string
-        );
+        function_parameter_structure_load(data.cmdargtoken[1].val.string);
         return CLICMD_SUCCESS;
     }
     else
@@ -344,35 +256,9 @@ errno_t function_parameter_structure_load__cli()
     }
 }
 
+errno_t processinfo_CTRLscreen__cli() { return (processinfo_CTRLscreen()); }
 
-
-
-
-errno_t processinfo_CTRLscreen__cli()
-{
-    return(processinfo_CTRLscreen());
-}
-
-
-errno_t streamCTRL_CTRLscreen__cli()
-{
-    return(streamCTRL_CTRLscreen());
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+errno_t streamCTRL_CTRLscreen__cli() { return (streamCTRL_CTRLscreen()); }
 
 void fnExit_fifoclose()
 {
@@ -384,27 +270,16 @@ void fnExit_fifoclose()
     //		}
     //	}
 
-
     //	FD_ZERO(&cli_fdin_set);  // Initializes the file descriptor set cli_fdin_set to have zero bits for all file descriptors.
     //       if(data.fifoON==1)
     //           FD_SET(fifofd, &cli_fdin_set);  // Sets the bit for the file descriptor fifofd in the file descriptor set cli_fdin_set.
     //    FD_SET(fileno(stdin), &cli_fdin_set);  // Sets the bit for the file descriptor fifofd in the file descriptor set cli_fdin_set.
 
-
     // reset terminal properties
     //	system("tset");
 }
 
-
-
-
-
-
-
-
-
-static errno_t runCLI_initialize(
-)
+static errno_t runCLI_initialize()
 {
     DEBUG_TRACE_FSTART();
 
@@ -423,53 +298,42 @@ static errno_t runCLI_initialize(
      TYPESIZE[_DATATYPE_COMPLEX_DOUBLE]         = SIZEOF_DATATYPE_COMPLEX_DOUBLE;*/
     //    TYPESIZE[_DATATYPE_EVENT_UI8_UI8_UI16_UI8] = SIZEOF_DATATYPE_EVENT_UI8_UI8_UI16_UI8;
 
-
-
-
     // get PID and write it to shell env variable MILK_CLI_PID
     CLIPID = getpid();
-    if(data.quiet == 0)
+    if (data.quiet == 0)
     {
-        printf("        CLI PID = %d\n", (int) CLIPID);
+        printf("        CLI PID = %d\n", (int)CLIPID);
 
-        EXECUTE_SYSTEM_COMMAND("echo -n \"        \"; cat /proc/%d/status | grep Cpus_allowed_list",
-                               CLIPID);
+        EXECUTE_SYSTEM_COMMAND("echo -n \"        \"; cat /proc/%d/status | grep Cpus_allowed_list", CLIPID);
     }
 
     //	printf("    _SC_CLK_TCK = %d\n", sysconf(_SC_CLK_TCK));
 
-
-
-    if(Verbose)
+    if (Verbose)
     {
         fprintf(stdout, "%s: compiled %s %s\n", __FILE__, __DATE__, __TIME__);
     }
 
-# ifdef _OPENMP
-    if(data.quiet == 0)
+#ifdef _OPENMP
+    if (data.quiet == 0)
     {
-        printf("        Running with openMP %d, max threads = %d  (OMP_NUM_THREADS)\n",
-               _OPENMP, omp_get_max_threads());
+        printf("        Running with openMP %d, max threads = %d  (OMP_NUM_THREADS)\n", _OPENMP, omp_get_max_threads());
     }
-# else
-    if(data.quiet == 0)
+#else
+    if (data.quiet == 0)
     {
         printf("        Compiled without openMP\n");
     }
-# endif
+#endif
 
-# ifdef _OPENACC
+#ifdef _OPENACC
     int openACC_devtype = acc_get_device_type();
-    if(data.quiet == 0)
+    if (data.quiet == 0)
     {
-        printf("        Running with openACC version %d.  %d device(s), type %d\n",
-               _OPENACC, acc_get_num_devices(openACC_devtype), openACC_devtype);
+        printf("        Running with openACC version %d.  %d device(s), type %d\n", _OPENACC,
+               acc_get_num_devices(openACC_devtype), openACC_devtype);
     }
-# endif
-
-
-
-
+#endif
 
     // to take advantage of kernel priority:
     // owner=root mode=4755
@@ -477,20 +341,18 @@ static errno_t runCLI_initialize(
 #ifndef __MACH__
     getresuid(&data.ruid, &data.euid, &data.suid);
     //This sets it to the privileges of the normal user
-    if(seteuid(data.ruid) != 0)
+    if (seteuid(data.ruid) != 0)
     {
         PRINT_ERROR("seteuid error");
     }
 #endif
 
-
-
     // Initialize random-number generator
     //
     const gsl_rng_type *rndgenType;
     //rndgenType = gsl_rng_ranlxs2; // best algorithm but slow
     //rndgenType = gsl_rng_ranlxs0; // not quite as good, slower
-    rndgenType  = gsl_rng_rand; // not as good but ~10x faster fast
+    rndgenType = gsl_rng_rand; // not as good but ~10x faster fast
     data.rndgen = gsl_rng_alloc(rndgenType);
     gsl_rng_set(data.rndgen, time(NULL));
 
@@ -498,26 +360,20 @@ static errno_t runCLI_initialize(
     //for(i=0; i<10; i++)
     //    v1 = gsl_rng_uniform (data.rndgen);
 
+    data.progStatus = 0;
 
-    data.progStatus        = 0;
-
-    data.Debug             = 0;
-    data.overwrite         = 0;
-    data.precision         = 0; // float is default precision
-    data.SHARED_DFT        = 0; // do not allocate shared memory for images
-    data.NBKEYWORD_DFT     = 50; // allocate memory for 10 keyword per image
+    data.Debug = 0;
+    data.overwrite = 0;
+    data.precision = 0;      // float is default precision
+    data.SHARED_DFT = 0;     // do not allocate shared memory for images
+    data.NBKEYWORD_DFT = 50; // allocate memory for 10 keyword per image
     sprintf(data.SAVEDIR, ".");
 
-    data.CLIlogON          = 0;     // log every command
-    data.fifoON            = 0;
-    data.processinfo       = 1;  // process info for intensive processes
+    data.CLIlogON = 0; // log every command
+    data.fifoON = 0;
+    data.processinfo = 1;       // process info for intensive processes
     data.processinfoActive = 0; // toggles to 1 when process is logged
 
-
-
-
-
-
     // signal handling
 
     data.sigact.sa_handler = sig_handler;
@@ -527,18 +383,18 @@ static errno_t runCLI_initialize(
     data.signal_USR1 = 0;
     data.signal_USR2 = 0;
     data.signal_TERM = 0;
-    data.signal_INT  = 0;
-    data.signal_BUS  = 0;
+    data.signal_INT = 0;
+    data.signal_BUS = 0;
     data.signal_SEGV = 0;
     data.signal_ABRT = 0;
-    data.signal_HUP  = 0;
+    data.signal_HUP = 0;
     data.signal_PIPE = 0;
 
-    if(sigaction(SIGUSR1, &data.sigact, NULL) == -1)
+    if (sigaction(SIGUSR1, &data.sigact, NULL) == -1)
     {
         printf("\ncan't catch SIGUSR1\n");
     }
-    if(sigaction(SIGUSR2, &data.sigact, NULL) == -1)
+    if (sigaction(SIGUSR2, &data.sigact, NULL) == -1)
     {
         printf("\ncan't catch SIGUSR2\n");
     }
@@ -549,29 +405,17 @@ static errno_t runCLI_initialize(
     return RETURN_SUCCESS;
 }
 
-
-
-
-
-
-
-
-
-
-
 /* Handle SIGWINCH and window size changes when readline is not active and
    reading a character. */
-static void
-sighandler (int sig)
+static void sighandler(int sig)
 {
 
-    (void) sig;
-    rl_resize_terminal ();
+    (void)sig;
+    rl_resize_terminal();
     //printf("RESIZE detected %d %d\n", COLS, LINES);
     sigwinch_received = 1;
 }
 
-
 /**
  * @brief Command Line Interface (CLI) main\n
  *
@@ -579,84 +423,58 @@ sighandler (int sig)
  * parsing done with bison and flex
  */
 
-
-errno_t runCLI(
-    int   argc,
-    char *argv[],
-    char *promptstring
-)
+errno_t runCLI(int argc, char *argv[], char *promptstring)
 {
     DEBUG_TRACE_FSTART();
 
-    int     fdmax;
-    int     n;
+    int fdmax;
+    int n;
 
     ssize_t bytes;
-    size_t  total_bytes;
-    char    buf0[1];
-    char    buf1[1024];
-
-    int     initstartup = 0; /// becomes 1 after startup
-
-    int     blockCLIinput = 0;
-    int     cliwaitus = 100;
-    struct  timeval tv;   // sleep 100 us after reading FIFO
-
+    size_t total_bytes;
+    char buf0[1];
+    char buf1[1024];
 
+    int initstartup = 0; /// becomes 1 after startup
 
+    int blockCLIinput = 0;
+    int cliwaitus = 100;
+    struct timeval tv; // sleep 100 us after reading FIFO
 
     strcpy(data.processname, argv[0]);
 
-
     // Set CLI prompt
     char prompt[200];
     runCLI_prompt(promptstring, prompt);
 
-
-
     // CLI initialize
     runCLI_initialize();
 
-
-
-
     // set shared memory directory
     setSHMdir();
 
-
     DEBUG_TRACEPOINT("CLI start");
 
     // initialize fifo to process name
     DEBUG_TRACEPOINT("set default fifo name");
     //sprintf(data.fifoname, "%s.fifo.%07d", data.processname, getpid());
-    WRITE_FULLFILENAME(data.fifoname,
-                       "%s/.%s.fifo.%07d",
-                       data.shmdir,
-                       data.processname,
-                       getpid());
+    WRITE_FULLFILENAME(data.fifoname, "%s/.%s.fifo.%07d", data.shmdir, data.processname, getpid());
 
     DEBUG_TRACEPOINT("Get command-line options");
     command_line_process_options(argc, argv);
 
-
-
-
-
     data.progStatus = 1;
     printf("\n");
 
-
-
-
     // uncomment following two lines to auto-load all modules
     //DEBUG_TRACEPOINT("LOAD MODULES (shared objects)");
     //load_module_shared_ALL();
 
     // load other libs specified by environment variable MILKCLI_ADD_LIBS
     char *CLI_ADD_LIBS = getenv("MILKCLI_ADD_LIBS");
-    if(CLI_ADD_LIBS != NULL)
+    if (CLI_ADD_LIBS != NULL)
     {
-        if(data.quiet == 0)
+        if (data.quiet == 0)
         {
             printf("        MILKCLI_ADD_LIBS '%s'\n", CLI_ADD_LIBS);
         }
@@ -664,7 +482,7 @@ errno_t runCLI(
         char *libname;
         libname = strtok(CLI_ADD_LIBS, " ,;");
 
-        while(libname != NULL)
+        while (libname != NULL)
         {
             DEBUG_TRACEPOINT("--- CLI Adding library: %s", libname);
             // load_sharedobj(libname);
@@ -675,63 +493,47 @@ errno_t runCLI(
     }
     else
     {
-        if(data.quiet == 0)
+        if (data.quiet == 0)
         {
             printf("        MILKCLI_ADD_LIBS not set -> no additional module loaded\n");
         }
     }
 
-
-
-
     DEBUG_TRACEPOINT("Initialize data control block");
     CLI_data_init();
 
     runCLI_cmd_init();
 
-
-
-
-
-
-
     // fifo
     fdmax = fileno(stdin);
-    if(data.fifoON == 1)
+    if (data.fifoON == 1)
     {
-        if(data.quiet == 0)
+        if (data.quiet == 0)
         {
             printf("Creating fifo %s\n", data.fifoname);
         }
         mkfifo(data.fifoname, 0666);
         fifofd = open(data.fifoname, O_RDWR | O_NONBLOCK);
-        if(fifofd == -1)
+        if (fifofd == -1)
         {
             perror("open");
             printf("File name : %s\n", data.fifoname);
             DEBUG_TRACE_FEXIT();
             return EXIT_FAILURE;
         }
-        if(fifofd > fdmax)
+        if (fifofd > fdmax)
         {
             fdmax = fifofd;
         }
     }
 
-
     C_ERRNO = 0; // initialize C error variable to 0 (no error)
 
-
-
     data.CLIloopON = 1; // start CLI loop
 
-
     int realine_initialized = 0;
 
-
-
-
-    while(data.CLIloopON == 1)
+    while (data.CLIloopON == 1)
     {
         FILE *fp;
 
@@ -739,53 +541,47 @@ errno_t runCLI(
 
         data.CMDexecuted = 0;
 
-        if((fp = fopen("STOPCLI", "r")) != NULL)
+        if ((fp = fopen("STOPCLI", "r")) != NULL)
         {
             fprintf(stdout, "STOPCLI FILE FOUND. Exiting...\n");
             fclose(fp);
             exit(3);
         }
 
-        if(Listimfile == 1)
+        if (Listimfile == 1)
         {
             fp = fopen("imlist.txt", "w");
             list_image_ID_ofp_simple(fp);
             fclose(fp);
         }
 
-
         // Keep the number of image addresses available
         //  NB_IMAGES_BUFFER above the number of used images
         //
         //  Keep the number of variables addresses available
         //  NB_VARIABLES_BUFFER above the number of used variables
 
-        if(memory_re_alloc() != RETURN_SUCCESS)
+        if (memory_re_alloc() != RETURN_SUCCESS)
         {
-            fprintf(stderr,
-                    "%c[%d;%dm ERROR [ FILE: %s   FUNCTION: %s   LINE: %d ]  %c[%d;m\n",
-                    (char) 27, 1, 31, __FILE__, __func__, __LINE__, (char) 27, 0);
-            fprintf(stderr,
-                    "%c[%d;%dm Memory re-allocation failed  %c[%d;m\n",
-                    (char) 27, 1, 31, (char) 27, 0);
+            fprintf(stderr, "%c[%d;%dm ERROR [ FILE: %s   FUNCTION: %s   LINE: %d ]  %c[%d;m\n", (char)27, 1, 31,
+                    __FILE__, __func__, __LINE__, (char)27, 0);
+            fprintf(stderr, "%c[%d;%dm Memory re-allocation failed  %c[%d;m\n", (char)27, 1, 31, (char)27, 0);
             exit(EXIT_FAILURE);
         }
 
         compute_image_memory();
         compute_nb_image();
 
-
         // If fifo is on and file CLIstatup.txt exists, load it
-        if(initstartup == 0)
+        if (initstartup == 0)
         {
-            if(data.fifoON == 1)
+            if (data.fifoON == 1)
             {
                 EXECUTE_SYSTEM_COMMAND("file %s", CLIstartupfilename); //TEST
-                EXECUTE_SYSTEM_COMMAND("cat %s", CLIstartupfilename); //TEST
-                EXECUTE_SYSTEM_COMMAND("cat %s > %s 2> /dev/null", CLIstartupfilename,
-                                       data.fifoname);
+                EXECUTE_SYSTEM_COMMAND("cat %s", CLIstartupfilename);  //TEST
+                EXECUTE_SYSTEM_COMMAND("cat %s > %s 2> /dev/null", CLIstartupfilename, data.fifoname);
 
-                if(data.quiet == 0)
+                if (data.quiet == 0)
                 {
                     printf("[%s -> %s]\n", CLIstartupfilename, data.fifoname);
                     printf("IMPORTING FILE %s ... \n", CLIstartupfilename);
@@ -794,26 +590,24 @@ errno_t runCLI(
         }
         initstartup = 1;
 
-
-
         DEBUG_TRACEPOINT("Get user input fifo=%d", data.fifoON); //===============================
         tv.tv_sec = 0;
         tv.tv_usec = cliwaitus;
 
-
-        FD_ZERO(&cli_fdin_set);  // Initializes the file descriptor set cli_fdin_set to have zero bits for all file descriptors.
-        if(data.fifoON == 1)
+        FD_ZERO(
+            &cli_fdin_set); // Initializes the file descriptor set cli_fdin_set to have zero bits for all file descriptors.
+        if (data.fifoON == 1)
         {
-            FD_SET(fifofd,
-                   &cli_fdin_set);  // Sets the bit for the file descriptor fifofd in the file descriptor set cli_fdin_set.
+            FD_SET(
+                fifofd,
+                &cli_fdin_set); // Sets the bit for the file descriptor fifofd in the file descriptor set cli_fdin_set.
         }
         FD_SET(fileno(stdin),
-               &cli_fdin_set);  // Sets the bit for the file descriptor fifofd in the file descriptor set cli_fdin_set.
-
+               &cli_fdin_set); // Sets the bit for the file descriptor fifofd in the file descriptor set cli_fdin_set.
 
-        if(data.fifoON == 0)
+        if (data.fifoON == 0)
         {
-            if(realine_initialized == 0)
+            if (realine_initialized == 0)
             {
                 realine_initialized = 1;
                 // initialize readline
@@ -824,21 +618,21 @@ errno_t runCLI(
 
                 /* Handle window size changes when readline is not active and reading
                      characters. */
-                signal (SIGWINCH, sighandler);
-                rl_callback_handler_install(prompt, (rl_vcpfunc_t *) &rl_cb_linehandler);
+                signal(SIGWINCH, sighandler);
+                rl_callback_handler_install(prompt, (rl_vcpfunc_t *)&rl_cb_linehandler);
             }
         }
 
         DEBUG_TRACEPOINT("loop entry");
-        while((data.CLIexecuteCMDready == 0) && (data.CLIloopON == 1))
+        while ((data.CLIexecuteCMDready == 0) && (data.CLIloopON == 1))
         {
             if (data.signal_INT == 1)
             {
                 // stop CLI input loop
-                data.CLIloopON  = 0;
+                data.CLIloopON = 0;
             }
 
-            {   // CLI loop delay to keep CPU load light
+            { // CLI loop delay to keep CPU load light
                 struct timespec nsts;
                 nsts.tv_sec = 0;
                 nsts.tv_nsec = 30000000; // 30 ms delay
@@ -847,25 +641,27 @@ errno_t runCLI(
 
             n = select(fdmax + 1, &cli_fdin_set, NULL, NULL, &tv);
 
-            if(n == 0)   // nothing received, need to re-init and go back to select call
+            if (n == 0) // nothing received, need to re-init and go back to select call
             {
                 tv.tv_sec = 0;
                 tv.tv_usec = cliwaitus;
 
-
-                FD_ZERO(&cli_fdin_set);  // Initializes the file descriptor set cli_fdin_set to have zero bits for all file descriptors.
-                if(data.fifoON == 1)
+                FD_ZERO(
+                    &cli_fdin_set); // Initializes the file descriptor set cli_fdin_set to have zero bits for all file descriptors.
+                if (data.fifoON == 1)
                 {
-                    FD_SET(fifofd,
-                           &cli_fdin_set);    // Sets the bit for the file descriptor fifofd in the file descriptor set cli_fdin_set.
+                    FD_SET(
+                        fifofd,
+                        &cli_fdin_set); // Sets the bit for the file descriptor fifofd in the file descriptor set cli_fdin_set.
                 }
-                FD_SET(fileno(stdin),
-                       &cli_fdin_set);  // Sets the bit for the file descriptor fifofd in the file descriptor set cli_fdin_set.
+                FD_SET(
+                    fileno(stdin),
+                    &cli_fdin_set); // Sets the bit for the file descriptor fifofd in the file descriptor set cli_fdin_set.
                 continue;
             }
-            if(n == -1)
+            if (n == -1)
             {
-                if(errno == EINTR)   // no command received
+                if (errno == EINTR) // no command received
                 {
                     continue;
                 }
@@ -880,23 +676,23 @@ errno_t runCLI(
 
             blockCLIinput = 0;
 
-            if(data.fifoON == 1)
+            if (data.fifoON == 1)
             {
                 DEBUG_TRACEPOINT("fifo ON");
-                if(FD_ISSET(fifofd, &cli_fdin_set))
+                if (FD_ISSET(fifofd, &cli_fdin_set))
                 {
                     total_bytes = 0;
-                    for(;;)
+                    for (;;)
                     {
                         bytes = read(fifofd, buf0, 1);
-                        if(bytes > 0)
+                        if (bytes > 0)
                         {
                             buf1[total_bytes] = buf0[0];
                             total_bytes += (size_t)bytes;
                         }
                         else
                         {
-                            if(errno == EWOULDBLOCK)
+                            if (errno == EWOULDBLOCK)
                             {
                                 break;
                             }
@@ -907,7 +703,7 @@ errno_t runCLI(
                                 return EXIT_FAILURE;
                             }
                         }
-                        if(buf0[0] == '\n')
+                        if (buf0[0] == '\n')
                         {
                             buf1[total_bytes - 1] = '\0';
                             strcpy(data.CLIcmdline, buf1);
@@ -925,10 +721,10 @@ errno_t runCLI(
                 }
             }
 
-            if(blockCLIinput == 0) // fifo has been cleared
+            if (blockCLIinput == 0) // fifo has been cleared
             {
                 DEBUG_TRACEPOINT("fifo cleared");
-                if(realine_initialized == 0)
+                if (realine_initialized == 0)
                 {
                     realine_initialized = 1;
                     // initialize readline
@@ -939,28 +735,26 @@ errno_t runCLI(
 
                     /* Handle window size changes when readline is not active and reading
                          characters. */
-                    signal (SIGWINCH, sighandler);
-                    rl_callback_handler_install(prompt, (rl_vcpfunc_t *) &rl_cb_linehandler);
+                    signal(SIGWINCH, sighandler);
+                    rl_callback_handler_install(prompt, (rl_vcpfunc_t *)&rl_cb_linehandler);
                 }
             }
 
             //printf("fifo cleared, accepting user input through CLI\n");
 
-
-            if(blockCLIinput == 0)
-            {   // revert to default mode
-                if(FD_ISSET(fileno(stdin), &cli_fdin_set))
+            if (blockCLIinput == 0)
+            { // revert to default mode
+                if (FD_ISSET(fileno(stdin), &cli_fdin_set))
                 {
                     DEBUG_TRACEPOINT("readline callback");
                     rl_callback_read_char();
                 }
             }
 
-            if(data.exitcode != 0)
+            if (data.exitcode != 0)
             {
                 exitCLI();
             }
-
         }
         data.CLIexecuteCMDready = 0;
 
@@ -973,10 +767,9 @@ errno_t runCLI(
 
     DEBUG_TRACEPOINT("images and variables cleared");
 
-
     runCLI_free();
 
-#if ( RL_READLINE_VERSION > 0x602 )
+#if (RL_READLINE_VERSION > 0x602)
     rl_clear_history();
 #endif
 
@@ -986,263 +779,90 @@ errno_t runCLI(
     return RETURN_SUCCESS;
 }
 
-
-
-
-
-
-
-
-
-
-
-
-
 void runCLI_cmd_init()
 {
     // ensure that commands below belong to root/MAIN module
     data.moduleindex = -1;
 
+    RegisterCLIcommand("exit", __FILE__, exitCLI, "exit program (same as quit command)", "no argument", "exit",
+                       "exitCLI");
 
-    RegisterCLIcommand(
-        "exit",
-        __FILE__,
-        exitCLI,
-        "exit program (same as quit command)",
-        "no argument",
-        "exit",
-        "exitCLI");
-
-    RegisterCLIcommand(
-        "quit",
-        __FILE__,
-        exitCLI,
-        "exit program (same as quit command)",
-        "no argument",
-        "quit",
-        "exitCLI");
-
-    RegisterCLIcommand(
-        "exitCLI",
-        __FILE__,
-        exitCLI,
-        "exit program (same as quit command)",
-        "no argument",
-        "exitCLI",
-        "exitCLI");
-
-
-    RegisterCLIcommand(
-        "help",
-        __FILE__,
-        help,
-        "show help",
-        "no argument",
-        "help",
-        "int help()");
-
-    RegisterCLIcommand(
-        "?",
-        __FILE__,
-        help,
-        "show help",
-        "no argument",
-        "?",
-        "int help()");
-
-    RegisterCLIcommand(
-        "helprl",
-        __FILE__,
-        help,
-        "show readline help",
-        "no argument",
-        "helprl",
-        "int help()");
-
-
-    RegisterCLIcommand(
-        "cmd?",
-        __FILE__,
-        help_cmd,
-        "list/help command(s)",
-        "<command name>(optional)",
-        "cmd?",
-        "int help_cmd()");
-
-    RegisterCLIcommand(
-        "cmdinfo?",
-        __FILE__,
-        cmdinfosearch,
-        "search for string/regex in command info",
-        "<search expression>",
-        "cmdinfo? image",
-        "int cmdinfosearch()");
-
-    RegisterCLIcommand(
-        "m?",
-        __FILE__,
-        help_module,
-        "list/help module(s)",
-        "<module name>(optional)",
-        "m? COREMOD_memory",
-        "errno_t list_commands_module()");
-
-    RegisterCLIcommand(
-        "soload",
-        __FILE__,
-        load_so__cli,
-        "load shared object",
-        "<shared object name>",
-        "soload mysharedobj.so",
-        "int load_sharedobj(char *libname)");
-
-    RegisterCLIcommand(
-        "mload",
-        __FILE__,
-        load_module__cli,
-        "load module from shared object",
-        "<module name>",
-        "mload mymodule",
-        "errno_t load_module_shared(char *modulename)");
-
-    RegisterCLIcommand(
-        "mloadas",
-        __FILE__,
-        CLIcore__load_module_as__cli,
-        "load module from shared object, use short name binding",
-        "<module name> <shortname>",
-        "mloadas mymodule mymod",
-        "errno_t load_module_shared(char *modulename)");
-
-    RegisterCLIcommand(
-        "ci",
-        __FILE__,
-        printInfo,
-        "Print version, settings, info and exit",
-        "no argument",
-        "ci",
-        "int printInfo()");
-
-
-    RegisterCLIcommand(
-        "dpsingle",
-        __FILE__,
-        set_default_precision_single,
-        "Set default precision to single",
-        "no argument",
-        "dpsingle",
-        "data.precision = 0");
-
-    RegisterCLIcommand(
-        "dpdouble",
-        __FILE__,
-        set_default_precision_double,
-        "Set default precision to double",
-        "no argument",
-        "dpdouple",
-        "data.precision = 1");
-
-
-
-
-    // process info
-
-
-    RegisterCLIcommand(
-        "setprocinfoON",
-        __FILE__,
-        set_processinfoON,
-        "Set processes info ON",
-        "no argument",
-        "setprocinfoON",
-        "set_processinfoON()");
+    RegisterCLIcommand("quit", __FILE__, exitCLI, "exit program (same as quit command)", "no argument", "quit",
+                       "exitCLI");
 
-    RegisterCLIcommand(
-        "setprocinfoOFF",
-        __FILE__,
-        set_processinfoOFF,
-        "Set processes info OFF",
-        "no argument",
-        "setprocinfoOFF",
-        "set_processinfoOFF()");
+    RegisterCLIcommand("exitCLI", __FILE__, exitCLI, "exit program (same as quit command)", "no argument", "exitCLI",
+                       "exitCLI");
 
+    RegisterCLIcommand("help", __FILE__, help, "show help", "no argument", "help", "int help()");
 
-    RegisterCLIcommand(
-        "procCTRL",
-        __FILE__,
-        processinfo_CTRLscreen__cli,
-        "processes control screen",
-        "no argument",
-        "procCTRL",
-        "processinfo_CTRLscreen()");
+    RegisterCLIcommand("?", __FILE__, help, "show help", "no argument", "?", "int help()");
 
+    RegisterCLIcommand("helprl", __FILE__, help, "show readline help", "no argument", "helprl", "int help()");
 
+    RegisterCLIcommand("cmd?", __FILE__, help_cmd, "list/help command(s)", "<command name>(optional)", "cmd?",
+                       "int help_cmd()");
 
+    RegisterCLIcommand("cmdinfo?", __FILE__, cmdinfosearch, "search for string/regex in command info",
+                       "<search expression>", "cmdinfo? image", "int cmdinfosearch()");
 
-    // stream ctrl
+    RegisterCLIcommand("m?", __FILE__, help_module, "list/help module(s)", "<module name>(optional)",
+                       "m? COREMOD_memory", "errno_t list_commands_module()");
 
-    RegisterCLIcommand(
-        "streamCTRL",
-        __FILE__,
-        streamCTRL_CTRLscreen__cli,
-        "stream control screen",
-        "no argument",
-        "streamCTRL",
-        "streamCTRL_CTRLscreen()");
+    RegisterCLIcommand("soload", __FILE__, load_so__cli, "load shared object", "<shared object name>",
+                       "soload mysharedobj.so", "int load_sharedobj(char *libname)");
 
+    RegisterCLIcommand("mload", __FILE__, load_module__cli, "load module from shared object", "<module name>",
+                       "mload mymodule", "errno_t load_module_shared(char *modulename)");
 
+    RegisterCLIcommand("mloadas", __FILE__, CLIcore__load_module_as__cli,
+                       "load module from shared object, use short name binding", "<module name> <shortname>",
+                       "mloadas mymodule mymod", "errno_t load_module_shared(char *modulename)");
 
-    // FPS
-    RegisterCLIcommand(
-        "fpsload",
-        __FILE__,
-        function_parameter_structure_load__cli,
-        "Load function parameter struct (FPS)",
-        "<fpsname>",
-        "fpsload imanalyze",
-        "long function_parameter_structure_load(char *fpsname)");
-
-    RegisterCLIcommand(
-        "fpsCTRL",
-        __FILE__,
-        functionparameter_CTRLscreen__cli,
-        "function parameters control screen",
-        "no arg",
-        "fpsCTRL fpsname",
-        "int_fast8_t functionparameter_CTRLscreen(char *fpsname)");
+    RegisterCLIcommand("ci", __FILE__, printInfo, "Print version, settings, info and exit", "no argument", "ci",
+                       "int printInfo()");
 
+    RegisterCLIcommand("dpsingle", __FILE__, set_default_precision_single, "Set default precision to single",
+                       "no argument", "dpsingle", "data.precision = 0");
 
+    RegisterCLIcommand("dpdouble", __FILE__, set_default_precision_double, "Set default precision to double",
+                       "no argument", "dpdouple", "data.precision = 1");
 
+    // process info
 
+    RegisterCLIcommand("setprocinfoON", __FILE__, set_processinfoON, "Set processes info ON", "no argument",
+                       "setprocinfoON", "set_processinfoON()");
 
+    RegisterCLIcommand("setprocinfoOFF", __FILE__, set_processinfoOFF, "Set processes info OFF", "no argument",
+                       "setprocinfoOFF", "set_processinfoOFF()");
 
+    RegisterCLIcommand("procCTRL", __FILE__, processinfo_CTRLscreen__cli, "processes control screen", "no argument",
+                       "procCTRL", "processinfo_CTRLscreen()");
 
+    // stream ctrl
 
+    RegisterCLIcommand("streamCTRL", __FILE__, streamCTRL_CTRLscreen__cli, "stream control screen", "no argument",
+                       "streamCTRL", "streamCTRL_CTRLscreen()");
 
-    RegisterCLIcommand(
-        "usleep",
-        __FILE__,
-        milk_usleep__cli,
-        "usleep",
-        "<us>",
-        "usleep 1000",
-        "usleep(long tus)");
+    // FPS
+    RegisterCLIcommand("fpsload", __FILE__, function_parameter_structure_load__cli,
+                       "Load function parameter struct (FPS)", "<fpsname>", "fpsload imanalyze",
+                       "long function_parameter_structure_load(char *fpsname)");
 
+    RegisterCLIcommand("fpsCTRL", __FILE__, functionparameter_CTRLscreen__cli, "function parameters control screen",
+                       "no arg", "fpsCTRL fpsname", "int_fast8_t functionparameter_CTRLscreen(char *fpsname)");
 
+    RegisterCLIcommand("usleep", __FILE__, milk_usleep__cli, "usleep", "<us>", "usleep 1000", "usleep(long tus)");
 
     //  init_modules();
     // printf("TEST   %s  %ld   data.image[4934].used = %d\n", __FILE__, __LINE__, data.image[4934].used);
 
-    if(data.quiet == 0)
+    if (data.quiet == 0)
     {
         printf("        Loaded %ld modules, %u commands\n", data.NBmodule, data.NBcmd);
         printf("        \n");
     }
 }
 
-
-
-
 static void runCLI_free()
 {
 #ifndef DATA_STATIC_ALLOC
@@ -1254,7 +874,7 @@ static void runCLI_free()
     free(data.variable);
 
     DEBUG_TRACEPOINT("free data.fps");
-    if(data.fpsarray == NULL)
+    if (data.fpsarray == NULL)
     {
         printf("NULL pointer\n");
     }
@@ -1269,14 +889,6 @@ static void runCLI_free()
     gsl_rng_free(data.rndgen);
 }
 
-
-
-
-
-
-
-
-
 int user_function()
 {
     printf("-");
@@ -1284,85 +896,64 @@ int user_function()
     printf("-");
     fflush(stdout);
 
-    return(0);
+    return (0);
 }
 
-
 void fnExit1(void)
 {
     //
 }
 
-
-
-
-
-
-
-
-
-
-
-static int command_line_process_options(
-    int argc,
-    char **argv
-)
+static int command_line_process_options(int argc, char **argv)
 {
     int option_index = 0;
     struct sched_param schedpar;
     char command[200];
 
-
-    static struct option long_options[] =
-    {
-        /* These options set a flag. */
-        {"verbose", no_argument,       &Verbose, 1},
-        {"listimf", no_argument,       &Listimfile, 1},
-        /* These options don't set a flag.
+    static struct option long_options[] = {/* These options set a flag. */
+                                           {"verbose", no_argument, &Verbose, 1},
+                                           {"listimf", no_argument, &Listimfile, 1},
+                                           /* These options don't set a flag.
         We distinguish them by their indices. */
-        {"help",        no_argument,       0, 'h'},
-        {"version",     no_argument,       0, 'v'},
-        {"info",        no_argument,       0, 'i'},
-        {"overwrite",   no_argument,       0, 'o'},
-        {"idle",        no_argument,       0, 'e'},
-        {"fifoflag",    no_argument,       0, 'f'},
-        {"debug",       required_argument, 0, 'd'},
-        {"mmon",        required_argument, 0, 'm'},
-        {"pname",       required_argument, 0, 'n'},
-        {"priority",    required_argument, 0, 'p'},
-        {"fifoname",    required_argument, 0, 'F'},
-        {"startup",     required_argument, 0, 's'},
-        {0, 0, 0, 0}
-    };
-
-
-
-    data.fifoON = 0; // default
+                                           {"help", no_argument, 0, 'h'},
+                                           {"version", no_argument, 0, 'v'},
+                                           {"info", no_argument, 0, 'i'},
+                                           {"overwrite", no_argument, 0, 'o'},
+                                           {"idle", no_argument, 0, 'e'},
+                                           {"fifoflag", no_argument, 0, 'f'},
+                                           {"debug", required_argument, 0, 'd'},
+                                           {"mmon", required_argument, 0, 'm'},
+                                           {"pname", required_argument, 0, 'n'},
+                                           {"priority", required_argument, 0, 'p'},
+                                           {"fifoname", required_argument, 0, 'F'},
+                                           {"startup", required_argument, 0, 's'},
+                                           {0, 0, 0, 0}};
+
+    data.fifoON = 0;          // default
     data.processnameflag = 0; // default
 
-    while(1)
+    while (1)
     {
         int c;
 
-        c = getopt_long(argc, argv, "hvidoe:m:n:p:fF:s:",
-                        long_options, &option_index);
+        c = getopt_long(argc, argv, "hvidoe:m:n:p:fF:s:", long_options, &option_index);
 
         /* Detect the end of the options. */
-        if(c == -1)
+        if (c == -1)
         {
             break;
         }
 
-        switch(c)
+        switch (c)
         {
         case 0:
             /* If this option set a flag, do nothing else now. */
-            if(long_options[option_index].flag != 0)
+            if (long_options[option_index].flag != 0)
             {
                 break;
             }
             printf("option %s", long_options[option_index].name);
-            if(optarg)
+            if (optarg)
             {
                 printf(" with arg %s", optarg);
             }
@@ -1375,7 +966,7 @@ static int command_line_process_options(
             break;
 
         case 'v':
-            printf("%s   %s\n",  data.package_name, data.package_version);
+            printf("%s   %s\n", data.package_name, data.package_version);
             exit(EXIT_SUCCESS);
             break;
 
@@ -1395,10 +986,9 @@ static int command_line_process_options(
             break;
 
         case 'e':
-            printf("Idle mode: only runs process when X is idle (pid %ld)\n",
-                   (long) getpid());
-            sprintf(command, "runidle %ld > /dev/null &\n", (long) getpid());
-            if(system(command) != 0)
+            printf("Idle mode: only runs process when X is idle (pid %ld)\n", (long)getpid());
+            sprintf(command, "runidle %ld > /dev/null &\n", (long)getpid());
+            if (system(command) != 0)
             {
                 PRINT_ERROR("system() returns non-zero value");
             }
@@ -1410,7 +1000,7 @@ static int command_line_process_options(
             break;
 
         case 'n':
-            if(data.quiet == 0)
+            if (data.quiet == 0)
             {
                 printf("process name '%s'\n", optarg);
             }
@@ -1432,14 +1022,14 @@ static int command_line_process_options(
             printf("RUNNING WITH RT PRIORITY = %d\n", schedpar.sched_priority);
 #ifndef __MACH__
 
-            if(seteuid(data.euid) != 0) //This goes up to maximum privileges
+            if (seteuid(data.euid) != 0) //This goes up to maximum privileges
             {
                 PRINT_ERROR("seteuid() returns non-zero value");
             }
             sched_setscheduler(0, SCHED_FIFO,
                                &schedpar); //other option is SCHED_RR, might be faster
 
-            if(seteuid(data.ruid) != 0) //Go back to normal privileges
+            if (seteuid(data.ruid) != 0) //Go back to normal privileges
             {
                 PRINT_ERROR("seteuid() returns non-zero value");
             }
@@ -1447,7 +1037,7 @@ static int command_line_process_options(
             break;
 
         case 'f':
-            if(data.quiet == 0)
+            if (data.quiet == 0)
             {
                 printf("fifo input ON\n");
             }
@@ -1463,7 +1053,7 @@ static int command_line_process_options(
 
         case 's':
             strcpy(CLIstartupfilename, optarg);
-            if(data.quiet == 0)
+            if (data.quiet == 0)
             {
                 printf("Startup file : %s\n", CLIstartupfilename);
             }
@@ -1478,7 +1068,5 @@ static int command_line_process_options(
         }
     }
 
-
     return RETURN_SUCCESS;
-
 }
diff --git a/src/CommandLineInterface/CLIcore.h b/src/CommandLineInterface/CLIcore.h
index 36801738..90bb5509 100644
--- a/src/CommandLineInterface/CLIcore.h
+++ b/src/CommandLineInterface/CLIcore.h
@@ -14,40 +14,29 @@
 #define _GNU_SOURCE
 #endif
 
-
-
-
 #ifndef _CLICORE_H
 #define _CLICORE_H
 
-
 // include sem_timedwait
 #ifndef _POSIX_C_SOURCE
-#define _POSIX_C_SOURCE	200809L
+#define _POSIX_C_SOURCE 200809L
 #endif
 
-
 #ifndef M_PI
 #define M_PI 3.14159265358979323846264338327950288419716939937510582097494459230781640628620899862803
 #endif
 
-
+#include <errno.h>
+#include <fftw3.h>
+#include <gsl/gsl_rng.h> // for random numbers
+#include <semaphore.h>
+#include <signal.h>
 #include <stdint.h>
 #include <stdio.h>
-#include <errno.h>
-#include <unistd.h>
 #include <stdlib.h>
+#include <string.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include <semaphore.h>
-#include <fftw3.h>
-#include <gsl/gsl_rng.h>	// for random numbers
-#include <signal.h>
-#include <string.h>
-
-
-
-
 
 typedef long imageID;
 typedef long variableID;
@@ -57,57 +46,70 @@ typedef long variableID;
 #include "ImageStreamIO/ImageStreamIO.h"
 #include "ImageStreamIO/ImageStruct.h"
 
-
-
+#include "CommandLineInterface/function_parameters.h"
 #include "CommandLineInterface/processtools.h"
 #include "CommandLineInterface/streamCTRL_TUI.h"
-#include "CommandLineInterface/function_parameters.h"
 
 #include "CommandLineInterface/CLIcore_checkargs.h"
-#include "CommandLineInterface/CLIcore_modules.h"
 #include "CommandLineInterface/CLIcore_help.h"
+#include "CommandLineInterface/CLIcore_modules.h"
 
 #include "CommandLineInterface/milkDebugTools.h"
 
-
-
 #define PI 3.14159265358979323846264338328
 
 /// Size of array CLICOREVARRAY
 #define SZ_CLICOREVARRAY 1000
 
-
-
-
 /// important directories and info
-extern pid_t CLIPID;            // command line interface PID
-extern char  DocDir[200];		// location of documentation
-extern char  SrcDir[200];		// location of source
-extern char  BuildFile[200];		// file name for source
-extern char  BuildDate[200];
-extern char  BuildTime[200];
+extern pid_t CLIPID;        // command line interface PID
+extern char DocDir[200];    // location of documentation
+extern char SrcDir[200];    // location of source
+extern char BuildFile[200]; // file name for source
+extern char BuildDate[200];
+extern char BuildTime[200];
 
-extern int C_ERRNO;			// C errno (from errno.h)
+extern int C_ERRNO; // C errno (from errno.h)
 
 /* #define DEBUG */
-#define CFITSEXIT  printf("Program abnormally terminated, File \"%s\", line %d\n", __FILE__, __LINE__);exit(0)
+#define CFITSEXIT                                                                                                      \
+    printf("Program abnormally terminated, File \"%s\", line %d\n", __FILE__, __LINE__);                               \
+    exit(0)
 
 #ifdef DEBUG
-#define nmalloc(f,type,n) f = (type*) malloc(sizeof(type)*n);if(f==NULL){printf("ERROR: pointer \"" #f "\" allocation failed\n");exit(0);}else{printf("\nMALLOC: \""#f "\" allocated\n");}
-#define nfree(f) free(f);printf("\nMALLOC: \""#f"\" freed\n");
+#define nmalloc(f, type, n)                                                                                            \
+    f = (type *)malloc(sizeof(type) * n);                                                                              \
+    if (f == NULL)                                                                                                     \
+    {                                                                                                                  \
+        printf("ERROR: pointer \"" #f "\" allocation failed\n");                                                       \
+        exit(0);                                                                                                       \
+    }                                                                                                                  \
+    else                                                                                                               \
+    {                                                                                                                  \
+        printf("\nMALLOC: \"" #f "\" allocated\n");                                                                    \
+    }
+#define nfree(f)                                                                                                       \
+    free(f);                                                                                                           \
+    printf("\nMALLOC: \"" #f "\" freed\n");
 #else
-#define nmalloc(f,type,n) f = (type*) malloc(sizeof(type)*n);if(f==NULL){printf("ERROR: pointer \"" #f "\" allocation failed\n");exit(0);}
+#define nmalloc(f, type, n)                                                                                            \
+    f = (type *)malloc(sizeof(type) * n);                                                                              \
+    if (f == NULL)                                                                                                     \
+    {                                                                                                                  \
+        printf("ERROR: pointer \"" #f "\" allocation failed\n");                                                       \
+        exit(0);                                                                                                       \
+    }
 #define nfree(f) free(f);
 #endif
 
-#define TEST_ALLOC(f) if(f==NULL){printf("ERROR: pointer \"" #f "\" allocation failed\n");exit(0);}
-
-
-#define NB_ARG_MAX                 20
-
-
-
+#define TEST_ALLOC(f)                                                                                                  \
+    if (f == NULL)                                                                                                     \
+    {                                                                                                                  \
+        printf("ERROR: pointer \"" #f "\" allocation failed\n");                                                       \
+        exit(0);                                                                                                       \
+    }
 
+#define NB_ARG_MAX 20
 
 //
 //  ************ lib module init **********************************
@@ -115,43 +117,34 @@ extern int C_ERRNO;			// C errno (from errno.h)
 
 /** @brief Initialize module
  */
-#define INIT_MODULE_LIB(modname) \
-static errno_t init_module_CLI(); /* forward declaration */ \
-static int INITSTATUS_##modname = 0; \
-void __attribute__ ((constructor)) libinit_##modname() \
-{ \
-if ( INITSTATUS_##modname == 0 )      /* only run once */ \
-{ \
-strcpy(data.moduleshortname_default, MODULE_SHORTNAME_DEFAULT); \
-strcpy(data.moduledatestring, __DATE__); \
-strcpy(data.moduletimestring, __TIME__); \
-strcpy(data.modulename, (#modname)); \
-RegisterModule(__FILE__, PROJECT_NAME, MODULE_DESCRIPTION, VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH); \
-init_module_CLI(); \
-INITSTATUS_##modname = 1; \
-strcpy(data.modulename, "");              /* reset after use */ \
-strcpy(data.moduleshortname_default, ""); /* reset after use */ \
-strcpy(data.moduleshortname, "");         /* reset after use */ \
-} \
-} \
-void __attribute__ ((destructor)) libclose_##modname() \
-{ \
-if ( INITSTATUS_##modname == 1 ) \
-{ \
-} \
-}
-
-
-
-
-
-
+#define INIT_MODULE_LIB(modname)                                                                                       \
+    static errno_t init_module_CLI(); /* forward declaration */                                                        \
+    static int INITSTATUS_##modname = 0;                                                                               \
+    void __attribute__((constructor)) libinit_##modname()                                                              \
+    {                                                                                                                  \
+        if (INITSTATUS_##modname == 0) /* only run once */                                                             \
+        {                                                                                                              \
+            strcpy(data.moduleshortname_default, MODULE_SHORTNAME_DEFAULT);                                            \
+            strcpy(data.moduledatestring, __DATE__);                                                                   \
+            strcpy(data.moduletimestring, __TIME__);                                                                   \
+            strcpy(data.modulename, (#modname));                                                                       \
+            RegisterModule(__FILE__, PROJECT_NAME, MODULE_DESCRIPTION, VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH);   \
+            init_module_CLI();                                                                                         \
+            INITSTATUS_##modname = 1;                                                                                  \
+            strcpy(data.modulename, "");              /* reset after use */                                            \
+            strcpy(data.moduleshortname_default, ""); /* reset after use */                                            \
+            strcpy(data.moduleshortname, "");         /* reset after use */                                            \
+        }                                                                                                              \
+    }                                                                                                                  \
+    void __attribute__((destructor)) libclose_##modname()                                                              \
+    {                                                                                                                  \
+        if (INITSTATUS_##modname == 1)                                                                                 \
+        {                                                                                                              \
+        }                                                                                                              \
+    }
 
 #define MAX_NB_FRAMENAME_CHAR 500
-#define MAX_NB_EXCLUSIONS      40
-
-
-
+#define MAX_NB_EXCLUSIONS 40
 
 // declare a boolean type "BOOL"
 // TRUE and FALSE improve code readability
@@ -160,9 +153,6 @@ typedef uint_fast8_t BOOL;
 #define FALSE 0
 #define TRUE 1
 
-
-
-
 #define DATA_NB_MAX_COMMAND 2000
 #define DATA_NB_MAX_MODULE 200
 
@@ -172,58 +162,46 @@ typedef uint_fast8_t BOOL;
 #define STATIC_NB_MAX_IMAGE 520
 #define STATIC_NB_MAX_VARIABLE 5030
 
-
-
 //Need to install process with setuid.  Then, so you aren't running privileged all the time do this:
 extern uid_t euid_real;
 extern uid_t euid_called;
 extern uid_t suid;
 
-
-
-
-
-
-
-
-
 /*^-----------------------------------------------------------------------------
 | commands available through the CLI
 +-----------------------------------------------------------------------------*/
 
+#define STRINGMAXLEN_MODULE_NAME 100
+#define STRINGMAXLEN_MODULE_SHORTNAME 50
+#define STRINGMAXLEN_MODULE_LOADNAME 500
+#define STRINGMAXLEN_MODULE_SOFILENAME 1000
+#define STRINGMAXLEN_MODULE_PACKAGENAME 50
+#define STRINGMAXLEN_MODULE_INFOSTRING 1000
+#define STRINGMAXLEN_MODULE_DATESTRING 20
+#define STRINGMAXLEN_MODULE_TIMESTRING 20
 
-
-
-#define STRINGMAXLEN_MODULE_NAME          100
-#define STRINGMAXLEN_MODULE_SHORTNAME      50
-#define STRINGMAXLEN_MODULE_LOADNAME      500
-#define STRINGMAXLEN_MODULE_SOFILENAME   1000
-#define STRINGMAXLEN_MODULE_PACKAGENAME    50
-#define STRINGMAXLEN_MODULE_INFOSTRING   1000
-#define STRINGMAXLEN_MODULE_DATESTRING     20
-#define STRINGMAXLEN_MODULE_TIMESTRING     20
-
-#define MODULE_TYPE_UNUSED      0
-#define MODULE_TYPE_STARTUP     1
-#define MODULE_TYPE_CUSTOMLOAD  2
+#define MODULE_TYPE_UNUSED 0
+#define MODULE_TYPE_STARTUP 1
+#define MODULE_TYPE_CUSTOMLOAD 2
 
 typedef struct
 {
     int type;
 
-    char name[STRINGMAXLEN_MODULE_NAME];        // module name
+    char name[STRINGMAXLEN_MODULE_NAME]; // module name
 
-    char shortname[STRINGMAXLEN_MODULE_SHORTNAME];   // short name. If non-empty, access functions as <shortname>.<functionname>
+    char shortname
+        [STRINGMAXLEN_MODULE_SHORTNAME]; // short name. If non-empty, access functions as <shortname>.<functionname>
 
     char loadname[STRINGMAXLEN_MODULE_LOADNAME];
     char sofilename[STRINGMAXLEN_MODULE_SOFILENAME];
 
-    char package[STRINGMAXLEN_MODULE_PACKAGENAME];     // package to which module belongs
-    int versionmajor;	// package version
+    char package[STRINGMAXLEN_MODULE_PACKAGENAME]; // package to which module belongs
+    int versionmajor;                              // package version
     int versionminor;
     int versionpatch;
 
-    char info[STRINGMAXLEN_MODULE_INFOSTRING];      // short description
+    char info[STRINGMAXLEN_MODULE_INFOSTRING]; // short description
 
     char datestring[STRINGMAXLEN_MODULE_DATESTRING]; // Compilation date
     char timestring[STRINGMAXLEN_MODULE_TIMESTRING]; // Compilation time
@@ -232,32 +210,30 @@ typedef struct
 
 } MODULE;
 
-
-
-#define STRINGMAXLEN_CMD_KEY        100
-#define STRINGMAXLEN_CMD_INFO      1000
-#define STRINGMAXLEN_CMD_SYNTAX    1000
-#define STRINGMAXLEN_CMD_EXAMPLE   1000
-#define STRINGMAXLEN_CMD_CCALL     1000
-#define STRINGMAXLEN_CMD_SRCFILE   1000
+#define STRINGMAXLEN_CMD_KEY 100
+#define STRINGMAXLEN_CMD_INFO 1000
+#define STRINGMAXLEN_CMD_SYNTAX 1000
+#define STRINGMAXLEN_CMD_EXAMPLE 1000
+#define STRINGMAXLEN_CMD_CCALL 1000
+#define STRINGMAXLEN_CMD_SRCFILE 1000
 typedef struct
 {
-    char     key[STRINGMAXLEN_CMD_KEY];           // command keyword
+    char key[STRINGMAXLEN_CMD_KEY]; // command keyword
 
     // module
-    char     module[STRINGMAXLEN_MODULE_NAME];        // module name
+    char module[STRINGMAXLEN_MODULE_NAME]; // module name
     // index of module to which command belongs
     // set to -1 if does not belong to any module
-    long     moduleindex;
-    char     srcfile[STRINGMAXLEN_CMD_SRCFILE];     // module source filename
+    long moduleindex;
+    char srcfile[STRINGMAXLEN_CMD_SRCFILE]; // module source filename
 
     // command function pointer
-    errno_t (* fp)();
+    errno_t (*fp)();
 
-    char     info[STRINGMAXLEN_CMD_INFO];            // short description/help
-    char     syntax[STRINGMAXLEN_CMD_SYNTAX];        // command syntax
-    char     example[STRINGMAXLEN_CMD_EXAMPLE];      // command example
-    char     Ccall[STRINGMAXLEN_CMD_CCALL];
+    char info[STRINGMAXLEN_CMD_INFO];       // short description/help
+    char syntax[STRINGMAXLEN_CMD_SYNTAX];   // command syntax
+    char example[STRINGMAXLEN_CMD_EXAMPLE]; // command example
+    char Ccall[STRINGMAXLEN_CMD_CCALL];
 
     // command arguments and parameters
     int nbarg;
@@ -271,11 +247,6 @@ typedef struct
     CMDSETTINGS cmdsettings;
 } CMD;
 
-
-
-
-
-
 // The command line is parsed and
 
 // cmdargtoken type
@@ -286,14 +257,13 @@ typedef struct
 // 4 : existing image
 // 5 : command
 
-#define CMDARGTOKEN_TYPE_UNSOLVED       0
-#define CMDARGTOKEN_TYPE_FLOAT          1
-#define CMDARGTOKEN_TYPE_LONG           2
-#define CMDARGTOKEN_TYPE_STRING         3
-#define CMDARGTOKEN_TYPE_EXISTINGIMAGE  4
-#define CMDARGTOKEN_TYPE_COMMAND        5
-#define CMDARGTOKEN_TYPE_RAWSTRING      6
-
+#define CMDARGTOKEN_TYPE_UNSOLVED 0
+#define CMDARGTOKEN_TYPE_FLOAT 1
+#define CMDARGTOKEN_TYPE_LONG 2
+#define CMDARGTOKEN_TYPE_STRING 3
+#define CMDARGTOKEN_TYPE_EXISTINGIMAGE 4
+#define CMDARGTOKEN_TYPE_COMMAND 5
+#define CMDARGTOKEN_TYPE_RAWSTRING 6
 
 typedef struct
 {
@@ -306,13 +276,8 @@ typedef struct
     } val;
 } CMDARGTOKEN;
 
-
-
-
 extern uint8_t TYPESIZE[32];
 
-
-
 typedef struct
 {
     int used;
@@ -327,13 +292,10 @@ typedef struct
     char comment[200];
 } VARIABLE;
 
-
-
-
 // CODE EXECUTION TRACING
 
 // maximum number of functions in stack
-#define MAXNB_FUNCSTACK  100
+#define MAXNB_FUNCSTACK 100
 // maximum string len per function
 #define STRINGMAXLEN_FUNCSTAK_FUNCNAME 100
 
@@ -343,32 +305,32 @@ typedef struct
  */
 typedef struct
 {
-    uint64_t        loopcnt;
-    int             line;
-    char            file[STRINGMAXLEN_FULLFILENAME];
-    char            func[STRINGMAXLEN_FUNCTIONNAME];
+    uint64_t loopcnt;
+    int line;
+    char file[STRINGMAXLEN_FULLFILENAME];
+    char func[STRINGMAXLEN_FUNCTIONNAME];
 
-    int             funclevel;
-    long            funccallcnt; // how many times has this function been called ?
+    int funclevel;
+    long funccallcnt; // how many times has this function been called ?
 
-    char            funcstack[MAXNB_FUNCSTACK][STRINGMAXLEN_FUNCSTAK_FUNCNAME];
-    long            fcntstack[MAXNB_FUNCSTACK]; // function call count
-    int             linestack[MAXNB_FUNCSTACK]; // caller line number
+    char funcstack[MAXNB_FUNCSTACK][STRINGMAXLEN_FUNCSTAK_FUNCNAME];
+    long fcntstack[MAXNB_FUNCSTACK]; // function call count
+    int linestack[MAXNB_FUNCSTACK];  // caller line number
 
-    char            msg[STRINGMAXLEN_FUNCTIONARGS]; // user message
+    char msg[STRINGMAXLEN_FUNCTIONARGS]; // user message
     struct timespec time;
 } CODETESTPOINT;
 
 // number of entries stored in testpoint trace array
-#define CODETESTPOINTARRAY_NBCNT  100000
+#define CODETESTPOINTARRAY_NBCNT 100000
 
 // THIS IS WHERE EVERYTHING THAT NEEDS TO BE WIDELY ACCESSIBLE GETS STORED
 typedef struct
 {
     char package_name[100];
-    int  package_version_major;
-    int  package_version_minor;
-    int  package_version_patch;
+    int package_version_major;
+    int package_version_minor;
+    int package_version_patch;
     char package_version[100];
     char configdir[STRINGMAXLEN_DIRNAME];
     char sourcedir[STRINGMAXLEN_DIRNAME];
@@ -377,7 +339,6 @@ typedef struct
     char shmdir[STRINGMAXLEN_DIRNAME];
     char shmsemdirname[STRINGMAXLEN_DIRNAME]; // same ad above with .s instead of /s
 
-
     // SIGNALS
     // =================================================
 
@@ -393,8 +354,6 @@ typedef struct
     int signal_HUP;
     int signal_PIPE;
 
-
-
     // TEST POINTS
     // =================================================
     // can be used to trace program execution for runtime profiling and debugging
@@ -411,7 +370,6 @@ typedef struct
     // Index counter, indicates position of last written testpoint in circ buffer
     uint64_t testpointcnt;
 
-
     /*int    testpoint_line;
     char   testpoint_file[STRINGMAXLEN_FULLFILENAME];
     char   testpoint_func[STRINGMAXLEN_FUNCTIONNAME];
@@ -419,13 +377,10 @@ typedef struct
     struct timespec testpoint_time;
     */
 
-
-
-    int progStatus;  // main program status
+    int progStatus; // main program status
     // 0: before automatic loading of shared objects
     // 1: after automatic loading of shared objects
 
-
     // REAL-TIME PRIO
     // =================================================
 
@@ -438,174 +393,152 @@ typedef struct
     // when root privileges needed, we set euid <- suid
     // when reverting to user privileges : euid <- ruid
 
-
     // OPERATION MODE
     // =================================================
 
-    int            Debug;
-    int            quiet;
-
-    int            errorexit;       // exit on error
-    int            exitcode;        // CLI exit code
+    int Debug;
+    int quiet;
 
-    int            overwrite;		// automatically overwrite FITS files
-    int            rmSHMfile;       // remove shared memory files upon delete
-    double         INVRANDMAX;
-    gsl_rng       *rndgen;		// random number generator
-    int            precision;		// default precision: 0 for float, 1 for double
+    int errorexit; // exit on error
+    int exitcode;  // CLI exit code
 
+    int overwrite; // automatically overwrite FITS files
+    int rmSHMfile; // remove shared memory files upon delete
+    double INVRANDMAX;
+    gsl_rng *rndgen; // random number generator
+    int precision;   // default precision: 0 for float, 1 for double
 
     // LOGGING, PROCESS MONITORING
     // =================================================
 
-    int            CLIloopON;
-    int            CLIlogON;
-    char           CLIlogname[200];
-    int            processinfo;       // 1 if processes info is to be logged
-    int            processinfoActive; // 1 is the process is currently logged
-    PROCESSINFO   *pinfo;             // pointer to process info structure
-
-
+    int CLIloopON;
+    int CLIlogON;
+    char CLIlogname[200];
+    int processinfo;       // 1 if processes info is to be logged
+    int processinfoActive; // 1 is the process is currently logged
+    PROCESSINFO *pinfo;    // pointer to process info structure
 
     // COMMAND LINE INTERFACE (CLI)
     // =================================================
 
-    int            fifoON;
-    char           processname[100];
-    char           processname0[100];
-    int            processnameflag;
-    char           fifoname[STRINGMAXLEN_FULLFILENAME];
-    uint32_t       NBcmd;
+    int fifoON;
+    char processname[100];
+    char processname0[100];
+    int processnameflag;
+    char fifoname[STRINGMAXLEN_FULLFILENAME];
+    uint32_t NBcmd;
 
-    CMD            cmd[DATA_NB_MAX_COMMAND];
+    CMD cmd[DATA_NB_MAX_COMMAND];
 
-    char           CLIcmdline[STRINGMAXLEN_CLICMDLINE];
-    int            CLIexecuteCMDready;
-    int            CLImatchMode;
+    char CLIcmdline[STRINGMAXLEN_CLICMDLINE];
+    int CLIexecuteCMDready;
+    int CLImatchMode;
     // 1 if error, 0 otherwise
-    int            parseerror;
+    int parseerror;
     // number of arguments in last command line
-    long           cmdNBarg;
-    CMDARGTOKEN    cmdargtoken[NB_ARG_MAX];
+    long cmdNBarg;
+    CMDARGTOKEN cmdargtoken[NB_ARG_MAX];
 
     // when command is found in command line, holds index of command
-    long           cmdindex;
+    long cmdindex;
     // used to create temporary images
-    long           calctmp_imindex;
+    long calctmp_imindex;
     // 0 if command has not been executed, 1 otherwise
-    int            CMDexecuted;
+    int CMDexecuted;
     // 0 if command successfull, 1+ otherwise
-    errno_t        CMDerrstatus;
-
+    errno_t CMDerrstatus;
 
     // MODULES
     // =================================================
 
-    long           NBmodule;
+    long NBmodule;
     //long           NB_MAX_MODULE;
 
     // module info gets sorted into module structure
-    MODULE         module[DATA_NB_MAX_MODULE];
+    MODULE module[DATA_NB_MAX_MODULE];
 
     // temporary storage
-    long           moduleindex;
-    int            moduletype;
-    char           modulename[STRINGMAXLEN_MODULE_NAME];
-    char           moduleloadname[STRINGMAXLEN_MODULE_LOADNAME];
-    char           modulesofilename[STRINGMAXLEN_MODULE_SOFILENAME];
-    char           moduleshortname[STRINGMAXLEN_MODULE_SHORTNAME];
-    char           moduleshortname_default[STRINGMAXLEN_MODULE_SHORTNAME];
-    char           moduledatestring[STRINGMAXLEN_MODULE_DATESTRING];
-    char           moduletimestring[STRINGMAXLEN_MODULE_TIMESTRING];
-
+    long moduleindex;
+    int moduletype;
+    char modulename[STRINGMAXLEN_MODULE_NAME];
+    char moduleloadname[STRINGMAXLEN_MODULE_LOADNAME];
+    char modulesofilename[STRINGMAXLEN_MODULE_SOFILENAME];
+    char moduleshortname[STRINGMAXLEN_MODULE_SHORTNAME];
+    char moduleshortname_default[STRINGMAXLEN_MODULE_SHORTNAME];
+    char moduledatestring[STRINGMAXLEN_MODULE_DATESTRING];
+    char moduletimestring[STRINGMAXLEN_MODULE_TIMESTRING];
 
     // FUNCTION PARAMETER STRUCTURES (FPSs)
     // =================================================
 
     // array of FPSs
-    long           NB_MAX_FPS;
+    long NB_MAX_FPS;
     FUNCTION_PARAMETER_STRUCT *fpsarray;
 
-
     // Function parameter structure (FPS) CLI integration
     // These entries are set when CLI process links to FPS
     FUNCTION_PARAMETER_STRUCT *fpsptr;
-    char           FPS_name[STRINGMAXLEN_FPS_NAME]; // name of FPS if in use
+    char FPS_name[STRINGMAXLEN_FPS_NAME]; // name of FPS if in use
     // Which type of FPS process is the current process ?
     // conf, run, ctrl
-    char
-    FPS_PROCESS_TYPE[STRINGMAXLEN_FPSPROCESSTYPE]; // included in log file name
-    long           FPS_TIMESTAMP;     // included in log file name
-    uint32_t       FPS_CMDCODE;       // current FPS mode
-    errno_t (*FPS_CONFfunc)();        // pointer to FPS conf function
-    errno_t (*FPS_RUNfunc)();         // pointer to FPS run function
-
-
-
+    char FPS_PROCESS_TYPE[STRINGMAXLEN_FPSPROCESSTYPE]; // included in log file name
+    long FPS_TIMESTAMP;                                 // included in log file name
+    uint32_t FPS_CMDCODE;                               // current FPS mode
+    errno_t (*FPS_CONFfunc)();                          // pointer to FPS conf function
+    errno_t (*FPS_RUNfunc)();                           // pointer to FPS run function
 
     // IMAGES
     // =================================================
-    long           NB_MAX_IMAGE;
+    long NB_MAX_IMAGE;
 #ifdef DATA_STATIC_ALLOC
     // image static allocation mode
-    IMAGE          image[STATIC_NB_MAX_IMAGE];
+    IMAGE image[STATIC_NB_MAX_IMAGE];
 #else
-    IMAGE         *image;
+    IMAGE *image;
 #endif
-    int            MEM_MONITOR; // memory monitor enabled ?
+    int MEM_MONITOR; // memory monitor enabled ?
 
     // shared memory default
-    int            SHARED_DFT;
+    int SHARED_DFT;
 
     // Number of keyword per image default
-    int            NBKEYWORD_DFT;
-
-
+    int NBKEYWORD_DFT;
 
     // VARIABLES
     // =================================================
 
-    long           NB_MAX_VARIABLE;
+    long NB_MAX_VARIABLE;
 #ifdef DATA_STATIC_ALLOC
     // variable static allocation mode
     VARIABLE variable[STATIC_NB_MAX_VARIABLE];
 #else
-    VARIABLE      *variable;
+    VARIABLE *variable;
 #endif
 
-
-
-
-
     // CONVENIENCE STORAGE
     // =================================================
-    float          FLOATARRAY[1000];	// array to store temporary variables
-    double         DOUBLEARRAY[1000];    // for convenience
-    char           SAVEDIR[STRINGMAXLEN_DIRNAME];
+    float FLOATARRAY[1000];   // array to store temporary variables
+    double DOUBLEARRAY[1000]; // for convenience
+    char SAVEDIR[STRINGMAXLEN_DIRNAME];
 
     // gen purpose return value
     // used for system commands
-    int            retvalue;
+    int retvalue;
 
     // status counter (used for profiling)
-    int            status0;
-    int            status1;
+    int status0;
+    int status1;
 
 } DATA;
 
-
 extern DATA data;
 
 #include "CommandLineInterface/CLIcore_utils.h"
 
-
-
-
 errno_t set_signal_catch();
 
 void sig_handler(int signo);
 
-
 /*
 errno_t RegisterModule(
     const char *restrict FileName,
@@ -633,10 +566,6 @@ errno_t runCLI(int argc, char *argv[], char *promptstring);
 
 errno_t CLI_execute_line();
 
-
-
-
-
 errno_t write_process_log();
 
 #endif
diff --git a/src/CommandLineInterface/CLIcore_UI.c b/src/CommandLineInterface/CLIcore_UI.c
index de0f1b54..3a9533b2 100644
--- a/src/CommandLineInterface/CLIcore_UI.c
+++ b/src/CommandLineInterface/CLIcore_UI.c
@@ -5,47 +5,35 @@
  *
  */
 
-
-
-#include <stdio.h>
-#include <readline/readline.h>
 #include <readline/history.h>
-
+#include <readline/readline.h>
+#include <stdio.h>
 
 #include "CommandLineInterface/CLIcore.h"
 #include "CommandLineInterface/calc.h"
 #include "CommandLineInterface/calc_bison.h"
 
-
 #include "COREMOD_memory/COREMOD_memory.h"
 #include "timeutils.h"
 
-
 #define CLICOMPLETIONMODE_COMMANDS 0
-#define CLICOMPLETIONMODE_IMAGES   1
-#define CLICOMPLETIONMODE_CMDARGS  2
-
-
-#define COLORRESET   "\033[0m"
-#define COLORRED     "\033[31m"      /* Red */
-#define COLORHBOLDCYAN    "\e[0;96m"      /* High Intensity Bold Cyan */
-
+#define CLICOMPLETIONMODE_IMAGES 1
+#define CLICOMPLETIONMODE_CMDARGS 2
 
+#define COLORRESET "\033[0m"
+#define COLORRED "\033[31m"       /* Red */
+#define COLORHBOLDCYAN "\e[0;96m" /* High Intensity Bold Cyan */
 
 extern void yy_scan_string(const char *);
 extern int yylex_destroy(void);
 
-
-
-
-
 /**
  * @brief Readline callback
  *
  **/
 void rl_cb_linehandler(char *linein)
 {
-    if(NULL == linein)
+    if (NULL == linein)
     {
         return;
     }
@@ -59,28 +47,19 @@ void rl_cb_linehandler(char *linein)
     free(linein);
 }
 
-
-
-
-
-errno_t runCLI_prompt(
-    char *promptstring,
-    char *prompt
-)
+errno_t runCLI_prompt(char *promptstring, char *prompt)
 {
     //int color_cyan = 36;
 
-
-    if(strlen(promptstring) > 0)
+    if (strlen(promptstring) > 0)
     {
-        if(data.processnameflag == 0)
+        if (data.processnameflag == 0)
         {
             sprintf(prompt, COLORHBOLDCYAN "%s > " COLORRESET, promptstring);
         }
         else
         {
-            sprintf(prompt, COLORHBOLDCYAN "%s-%s > " COLORRESET, promptstring,
-                    data.processname);
+            sprintf(prompt, COLORHBOLDCYAN "%s-%s > " COLORRESET, promptstring, data.processname);
         }
     }
     else
@@ -91,20 +70,12 @@ errno_t runCLI_prompt(
     return RETURN_SUCCESS;
 }
 
-
-
-
-
-
-
-
-
 static void *xmalloc(int size)
 {
     void *buf;
 
     buf = malloc(size);
-    if(!buf)
+    if (!buf)
     {
         fprintf(stderr, COLORRED "Error: Out of memory. Exiting.'n" COLORRESET);
         exit(1);
@@ -113,71 +84,61 @@ static void *xmalloc(int size)
     return buf;
 }
 
-
-
 static char *dupstr(char *s)
 {
     char *r;
 
-    r = (char *) xmalloc((strlen(s) + 1));
+    r = (char *)xmalloc((strlen(s) + 1));
     strcpy(r, s);
     return (r);
 }
 
-
-
-
-static char *CLI_generator(
-    const char *text,
-    int         state
-)
+static char *CLI_generator(const char *text, int state)
 {
     static unsigned int list_index;
     static unsigned int list_index1;
     static unsigned int len;
-    char      *name;
+    char *name;
 
     //printf("[generator %d %d %d]\n", state, data.CLImatchMode, list_index);
 
-    if(!state)
+    if (!state)
     {
         list_index = 0;
         list_index1 = 0;
         len = strlen(text);
     }
 
-    if(data.CLImatchMode ==
-            CLICOMPLETIONMODE_COMMANDS)
+    if (data.CLImatchMode == CLICOMPLETIONMODE_COMMANDS)
     {
         // search through list of commands
-        while(list_index < data.NBcmd)
+        while (list_index < data.NBcmd)
         {
             name = data.cmd[list_index].key;
             list_index++;
-            if(strncmp(name, text, len) == 0)
+            if (strncmp(name, text, len) == 0)
             {
                 return (dupstr(name));
             }
         }
     }
 
-    if(data.CLImatchMode ==
-            CLICOMPLETIONMODE_IMAGES)
+    if (data.CLImatchMode == CLICOMPLETIONMODE_IMAGES)
     {
         // search through list of images
-        while(list_index1 < data.NB_MAX_IMAGE)
+        while (list_index1 < data.NB_MAX_IMAGE)
         {
             int iok;
             iok = data.image[list_index1].used;
-            if(iok == 1)
+            if (iok == 1)
             {
                 name = data.image[list_index1].name;
                 //	  printf("  name %d = %s %s\n", list_index1, data.image[list_index1].name, name);
             }
             list_index1++;
-            if(iok == 1)
+            if (iok == 1)
             {
-                if(strncmp(name, text, len) == 0)
+                if (strncmp(name, text, len) == 0)
                 {
                     return (dupstr(name));
                 }
@@ -185,39 +146,29 @@ static char *CLI_generator(
         }
     }
 
-    if(data.CLImatchMode ==
-            CLICOMPLETIONMODE_CMDARGS)
+    if (data.CLImatchMode == CLICOMPLETIONMODE_CMDARGS)
     {
         // search through command arguments and parameters
-        while((int) list_index < data.cmd[data.cmdindex].nbarg)
+        while ((int)list_index < data.cmd[data.cmdindex].nbarg)
         {
             name = data.cmd[data.cmdindex].argdata[list_index].fpstag;
             list_index++;
-            if(strncmp(name, text, len) == 0)
+            if (strncmp(name, text, len) == 0)
             {
                 return (dupstr(name));
             }
         }
     }
 
-
     return ((char *)NULL);
-
 }
 
-
-
-
 /** @brief readline custom completion
  *
  * Invoked when pressing TAB
  */
 
-char **CLI_completion(
-    const char *text,
-    int start,
-    int __attribute__((unused)) end
-)
+char **CLI_completion(const char *text, int start, int __attribute__((unused)) end)
 {
     char **matches;
 
@@ -228,7 +179,7 @@ char **CLI_completion(
 
     matches = (char **)NULL;
 
-    if((start == 0) || (strncmp(rl_line_buffer, "cmd?", strlen("cmd?")) == 0))
+    if ((start == 0) || (strncmp(rl_line_buffer, "cmd?", strlen("cmd?")) == 0))
     {
         // if first word, or second argument to cmd?, match string with commands
         data.CLImatchMode = CLICOMPLETIONMODE_COMMANDS;
@@ -242,9 +193,9 @@ char **CLI_completion(
         strtok(str, " ");
         int cmdimatch = -1;
         uint32_t cmdi = 0;
-        while((cmdimatch == -1) && (cmdi < data.NBcmd))
+        while ((cmdimatch == -1) && (cmdi < data.NBcmd))
         {
-            if(strcmp(firstword, data.cmd[cmdi].key) == 0)
+            if (strcmp(firstword, data.cmd[cmdi].key) == 0)
             {
                 cmdimatch = cmdi;
                 //printf("COMMAND MATCH %s\n", data.cmd[cmdi].key);
@@ -253,7 +204,7 @@ char **CLI_completion(
             cmdi++;
         }
 
-        if((cmdimatch != -1) && (text[0] == '.'))
+        if ((cmdimatch != -1) && (text[0] == '.'))
         {
             data.CLImatchMode = CLICOMPLETIONMODE_CMDARGS;
         }
@@ -270,39 +221,28 @@ char **CLI_completion(
     //  rl_bind_key('\t',rl_abort);
 
     return (matches);
-
 }
 
-
-
-
-
-
-
 errno_t write_tracedebugfile()
 {
     pid_t thisPID = getpid();
 
     char fname[STRINGMAXLEN_FILENAME];
-    WRITE_FILENAME(
-        fname,
-        "milk-codetracepoint.%05d.log",
-        thisPID
-    );
+    WRITE_FILENAME(fname, "milk-codetracepoint.%05d.log", thisPID);
 
     printf("Writing output trace to file %s\n", fname);
     printf("data.testpointarrayinit = %d\n", data.testpointarrayinit);
 
-    FILE * fp = fopen(fname, "w");
-    if(fp != NULL)
+    FILE *fp = fopen(fname, "w");
+    if (fp != NULL)
     {
-        for(uint64_t i=0; i<CODETESTPOINTARRAY_NBCNT; i++)
+        for (uint64_t i = 0; i < CODETESTPOINTARRAY_NBCNT; i++)
         {
             long j = (i + data.testpointcnt) % CODETESTPOINTARRAY_NBCNT;
 
-            uint64_t index = data.testpointarray[j].loopcnt*CODETESTPOINTARRAY_NBCNT+j;
+            uint64_t index = data.testpointarray[j].loopcnt * CODETESTPOINTARRAY_NBCNT + j;
 
-            if(data.testpointarray[j].line != 0)
+            if (data.testpointarray[j].line != 0)
             {
                 char timestring[20];
                 mkUTtimestring_nanosec(timestring, data.testpointarray[j].time);
@@ -312,27 +252,13 @@ errno_t write_tracedebugfile()
                 strcpy(str, data.testpointarray[j].file);
                 char *lastword = strrchr(str, '/') + 1;
 
-
-                fprintf(
-                    fp,
-                    "T %6ld %s %-20s %6d %-20s  %s\n",
-                    index,
-                    timestring,
-                    lastword,
-                    data.testpointarray[j].line,
-                    data.testpointarray[j].func,
-                    data.testpointarray[j].msg
-                );
-                fprintf(
-                    fp,
-                    "       FTRACE %d ", data.testpointarray[j].funclevel
-                );
-                for(int level = 0; level < data.testpointarray[j].funclevel; level++)
+                fprintf(fp, "T %6ld %s %-20s %6d %-20s  %s\n", index, timestring, lastword, data.testpointarray[j].line,
+                        data.testpointarray[j].func, data.testpointarray[j].msg);
+                fprintf(fp, "       FTRACE %d ", data.testpointarray[j].funclevel);
+                for (int level = 0; level < data.testpointarray[j].funclevel; level++)
                 {
-                    fprintf(fp, " (%d) >> %ld:%s",
-                            data.testpointarray[j].linestack[level],
-                            data.testpointarray[j].fcntstack[level],
-                            data.testpointarray[j].funcstack[level]);
+                    fprintf(fp, " (%d) >> %ld:%s", data.testpointarray[j].linestack[level],
+                            data.testpointarray[j].fcntstack[level], data.testpointarray[j].funcstack[level]);
                 }
                 fprintf(fp, "\n\n");
 
@@ -345,37 +271,33 @@ errno_t write_tracedebugfile()
     return RETURN_SUCCESS;
 }
 
-
-
 errno_t CLI_execute_line()
 {
     DEBUG_TRACE_FSTART();
 
-    char   *cmdargstring;
-    char    str[200];
-    FILE   *fp;
-    time_t  t;
-    struct  tm *uttime;
-    struct  timespec *thetime = (struct timespec *)malloc(sizeof(struct timespec));
-
-
+    char *cmdargstring;
+    char str[200];
+    FILE *fp;
+    time_t t;
+    struct tm *uttime;
+    struct timespec *thetime = (struct timespec *)malloc(sizeof(struct timespec));
 
     add_history(data.CLIcmdline);
 
     //
     // If line starts with !, use system()
     //
-    if(data.CLIcmdline[0] == '!')
+    if (data.CLIcmdline[0] == '!')
     {
         data.CLIcmdline[0] = ' ';
-        if(system(data.CLIcmdline) != 0)
+        if (system(data.CLIcmdline) != 0)
         {
             PRINT_ERROR("system call error");
             exit(4);
         }
         data.CMDexecuted = 1;
     }
-    else if(data.CLIcmdline[0] == '#')
+    else if (data.CLIcmdline[0] == '#')
     {
         // do nothing... this is a comment
         data.CMDexecuted = 1;
@@ -385,66 +307,42 @@ errno_t CLI_execute_line()
         // some initialization
         data.parseerror = 0;
         data.calctmp_imindex = 0;
-        for(int i = 0; i < NB_ARG_MAX; i++)
+        for (int i = 0; i < NB_ARG_MAX; i++)
         {
             data.cmdargtoken[i].type = CMDARGTOKEN_TYPE_UNSOLVED;
             data.cmdargtoken[i].val.string[0] = '\0';
         }
 
-
         // log command if CLIlogON active
-        if(data.CLIlogON == 1)
+        if (data.CLIlogON == 1)
         {
             t = time(NULL);
             uttime = gmtime(&t);
             clock_gettime(CLOCK_REALTIME, thetime);
 
-            sprintf(data.CLIlogname,
-                    "%s/logdir/%04d%02d%02d/%04d%02d%02d_CLI-%s.log",
-                    getenv("HOME"),
-                    1900 + uttime->tm_year,
-                    1 + uttime->tm_mon,
-                    uttime->tm_mday,
-                    1900 + uttime->tm_year,
-                    1 + uttime->tm_mon,
-                    uttime->tm_mday,
-                    data.processname);
+            sprintf(data.CLIlogname, "%s/logdir/%04d%02d%02d/%04d%02d%02d_CLI-%s.log", getenv("HOME"),
+                    1900 + uttime->tm_year, 1 + uttime->tm_mon, uttime->tm_mday, 1900 + uttime->tm_year,
+                    1 + uttime->tm_mon, uttime->tm_mday, data.processname);
 
             fp = fopen(data.CLIlogname, "a");
-            if(fp == NULL)
+            if (fp == NULL)
             {
                 printf("ERROR: cannot log into file %s\n", data.CLIlogname);
-                EXECUTE_SYSTEM_COMMAND(
-                    "mkdir -p %s/logdir/%04d%02d%02d\n",
-                    getenv("HOME"),
-                    1900 + uttime->tm_year,
-                    1 + uttime->tm_mon,
-                    uttime->tm_mday);
+                EXECUTE_SYSTEM_COMMAND("mkdir -p %s/logdir/%04d%02d%02d\n", getenv("HOME"), 1900 + uttime->tm_year,
+                                       1 + uttime->tm_mon, uttime->tm_mday);
             }
             else
             {
-                fprintf(fp,
-                        "%04d/%02d/%02d %02d:%02d:%02d.%09ld %10s %6ld %s\n",
-                        1900 + uttime->tm_year,
-                        1 + uttime->tm_mon,
-                        uttime->tm_mday,
-                        uttime->tm_hour,
-                        uttime->tm_min,
-                        uttime->tm_sec,
-                        thetime->tv_nsec,
-                        data.processname,
-                        (long) getpid(),
-                        data.CLIcmdline);
+                fprintf(fp, "%04d/%02d/%02d %02d:%02d:%02d.%09ld %10s %6ld %s\n", 1900 + uttime->tm_year,
+                        1 + uttime->tm_mon, uttime->tm_mday, uttime->tm_hour, uttime->tm_min, uttime->tm_sec,
+                        thetime->tv_nsec, data.processname, (long)getpid(), data.CLIcmdline);
                 fclose(fp);
             }
         }
 
-
-
         //
         data.cmdNBarg = 0;
 
-
         // extract first word
 
         // First, split double-quote strings out
@@ -455,22 +353,22 @@ errno_t CLI_execute_line()
 
         char *tokengroup;
         char *rest = str1;
-        if(str1[0] == '\"')
+        if (str1[0] == '\"')
         {
             rawstringmode = 1;
         }
 
-        while((tokengroup = strtok_r(rest, "\"", &rest)))
+        while ((tokengroup = strtok_r(rest, "\"", &rest)))
         {
             //printf(" TOKEN [%d]:  %s\n", rawstringmode, tokengroup);
 
             // always copy word in string, so that arg can be processed as string if needed
             //strcpy(data.cmdargtoken[data.cmdNBarg].val.string, cmdargstring);
 
-            if(rawstringmode == 0) // not in a raw string, process tokengroup
+            if (rawstringmode == 0) // not in a raw string, process tokengroup
             {
                 cmdargstring = strtok(tokengroup, " ");
-                while(cmdargstring != NULL)   // iterate on words
+                while (cmdargstring != NULL) // iterate on words
                 {
                     // printf("\t processing -- %s\n", cmdargstring);
                     sprintf(str, "%s\n", cmdargstring);
@@ -494,76 +392,64 @@ errno_t CLI_execute_line()
         }
         data.cmdargtoken[data.cmdNBarg].type = CMDARGTOKEN_TYPE_UNSOLVED;
 
-
-
-
-        if(data.Debug == 1)
+        if (data.Debug == 1)
         {
-            long  i = 0;
-            while(data.cmdargtoken[i].type != 0)
+            long i = 0;
+            while (data.cmdargtoken[i].type != 0)
             {
 
-                printf("TOKEN %ld/%ld   \"%s\"  type : %d\n", i, data.cmdNBarg,
-                       data.cmdargtoken[i].val.string, data.cmdargtoken[i].type);
-                if(data.cmdargtoken[i].type == CMDARGTOKEN_TYPE_FLOAT)   // double
+                printf("TOKEN %ld/%ld   \"%s\"  type : %d\n", i, data.cmdNBarg, data.cmdargtoken[i].val.string,
+                       data.cmdargtoken[i].type);
+                if (data.cmdargtoken[i].type == CMDARGTOKEN_TYPE_FLOAT) // double
                 {
-                    printf("\t CMDARGTOKEN_TYPE_FLOAT           : %g\n",
-                           data.cmdargtoken[i].val.numf);
+                    printf("\t CMDARGTOKEN_TYPE_FLOAT           : %g\n", data.cmdargtoken[i].val.numf);
                 }
-                if(data.cmdargtoken[i].type == CMDARGTOKEN_TYPE_LONG)   // long
+                if (data.cmdargtoken[i].type == CMDARGTOKEN_TYPE_LONG) // long
                 {
-                    printf("\t CMDARGTOKEN_TYPE_LONG           : %ld\n",
-                           data.cmdargtoken[i].val.numl);
+                    printf("\t CMDARGTOKEN_TYPE_LONG           : %ld\n", data.cmdargtoken[i].val.numl);
                 }
-                if(data.cmdargtoken[i].type == CMDARGTOKEN_TYPE_STRING)   // new variable/image
+                if (data.cmdargtoken[i].type == CMDARGTOKEN_TYPE_STRING) // new variable/image
                 {
-                    printf("\t CMDARGTOKEN_TYPE_STRING        : %s\n",
-                           data.cmdargtoken[i].val.string);
+                    printf("\t CMDARGTOKEN_TYPE_STRING        : %s\n", data.cmdargtoken[i].val.string);
                 }
-                if(data.cmdargtoken[i].type ==
-                        CMDARGTOKEN_TYPE_EXISTINGIMAGE)   // existing image
+                if (data.cmdargtoken[i].type == CMDARGTOKEN_TYPE_EXISTINGIMAGE) // existing image
                 {
-                    printf("\t CMDARGTOKEN_TYPE_EXISTINGIMAGE : %s\n",
-                           data.cmdargtoken[i].val.string);
+                    printf("\t CMDARGTOKEN_TYPE_EXISTINGIMAGE : %s\n", data.cmdargtoken[i].val.string);
                 }
-                if(data.cmdargtoken[i].type == CMDARGTOKEN_TYPE_COMMAND)   // command
+                if (data.cmdargtoken[i].type == CMDARGTOKEN_TYPE_COMMAND) // command
                 {
-                    printf("\t CMDARGTOKEN_TYPE_COMMAND       : %s\n",
-                           data.cmdargtoken[i].val.string);
+                    printf("\t CMDARGTOKEN_TYPE_COMMAND       : %s\n", data.cmdargtoken[i].val.string);
                 }
-                if(data.cmdargtoken[i].type ==
-                        CMDARGTOKEN_TYPE_RAWSTRING)   // unprocessed string
+                if (data.cmdargtoken[i].type == CMDARGTOKEN_TYPE_RAWSTRING) // unprocessed string
                 {
-                    printf("\t CMDARGTOKEN_TYPE_RAWSTRING    : %s\n",
-                           data.cmdargtoken[i].val.string);
+                    printf("\t CMDARGTOKEN_TYPE_RAWSTRING    : %s\n", data.cmdargtoken[i].val.string);
                 }
 
                 i++;
             }
         }
 
-        if(data.parseerror == 0)
+        if (data.parseerror == 0)
         {
-            if(data.cmdargtoken[0].type == CMDARGTOKEN_TYPE_COMMAND)
+            if (data.cmdargtoken[0].type == CMDARGTOKEN_TYPE_COMMAND)
             {
-                if(data.Debug == 1)
+                if (data.Debug == 1)
                 {
-                    printf("EXECUTING COMMAND %ld (%s)\n", data.cmdindex,
-                           data.cmd[data.cmdindex].key);
+                    printf("EXECUTING COMMAND %ld (%s)\n", data.cmdindex, data.cmd[data.cmdindex].key);
                 }
                 // Execute CLI command
                 data.CMDerrstatus = data.cmd[data.cmdindex].fp();
 
-                if(data.CMDerrstatus != RETURN_SUCCESS)
+                if (data.CMDerrstatus != RETURN_SUCCESS)
                 {
                     // CLI function returns error
                     // print function key name and error code
-                    printf("\n%c[%d;%dm ERROR %c[%d;m CLI function %s returns %d\n",
-                           (char) 27, 1, 31, (char) 27, 0, data.cmd[data.cmdindex].key, data.CMDerrstatus);
+                    printf("\n%c[%d;%dm ERROR %c[%d;m CLI function %s returns %d\n", (char)27, 1, 31, (char)27, 0,
+                           data.cmd[data.cmdindex].key, data.CMDerrstatus);
 
-                    if(data.errorexit == 1)
+                    if (data.errorexit == 1)
                     {
-                        printf("%c[%d;%dm -> EXIT CLI %c[%d;m\n", (char) 27, 1, 31, (char) 27, 0);
+                        printf("%c[%d;%dm -> EXIT CLI %c[%d;m\n", (char)27, 1, 31, (char)27, 0);
                         data.exitcode = data.CMDerrstatus;
 
 #ifndef NDEBUG
@@ -577,13 +463,13 @@ errno_t CLI_execute_line()
             }
         }
 
-        for(int i = 0; i < data.calctmp_imindex; i++)
+        for (int i = 0; i < data.calctmp_imindex; i++)
         {
             CREATE_IMAGENAME(calctmpimname, "_tmpcalc%d", i);
             //sprintf(calctmpimname, "_tmpcalc%ld", i);
-            if(image_ID(calctmpimname) != -1)
+            if (image_ID(calctmpimname) != -1)
             {
-                if(data.Debug == 1)
+                if (data.Debug == 1)
                 {
                     printf("Deleting %s\n", calctmpimname);
                 }
@@ -591,21 +477,18 @@ errno_t CLI_execute_line()
             }
         }
 
-
-        if(!((data.cmdargtoken[0].type == CMDARGTOKEN_TYPE_STRING)
-                || (data.cmdargtoken[0].type == CMDARGTOKEN_TYPE_RAWSTRING)))
+        if (!((data.cmdargtoken[0].type == CMDARGTOKEN_TYPE_STRING) ||
+              (data.cmdargtoken[0].type == CMDARGTOKEN_TYPE_RAWSTRING)))
         {
             data.CMDexecuted = 1;
         }
-
     }
 
-    if((data.CMDexecuted == 0) && (data.CLIloopON == 1))
+    if ((data.CMDexecuted == 0) && (data.CLIloopON == 1))
     {
         printf(COLORRED "Command not found, or command with no effect\n" COLORRESET);
     }
 
-
     free(thetime);
 
     DEBUG_TRACE_FEXIT();
diff --git a/src/CommandLineInterface/CLIcore_UI.h b/src/CommandLineInterface/CLIcore_UI.h
index 04a9855c..82362b00 100644
--- a/src/CommandLineInterface/CLIcore_UI.h
+++ b/src/CommandLineInterface/CLIcore_UI.h
@@ -10,20 +10,12 @@
 
 #define CLICORE_UI_H
 
-
-
 void rl_cb_linehandler(char *linein);
 
-
-errno_t runCLI_prompt(
-    char *promptstring,
-    char *prompt
-);
-
+errno_t runCLI_prompt(char *promptstring, char *prompt);
 
 char **CLI_completion(const char *, int, int);
 
-
 errno_t CLI_execute_line();
 
 errno_t write_tracedebugfile();
diff --git a/src/CommandLineInterface/CLIcore_checkargs.c b/src/CommandLineInterface/CLIcore_checkargs.c
index d2bd3751..d294c5a1 100644
--- a/src/CommandLineInterface/CLIcore_checkargs.c
+++ b/src/CommandLineInterface/CLIcore_checkargs.c
@@ -11,12 +11,10 @@
 
 #include "COREMOD_memory/COREMOD_memory.h"
 
-
 static int argcheck_process_flag = 1; // keep processing if 1
 
 static int functionhelp_called = 0; // toggles to 1 if function help called
 
-
 /**
  * @brief check that input CLI argument matches required argument type
  *
@@ -25,11 +23,7 @@ static int functionhelp_called = 0; // toggles to 1 if function help called
  * @param errmsg    error message printing flag (1 if printing errors)
  * @return int
  */
-static int CLI_checkarg0(
-    int argnum,
-    uint32_t argtype,
-    int errmsg
-)
+static int CLI_checkarg0(int argnum, uint32_t argtype, int errmsg)
 {
     DEBUG_TRACE_FSTART();
 
@@ -38,7 +32,7 @@ static int CLI_checkarg0(
 
     rval = 2;
 
-    if(strcmp(data.cmdargtoken[argnum].val.string, "?") == 0)
+    if (strcmp(data.cmdargtoken[argnum].val.string, "?") == 0)
     {
         argcheck_process_flag = 0; // stop processing arguments, will call help
         help_command(data.cmdargtoken[0].val.string);
@@ -48,343 +42,301 @@ static int CLI_checkarg0(
         return 1;
     }
 
+    switch (argtype & 0x0000FFFF) // compare lowest 16-bit
+    {
+    case CLIARG_FLOAT: // should be float
+        switch (data.cmdargtoken[argnum].type)
+        {
+        case CLIARG_FLOAT: // is float -> OK
+            data.cmdargtoken[argnum].val.numl = (long)data.cmdargtoken[argnum].val.numf;
+            sprintf(data.cmdargtoken[argnum].val.string, "%f", data.cmdargtoken[argnum].val.numf);
+            rval = 0;
+            break;
 
+        case CLIARG_LONG: // is long -> convert long to float
+            sprintf(data.cmdargtoken[argnum].val.string, "%ld", data.cmdargtoken[argnum].val.numl);
+            data.cmdargtoken[argnum].val.numf = (double)data.cmdargtoken[argnum].val.numl;
+            data.cmdargtoken[argnum].type = CLIARG_FLOAT;
+            rval = 0;
+            break;
 
-    switch(argtype & 0x0000FFFF)   // compare lowest 16-bit
-    {
-        case CLIARG_FLOAT:  // should be float
-            switch(data.cmdargtoken[argnum].type)
+        case CLIARG_STR_NOT_IMG: // is string not image
+            IDv = variable_ID(data.cmdargtoken[argnum].val.string);
+            if (IDv == -1) // if not a variable -> not OK
             {
-                case CLIARG_FLOAT: // is float -> OK
-                    data.cmdargtoken[argnum].val.numl = (long) data.cmdargtoken[argnum].val.numf;
-                    sprintf(data.cmdargtoken[argnum].val.string, "%f",
-                            data.cmdargtoken[argnum].val.numf);
+                if (errmsg == 1)
+                {
+                    printf("arg %d is string (=\"%s\"), but should be integer\n", argnum - 1,
+                           data.cmdargtoken[argnum].val.string);
+                }
+                rval = 1;
+            }
+            else // if variable, read it -> OK
+            {
+                switch (data.variable[IDv].type)
+                {
+                case CLIARG_FLOAT:
+                    data.cmdargtoken[argnum].val.numf = data.variable[IDv].value.f;
+                    data.cmdargtoken[argnum].type = CLIARG_FLOAT;
                     rval = 0;
                     break;
-
-                case CLIARG_LONG: // is long -> convert long to float
-                    sprintf(data.cmdargtoken[argnum].val.string, "%ld",
-                            data.cmdargtoken[argnum].val.numl);
-                    data.cmdargtoken[argnum].val.numf = (double) data.cmdargtoken[argnum].val.numl;
+                case CLIARG_LONG:
+                    data.cmdargtoken[argnum].val.numf = 1.0 * data.variable[IDv].value.l;
                     data.cmdargtoken[argnum].type = CLIARG_FLOAT;
                     rval = 0;
                     break;
-
-                case CLIARG_STR_NOT_IMG: // is string not image
-                    IDv = variable_ID(data.cmdargtoken[argnum].val.string);
-                    if(IDv == -1) // if not a variable -> not OK
-                    {
-                        if(errmsg == 1)
-                        {
-                            printf("arg %d is string (=\"%s\"), but should be integer\n", argnum - 1,
-                                   data.cmdargtoken[argnum].val.string);
-                        }
-                        rval = 1;
-                    }
-                    else // if variable, read it -> OK
+                default:
+                    if (errmsg == 1)
                     {
-                        switch(data.variable[IDv].type)
-                        {
-                            case CLIARG_FLOAT:
-                                data.cmdargtoken[argnum].val.numf = data.variable[IDv].value.f;
-                                data.cmdargtoken[argnum].type = CLIARG_FLOAT;
-                                rval = 0;
-                                break;
-                            case CLIARG_LONG:
-                                data.cmdargtoken[argnum].val.numf = 1.0 * data.variable[IDv].value.l;
-                                data.cmdargtoken[argnum].type = CLIARG_FLOAT;
-                                rval = 0;
-                                break;
-                            default:
-                                if(errmsg == 1)
-                                {
-                                    printf("  arg %d (string \"%s\") not an integer\n", argnum - 1,
-                                           data.cmdargtoken[argnum].val.string);
-                                }
-                                rval = 1;
-                                break;
-                        }
-                    }
-                    break;
-
-                case CLIARG_IMG: // if image -> not OK
-                    if(errmsg == 1)
-                    {
-                        printf("  arg %d (image \"%s\") not a floating point number\n",
-                               argnum - 1, data.cmdargtoken[argnum].val.string);
+                        printf("  arg %d (string \"%s\") not an integer\n", argnum - 1,
+                               data.cmdargtoken[argnum].val.string);
                     }
                     rval = 1;
                     break;
+                }
+            }
+            break;
 
-                case CLIARG_STR:
-                    if(errmsg == 1)
-                    {
-                        printf("  arg %d (command \"%s\") not a floating point number\n",
-                               argnum - 1, data.cmdargtoken[argnum].val.string);
-                    }
-                    rval = 1;
-                    break;
+        case CLIARG_IMG: // if image -> not OK
+            if (errmsg == 1)
+            {
+                printf("  arg %d (image \"%s\") not a floating point number\n", argnum - 1,
+                       data.cmdargtoken[argnum].val.string);
+            }
+            rval = 1;
+            break;
 
-                case 6:
-                    data.cmdargtoken[argnum].val.numf = atof(data.cmdargtoken[argnum].val.string);
-                    sprintf(data.cmdargtoken[argnum].val.string, " ");
-                    data.cmdargtoken[argnum].type = CLIARG_FLOAT;
-                    rval = 0;
-                    break;
+        case CLIARG_STR:
+            if (errmsg == 1)
+            {
+                printf("  arg %d (command \"%s\") not a floating point number\n", argnum - 1,
+                       data.cmdargtoken[argnum].val.string);
             }
+            rval = 1;
             break;
 
+        case 6:
+            data.cmdargtoken[argnum].val.numf = atof(data.cmdargtoken[argnum].val.string);
+            sprintf(data.cmdargtoken[argnum].val.string, " ");
+            data.cmdargtoken[argnum].type = CLIARG_FLOAT;
+            rval = 0;
+            break;
+        }
+        break;
 
+    case CLIARG_LONG: // should be integer
+        switch (data.cmdargtoken[argnum].type)
+        {
 
-        case CLIARG_LONG:  // should be integer
-            switch(data.cmdargtoken[argnum].type)
+        case CLIARG_FLOAT:
+            sprintf(data.cmdargtoken[argnum].val.string, "%f", data.cmdargtoken[argnum].val.numf);
+            if (errmsg == 1)
             {
+                printf("converting floating point arg %d to integer\n", argnum - 1);
+            }
+            data.cmdargtoken[argnum].val.numl = (long)(data.cmdargtoken[argnum].val.numf + 0.5);
+            data.cmdargtoken[argnum].type = CLIARG_LONG;
+            rval = 0;
+            break;
 
-                case CLIARG_FLOAT:
-                    sprintf(data.cmdargtoken[argnum].val.string, "%f",
-                            data.cmdargtoken[argnum].val.numf);
-                    if(errmsg == 1)
-                    {
-                        printf("converting floating point arg %d to integer\n", argnum - 1);
-                    }
-                    data.cmdargtoken[argnum].val.numl = (long)(data.cmdargtoken[argnum].val.numf +
-                                                        0.5);
+        case CLIARG_LONG:
+            sprintf(data.cmdargtoken[argnum].val.string, "%ld", data.cmdargtoken[argnum].val.numl);
+            rval = 0;
+            break;
+
+        case CLIARG_STR_NOT_IMG:
+            IDv = variable_ID(data.cmdargtoken[argnum].val.string);
+            if (IDv == -1)
+            {
+                if (errmsg == 1)
+                {
+                    printf("  arg %d (string \"%s\") not an integer\n", argnum - 1,
+                           data.cmdargtoken[argnum].val.string);
+                }
+                rval = 1;
+            }
+            else
+            {
+                switch (data.variable[IDv].type)
+                {
+                case CLIARG_FLOAT: // double
+                    data.cmdargtoken[argnum].val.numl = (long)(data.variable[IDv].value.f);
                     data.cmdargtoken[argnum].type = CLIARG_LONG;
                     rval = 0;
                     break;
-
-                case CLIARG_LONG:
-                    sprintf(data.cmdargtoken[argnum].val.string, "%ld",
-                            data.cmdargtoken[argnum].val.numl);
+                case CLIARG_LONG: // long
+                    data.cmdargtoken[argnum].val.numl = data.variable[IDv].value.l;
+                    data.cmdargtoken[argnum].type = CLIARG_LONG;
                     rval = 0;
                     break;
-
-                case CLIARG_STR_NOT_IMG:
-                    IDv = variable_ID(data.cmdargtoken[argnum].val.string);
-                    if(IDv == -1)
-                    {
-                        if(errmsg == 1)
-                        {
-                            printf("  arg %d (string \"%s\") not an integer\n", argnum - 1,
-                                   data.cmdargtoken[argnum].val.string);
-                        }
-                        rval = 1;
-                    }
-                    else
-                    {
-                        switch(data.variable[IDv].type)
-                        {
-                            case CLIARG_FLOAT: // double
-                                data.cmdargtoken[argnum].val.numl = (long)(data.variable[IDv].value.f);
-                                data.cmdargtoken[argnum].type = CLIARG_LONG;
-                                rval = 0;
-                                break;
-                            case CLIARG_LONG: // long
-                                data.cmdargtoken[argnum].val.numl = data.variable[IDv].value.l;
-                                data.cmdargtoken[argnum].type = CLIARG_LONG;
-                                rval = 0;
-                                break;
-                            default:
-                                if(errmsg == 1)
-                                {
-                                    printf("  arg %d (string \"%s\") not an integer\n", argnum - 1,
-                                           data.cmdargtoken[argnum].val.string);
-                                }
-                                rval = 1;
-                                break;
-                        }
-                    }
-                    break;
-
-                case CLIARG_IMG:
-                    if(errmsg == 1)
-                    {
-                        printf("  arg %d (image \"%s\") not an integer\n", argnum - 1,
-                               data.cmdargtoken[argnum].val.string);
-                    }
-                    rval = 1;
-                    break;
-
-                case CLIARG_STR:
-                    if(errmsg == 1)
+                default:
+                    if (errmsg == 1)
                     {
-                        printf("  arg %d (command \"%s\") not an integer\n", argnum - 1,
+                        printf("  arg %d (string \"%s\") not an integer\n", argnum - 1,
                                data.cmdargtoken[argnum].val.string);
                     }
                     rval = 1;
                     break;
+                }
             }
             break;
 
-
-        case CLIARG_STR_NOT_IMG:  // should be string, but not image
-            switch(data.cmdargtoken[argnum].type)
+        case CLIARG_IMG:
+            if (errmsg == 1)
             {
-                case CLIARG_FLOAT: // if float -> not OK
-                    sprintf(data.cmdargtoken[argnum].val.string, "%f",
-                            data.cmdargtoken[argnum].val.numf);
-                    if(errmsg == 1)
-                    {
-                        printf("  arg %d (float %f) not a non-img-string\n",
-                               argnum - 1,
-                               data.cmdargtoken[argnum].val.numf);
-                    }
-                    rval = 1;
-                    break;
-
-                case CLIARG_LONG: // if long -> not OK
-                    sprintf(data.cmdargtoken[argnum].val.string, "%ld",
-                            data.cmdargtoken[argnum].val.numl);
-                    if(errmsg == 1)
-                    {
-                        printf("  arg %d (integer %ld) not a non-img-string\n",
-                               argnum - 1,
-                               data.cmdargtoken[argnum].val.numl);
-                    }
-                    rval = 1;
-                    break;
-
-                case CLIARG_STR_NOT_IMG: // OK
-                    rval = 0;
-                    break;
-
-                case CLIARG_IMG: // if image -> not OK
-                    if(errmsg == 1)
-                    {
-                        printf("  arg %d (image %s) not a non-img-string\n", argnum - 1,
-                               data.cmdargtoken[argnum].val.string);
-                    }
-                    rval = 1;
-                    break;
+                printf("  arg %d (image \"%s\") not an integer\n", argnum - 1, data.cmdargtoken[argnum].val.string);
+            }
+            rval = 1;
+            break;
 
-                case CLIARG_STR: // if string -> not OK
-                    printf("arg %d is command (=\"%s\"), but should be string\n", argnum,
-                           data.cmdargtoken[argnum].val.string);
-                    rval = 1;
-                    break;
+        case CLIARG_STR:
+            if (errmsg == 1)
+            {
+                printf("  arg %d (command \"%s\") not an integer\n", argnum - 1, data.cmdargtoken[argnum].val.string);
+            }
+            rval = 1;
+            break;
+        }
+        break;
 
-                case 6:
-                    rval = 0;
-                    break;
+    case CLIARG_STR_NOT_IMG: // should be string, but not image
+        switch (data.cmdargtoken[argnum].type)
+        {
+        case CLIARG_FLOAT: // if float -> not OK
+            sprintf(data.cmdargtoken[argnum].val.string, "%f", data.cmdargtoken[argnum].val.numf);
+            if (errmsg == 1)
+            {
+                printf("  arg %d (float %f) not a non-img-string\n", argnum - 1, data.cmdargtoken[argnum].val.numf);
             }
+            rval = 1;
             break;
 
+        case CLIARG_LONG: // if long -> not OK
+            sprintf(data.cmdargtoken[argnum].val.string, "%ld", data.cmdargtoken[argnum].val.numl);
+            if (errmsg == 1)
+            {
+                printf("  arg %d (integer %ld) not a non-img-string\n", argnum - 1, data.cmdargtoken[argnum].val.numl);
+            }
+            rval = 1;
+            break;
 
+        case CLIARG_STR_NOT_IMG: // OK
+            rval = 0;
+            break;
 
-        case CLIARG_IMG:  // should be existing image
-            switch(data.cmdargtoken[argnum].type)
+        case CLIARG_IMG: // if image -> not OK
+            if (errmsg == 1)
             {
+                printf("  arg %d (image %s) not a non-img-string\n", argnum - 1, data.cmdargtoken[argnum].val.string);
+            }
+            rval = 1;
+            break;
 
-                case CLIARG_FLOAT: // if float -> not OK
-                    sprintf(data.cmdargtoken[argnum].val.string, "%f",
-                            data.cmdargtoken[argnum].val.numf);
-                    if(errmsg == 1)
-                    {
-                        printf("  arg %d (float %f) not an image\n",
-                               argnum - 1,
-                               data.cmdargtoken[argnum].val.numf);
-                    }
-                    rval = 1;
-                    break;
+        case CLIARG_STR: // if string -> not OK
+            printf("arg %d is command (=\"%s\"), but should be string\n", argnum, data.cmdargtoken[argnum].val.string);
+            rval = 1;
+            break;
 
-                case CLIARG_LONG: // if long -> not OK
-                    sprintf(data.cmdargtoken[argnum].val.string, "%ld",
-                            data.cmdargtoken[argnum].val.numl);
-                    if(errmsg == 1)
-                    {
-                        printf("  arg %d (integer %ld) not an image\n",
-                               argnum - 1,
-                               data.cmdargtoken[argnum].val.numl);
-                    }
-                    rval = 1;
-                    break;
+        case 6:
+            rval = 0;
+            break;
+        }
+        break;
 
-                case CLIARG_STR_NOT_IMG: // if string not image -> not OK
-                    if(errmsg == 1)
-                    {
-                        printf("  arg %d (string \"%s\") not an image\n",
-                               argnum - 1,
-                               data.cmdargtoken[argnum].val.string);
-                    }
-                    rval = 1;
-                    break;
+    case CLIARG_IMG: // should be existing image
+        switch (data.cmdargtoken[argnum].type)
+        {
 
-                case CLIARG_IMG: // if image -> OK
-                    rval = 0;
-                    break;
+        case CLIARG_FLOAT: // if float -> not OK
+            sprintf(data.cmdargtoken[argnum].val.string, "%f", data.cmdargtoken[argnum].val.numf);
+            if (errmsg == 1)
+            {
+                printf("  arg %d (float %f) not an image\n", argnum - 1, data.cmdargtoken[argnum].val.numf);
+            }
+            rval = 1;
+            break;
 
-                case CLIARG_STR: // if string -> not OK
-                    if(errmsg == 1)
-                    {
-                        printf("  arg %d (string \"%s\") not an image\n",
-                               argnum - 1,
-                               data.cmdargtoken[argnum].val.string);
-                    }
-                    rval = 1;
-                    break;
+        case CLIARG_LONG: // if long -> not OK
+            sprintf(data.cmdargtoken[argnum].val.string, "%ld", data.cmdargtoken[argnum].val.numl);
+            if (errmsg == 1)
+            {
+                printf("  arg %d (integer %ld) not an image\n", argnum - 1, data.cmdargtoken[argnum].val.numl);
+            }
+            rval = 1;
+            break;
 
-                case 6:
-                    rval = 0;
-                    break;
+        case CLIARG_STR_NOT_IMG: // if string not image -> not OK
+            if (errmsg == 1)
+            {
+                printf("  arg %d (string \"%s\") not an image\n", argnum - 1, data.cmdargtoken[argnum].val.string);
             }
+            rval = 1;
             break;
 
+        case CLIARG_IMG: // if image -> OK
+            rval = 0;
+            break;
 
-        case CLIARG_STR: // should be string (image or not)
-            switch(data.cmdargtoken[argnum].type)
+        case CLIARG_STR: // if string -> not OK
+            if (errmsg == 1)
             {
+                printf("  arg %d (string \"%s\") not an image\n", argnum - 1, data.cmdargtoken[argnum].val.string);
+            }
+            rval = 1;
+            break;
 
-                case CLIARG_FLOAT: // if float -> not OK
-                    sprintf(data.cmdargtoken[argnum].val.string, "%f",
-                            data.cmdargtoken[argnum].val.numf);
-                    if(errmsg == 1)
-                    {
-                        printf("  arg %d (float %f) not a string or image\n",
-                               argnum - 1,
-                               data.cmdargtoken[argnum].val.numf);
-                    }
-                    rval = 1;
-                    break;
+        case 6:
+            rval = 0;
+            break;
+        }
+        break;
 
-                case CLIARG_LONG: // if long -> not OK
-                    sprintf(data.cmdargtoken[argnum].val.string, "%ld",
-                            data.cmdargtoken[argnum].val.numl);
-                    if(errmsg == 1)
-                    {
-                        printf("  arg %d (integer %ld) not string or image\n",
-                               argnum - 1,
-                               data.cmdargtoken[argnum].val.numl);
-                    }
-                    rval = 1;
-                    break;
+    case CLIARG_STR: // should be string (image or not)
+        switch (data.cmdargtoken[argnum].type)
+        {
 
-                case CLIARG_STR_NOT_IMG: // if string not image -> OK
-                    rval = 0;
-                    break;
+        case CLIARG_FLOAT: // if float -> not OK
+            sprintf(data.cmdargtoken[argnum].val.string, "%f", data.cmdargtoken[argnum].val.numf);
+            if (errmsg == 1)
+            {
+                printf("  arg %d (float %f) not a string or image\n", argnum - 1, data.cmdargtoken[argnum].val.numf);
+            }
+            rval = 1;
+            break;
 
-                case CLIARG_IMG: // if image -> OK
-                    rval = 0;
-                    break;
+        case CLIARG_LONG: // if long -> not OK
+            sprintf(data.cmdargtoken[argnum].val.string, "%ld", data.cmdargtoken[argnum].val.numl);
+            if (errmsg == 1)
+            {
+                printf("  arg %d (integer %ld) not string or image\n", argnum - 1, data.cmdargtoken[argnum].val.numl);
+            }
+            rval = 1;
+            break;
 
-                case CLIARG_STR: // if string -> OK
-                    rval = 0;
-                    break;
+        case CLIARG_STR_NOT_IMG: // if string not image -> OK
+            rval = 0;
+            break;
 
-                case 6:
-                    rval = 0;
-                    break;
-            }
+        case CLIARG_IMG: // if image -> OK
+            rval = 0;
             break;
 
-    }
+        case CLIARG_STR: // if string -> OK
+            rval = 0;
+            break;
 
+        case 6:
+            rval = 0;
+            break;
+        }
+        break;
+    }
 
-    if(rval == 2)
+    if (rval == 2)
     {
-        if(errmsg == 1)
+        if (errmsg == 1)
         {
-            printf("arg %d: wrong arg type 0x%X :  0x%X\n", argnum, argtype,
-                   data.cmdargtoken[argnum].type);
+            printf("arg %d: wrong arg type 0x%X :  0x%X\n", argnum, argtype, data.cmdargtoken[argnum].type);
         }
         rval = 1;
     }
@@ -393,8 +345,6 @@ static int CLI_checkarg0(
     return rval;
 }
 
-
-
 /**
  * @brief Check that input CLI argument matches required argument type
  *
@@ -402,21 +352,18 @@ static int CLI_checkarg0(
  * @param argtype
  * @return int
  */
-int CLI_checkarg(
-    int argnum,
-    uint32_t argtype
-)
+int CLI_checkarg(int argnum, uint32_t argtype)
 {
     DEBUG_TRACE_FSTART();
 
     int rval;
 
-    if(argnum == 1)
+    if (argnum == 1)
     {
         argcheck_process_flag = 1;
     }
 
-    if(argcheck_process_flag == 1)
+    if (argcheck_process_flag == 1)
     {
         rval = CLI_checkarg0(argnum, argtype, 1);
     }
@@ -429,8 +376,6 @@ int CLI_checkarg(
     return rval;
 }
 
-
-
 /**
  * @brief Check that input CLI argument matches required argument type - do not print error message
  *
@@ -438,21 +383,18 @@ int CLI_checkarg(
  * @param argtype
  * @return int
  */
-int CLI_checkarg_noerrmsg(
-    int argnum,
-    uint32_t argtype
-)
+int CLI_checkarg_noerrmsg(int argnum, uint32_t argtype)
 {
     DEBUG_TRACE_FSTART();
 
     int rval;
 
-    if(argnum == 1)
+    if (argnum == 1)
     {
         argcheck_process_flag = 1;
     }
 
-    if(argcheck_process_flag == 1)
+    if (argcheck_process_flag == 1)
     {
         rval = CLI_checkarg0(argnum, argtype, 0);
     }
@@ -465,11 +407,6 @@ int CLI_checkarg_noerrmsg(
     return rval;
 }
 
-
-
-
-
-
 /** @brief Check array of command line (CLI) arguments
  *
  * Use list of arguments in fpscliarg[].
@@ -478,36 +415,30 @@ int CLI_checkarg_noerrmsg(
  * CLIarg keep count of argument position in CLI call
  *
  */
-errno_t CLI_checkarg_array(
-    CLICMDARGDEF fpscliarg[],
-    int nbarg
-)
+errno_t CLI_checkarg_array(CLICMDARGDEF fpscliarg[], int nbarg)
 {
     DEBUG_TRACE_FSTART();
 
     // initialize arg check
     argcheck_process_flag = 1;
 
-
-
     int argindexmatch = -1;
     // check if CLI argument 1 is one of the function parameters keys
     // if it is, set argindexmatch to the function parameter index
-    for(int arg = 0; arg < nbarg; arg++)
+    for (int arg = 0; arg < nbarg; arg++)
     {
-        if(strcmp(data.cmdargtoken[1].val.string, fpscliarg[arg].fpstag) == 0)
+        if (strcmp(data.cmdargtoken[1].val.string, fpscliarg[arg].fpstag) == 0)
         {
             argindexmatch = arg;
         }
     }
 
-
     // if CLI arg 1 is a function parameter, set function parameter to value entered in CLI arg 2
-    if(argindexmatch != -1)
+    if (argindexmatch != -1)
     {
         //printf("match to arg %s\n", fpscliarg[argindexmatch].fpstag); //TEST
 
-        if(data.cmdargtoken[2].type == CLIARG_MISSING)
+        if (data.cmdargtoken[2].type == CLIARG_MISSING)
         {
             printf("Setting arg %s : input missing\n", fpscliarg[argindexmatch].fpstag);
             DEBUG_TRACE_FEXIT();
@@ -515,52 +446,47 @@ errno_t CLI_checkarg_array(
         }
 
         DEBUG_TRACEPOINT("calling CLI_checkarg");
-        if(CLI_checkarg(2, fpscliarg[argindexmatch].type) == 0)
+        if (CLI_checkarg(2, fpscliarg[argindexmatch].type) == 0)
         {
             int cmdi = data.cmdindex;
-            switch(fpscliarg[argindexmatch].type) // & 0x0000FFFF)
+            switch (fpscliarg[argindexmatch].type) // & 0x0000FFFF)
             {
-                case CLIARG_FLOAT32:
-                    data.cmd[cmdi].argdata[argindexmatch].val.f32 = data.cmdargtoken[2].val.numf;
-                    break;
-                case CLIARG_FLOAT64:
-                    data.cmd[cmdi].argdata[argindexmatch].val.f64 = data.cmdargtoken[2].val.numf;
-                    break;
-                case CLIARG_INT32:
-                    data.cmd[cmdi].argdata[argindexmatch].val.i32 = data.cmdargtoken[2].val.numl;
-                    break;
-                case CLIARG_INT64:
-                    data.cmd[cmdi].argdata[argindexmatch].val.i64 = data.cmdargtoken[2].val.numl;
-                    break;
-                case CLIARG_UINT32:
-                    data.cmd[cmdi].argdata[argindexmatch].val.ui32 = data.cmdargtoken[2].val.numl;
-                    break;
-                case CLIARG_UINT64:
-                    data.cmd[cmdi].argdata[argindexmatch].val.ui64 = data.cmdargtoken[2].val.numl;
-                    break;
-                case CLIARG_STR_NOT_IMG:
-                    strcpy(data.cmd[cmdi].argdata[argindexmatch].val.s,
-                           data.cmdargtoken[2].val.string);
-                    break;
-                case CLIARG_IMG:
-                    strcpy(data.cmd[cmdi].argdata[argindexmatch].val.s,
-                           data.cmdargtoken[2].val.string);
-                    break;
-                case CLIARG_STR:
-                    strcpy(data.cmd[cmdi].argdata[argindexmatch].val.s,
-                           data.cmdargtoken[2].val.string);
-                    break;
+            case CLIARG_FLOAT32:
+                data.cmd[cmdi].argdata[argindexmatch].val.f32 = data.cmdargtoken[2].val.numf;
+                break;
+            case CLIARG_FLOAT64:
+                data.cmd[cmdi].argdata[argindexmatch].val.f64 = data.cmdargtoken[2].val.numf;
+                break;
+            case CLIARG_INT32:
+                data.cmd[cmdi].argdata[argindexmatch].val.i32 = data.cmdargtoken[2].val.numl;
+                break;
+            case CLIARG_INT64:
+                data.cmd[cmdi].argdata[argindexmatch].val.i64 = data.cmdargtoken[2].val.numl;
+                break;
+            case CLIARG_UINT32:
+                data.cmd[cmdi].argdata[argindexmatch].val.ui32 = data.cmdargtoken[2].val.numl;
+                break;
+            case CLIARG_UINT64:
+                data.cmd[cmdi].argdata[argindexmatch].val.ui64 = data.cmdargtoken[2].val.numl;
+                break;
+            case CLIARG_STR_NOT_IMG:
+                strcpy(data.cmd[cmdi].argdata[argindexmatch].val.s, data.cmdargtoken[2].val.string);
+                break;
+            case CLIARG_IMG:
+                strcpy(data.cmd[cmdi].argdata[argindexmatch].val.s, data.cmdargtoken[2].val.string);
+                break;
+            case CLIARG_STR:
+                strcpy(data.cmd[cmdi].argdata[argindexmatch].val.s, data.cmdargtoken[2].val.string);
+                break;
             }
         }
         else
         {
-            printf("Setting arg %s : Wrong type\n",
-                   fpscliarg[argindexmatch].fpstag);
+            printf("Setting arg %s : Wrong type\n", fpscliarg[argindexmatch].fpstag);
             DEBUG_TRACE_FEXIT();
             return RETURN_CLICHECKARGARRAY_FAILURE;
         }
 
-
         printf("Argument %s value updated\n", fpscliarg[argindexmatch].fpstag);
 
         //printf("arg 1: [%d] %s %f %ld\n", data.cmdargtoken[2].type, data.cmdargtoken[2].val.string, data.cmdargtoken[2].val.numf, data.cmdargtoken[2].val.numl);
@@ -568,206 +494,181 @@ errno_t CLI_checkarg_array(
         return RETURN_CLICHECKARGARRAY_FUNCPARAMSET;
     }
 
-
     //printf("arg 1: %s %f %ld\n", data.cmdargtoken[2].val.string);
 
-
     int nberr = 0;
     int CLIarg = 0; // index of argument in CLI call
-    for(int arg = 0; arg < nbarg; arg++)
+    for (int arg = 0; arg < nbarg; arg++)
     {
         char argtypestring[16];
-        switch(fpscliarg[arg].type)
+        switch (fpscliarg[arg].type)
         {
-            case CLIARG_FLOAT:
-                strcpy(argtypestring, "FLOAT");
-                break;
-            case CLIARG_FLOAT32:
-                strcpy(argtypestring, "FLT32");
-                break;
-            case CLIARG_FLOAT64:
-                strcpy(argtypestring, "FLT64");
-                break;
-            case CLIARG_ONOFF:
-                strcpy(argtypestring, "ONOFF");
-                break;
-            case CLIARG_LONG:
-                strcpy(argtypestring, "LONG");
-                break;
-            case CLIARG_INT32:
-                strcpy(argtypestring, "INT32");
-                break;
-            case CLIARG_UINT32:
-                strcpy(argtypestring, "UINT32");
-                break;
-            case CLIARG_INT64:
-                strcpy(argtypestring, "INT64");
-                break;
-            case CLIARG_UINT64:
-                strcpy(argtypestring, "UINT64");
-                break;
-            case CLIARG_STR_NOT_IMG:
-                strcpy(argtypestring, "STRnIMG");
-                break;
-            case CLIARG_IMG:
-                strcpy(argtypestring, "IMG");
-                break;
-            case CLIARG_STREAM:
-                strcpy(argtypestring, "STREAM");
-                break;
-            case CLIARG_STR:
-                strcpy(argtypestring, "STRING");
-                break;
+        case CLIARG_FLOAT:
+            strcpy(argtypestring, "FLOAT");
+            break;
+        case CLIARG_FLOAT32:
+            strcpy(argtypestring, "FLT32");
+            break;
+        case CLIARG_FLOAT64:
+            strcpy(argtypestring, "FLT64");
+            break;
+        case CLIARG_ONOFF:
+            strcpy(argtypestring, "ONOFF");
+            break;
+        case CLIARG_LONG:
+            strcpy(argtypestring, "LONG");
+            break;
+        case CLIARG_INT32:
+            strcpy(argtypestring, "INT32");
+            break;
+        case CLIARG_UINT32:
+            strcpy(argtypestring, "UINT32");
+            break;
+        case CLIARG_INT64:
+            strcpy(argtypestring, "INT64");
+            break;
+        case CLIARG_UINT64:
+            strcpy(argtypestring, "UINT64");
+            break;
+        case CLIARG_STR_NOT_IMG:
+            strcpy(argtypestring, "STRnIMG");
+            break;
+        case CLIARG_IMG:
+            strcpy(argtypestring, "IMG");
+            break;
+        case CLIARG_STREAM:
+            strcpy(argtypestring, "STREAM");
+            break;
+        case CLIARG_STR:
+            strcpy(argtypestring, "STRING");
+            break;
         }
 
-
-
-
-        if(!(fpscliarg[arg].flag & CLICMDARG_FLAG_NOCLI))
+        if (!(fpscliarg[arg].flag & CLICMDARG_FLAG_NOCLI))
         {
             int cmdi = data.cmdindex;
 
-            DEBUG_TRACEPOINT("  arg %d  CLI %2d  [%7s]  %s", arg, CLIarg, argtypestring,
-                             fpscliarg[arg].fpstag);
+            DEBUG_TRACEPOINT("  arg %d  CLI %2d  [%7s]  %s", arg, CLIarg, argtypestring, fpscliarg[arg].fpstag);
 
-
-
-            if(strcmp(data.cmdargtoken[CLIarg + 1].val.string, ".") == 0)
+            if (strcmp(data.cmdargtoken[CLIarg + 1].val.string, ".") == 0)
             {
                 // if arg token starts with "."
                 DEBUG_TRACEPOINT("ADOPTING DEFAULT/LAST VALUE");
-                switch(fpscliarg[arg].type) // & 0x0000FFFF)
+                switch (fpscliarg[arg].type) // & 0x0000FFFF)
                 {
 
-                    case CLIARG_FLOAT32: // if desired type is float single precision
-                        data.cmdargtoken[CLIarg + 1].val.numf = data.cmd[cmdi].argdata[arg].val.f32;
-                        data.cmdargtoken[CLIarg + 1].type = CLIARG_FLOAT;
-                        break;
-
-                    case CLIARG_FLOAT64: // if desired type is float double precision
-                        data.cmdargtoken[CLIarg + 1].val.numf = data.cmd[cmdi].argdata[arg].val.f64;
-                        data.cmdargtoken[CLIarg + 1].type = CLIARG_FLOAT;
-                        break;
-
-                    case CLIARG_INT32:
-                        data.cmdargtoken[CLIarg + 1].val.numl = data.cmd[cmdi].argdata[arg].val.i32;
-                        data.cmdargtoken[CLIarg + 1].type = CLIARG_LONG;
-                        break;
-
-                    case CLIARG_INT64:
-                        data.cmdargtoken[CLIarg + 1].val.numl = data.cmd[cmdi].argdata[arg].val.i64;
-                        data.cmdargtoken[CLIarg + 1].type = CLIARG_LONG;
-                        break;
-
-                    case CLIARG_UINT32:
-                        data.cmdargtoken[CLIarg + 1].val.numl = data.cmd[cmdi].argdata[arg].val.ui32;
-                        data.cmdargtoken[CLIarg + 1].type = CLIARG_LONG;
-                        break;
-
-                    case CLIARG_UINT64:
-                        data.cmdargtoken[CLIarg + 1].val.numl = data.cmd[cmdi].argdata[arg].val.ui64;
-                        data.cmdargtoken[CLIarg + 1].type = CLIARG_LONG;
-                        break;
-
-                    case CLIARG_STR_NOT_IMG: // if desired is string not image
-                        strcpy(data.cmdargtoken[CLIarg + 1].val.string,
-                               data.cmd[cmdi].argdata[arg].val.s);
+                case CLIARG_FLOAT32: // if desired type is float single precision
+                    data.cmdargtoken[CLIarg + 1].val.numf = data.cmd[cmdi].argdata[arg].val.f32;
+                    data.cmdargtoken[CLIarg + 1].type = CLIARG_FLOAT;
+                    break;
+
+                case CLIARG_FLOAT64: // if desired type is float double precision
+                    data.cmdargtoken[CLIarg + 1].val.numf = data.cmd[cmdi].argdata[arg].val.f64;
+                    data.cmdargtoken[CLIarg + 1].type = CLIARG_FLOAT;
+                    break;
+
+                case CLIARG_INT32:
+                    data.cmdargtoken[CLIarg + 1].val.numl = data.cmd[cmdi].argdata[arg].val.i32;
+                    data.cmdargtoken[CLIarg + 1].type = CLIARG_LONG;
+                    break;
+
+                case CLIARG_INT64:
+                    data.cmdargtoken[CLIarg + 1].val.numl = data.cmd[cmdi].argdata[arg].val.i64;
+                    data.cmdargtoken[CLIarg + 1].type = CLIARG_LONG;
+                    break;
+
+                case CLIARG_UINT32:
+                    data.cmdargtoken[CLIarg + 1].val.numl = data.cmd[cmdi].argdata[arg].val.ui32;
+                    data.cmdargtoken[CLIarg + 1].type = CLIARG_LONG;
+                    break;
+
+                case CLIARG_UINT64:
+                    data.cmdargtoken[CLIarg + 1].val.numl = data.cmd[cmdi].argdata[arg].val.ui64;
+                    data.cmdargtoken[CLIarg + 1].type = CLIARG_LONG;
+                    break;
+
+                case CLIARG_STR_NOT_IMG: // if desired is string not image
+                    strcpy(data.cmdargtoken[CLIarg + 1].val.string, data.cmd[cmdi].argdata[arg].val.s);
+                    data.cmdargtoken[CLIarg + 1].type = CLIARG_STR_NOT_IMG;
+                    break;
+
+                case CLIARG_IMG: // should be image
+                    strcpy(data.cmdargtoken[CLIarg + 1].val.string, data.cmd[cmdi].argdata[arg].val.s);
+                    if (image_ID(data.cmd[cmdi].argdata[arg].val.s) != -1)
+                    {
+                        // if image exists
+                        data.cmdargtoken[CLIarg + 1].type = CLIARG_IMG;
+                    }
+                    else
+                    {
                         data.cmdargtoken[CLIarg + 1].type = CLIARG_STR_NOT_IMG;
-                        break;
-
-                    case CLIARG_IMG: // should be image
-                        strcpy(data.cmdargtoken[CLIarg + 1].val.string,
-                               data.cmd[cmdi].argdata[arg].val.s);
-                        if(image_ID(data.cmd[cmdi].argdata[arg].val.s) != -1)
-                        {
-                            // if image exists
-                            data.cmdargtoken[CLIarg + 1].type = CLIARG_IMG;
-                        }
-                        else
-                        {
-                            data.cmdargtoken[CLIarg + 1].type = CLIARG_STR_NOT_IMG;
-                        }
-                        //printf("arg %d IMG        : %s\n", CLIarg+1, data.cmdargtoken[CLIarg+1].val.string);
-                        break;
-
-                    case CLIARG_STR:
-                        strcpy(data.cmdargtoken[CLIarg + 1].val.string,
-                               data.cmd[cmdi].argdata[arg].val.s);
-                        data.cmdargtoken[CLIarg + 1].type = CLIARG_STR;
-                        break;
+                    }
+                    //printf("arg %d IMG        : %s\n", CLIarg+1, data.cmdargtoken[CLIarg+1].val.string);
+                    break;
+
+                case CLIARG_STR:
+                    strcpy(data.cmdargtoken[CLIarg + 1].val.string, data.cmd[cmdi].argdata[arg].val.s);
+                    data.cmdargtoken[CLIarg + 1].type = CLIARG_STR;
+                    break;
                 }
             }
 
-
             DEBUG_TRACEPOINT("calling CLI_checkarg");
-            if(CLI_checkarg(CLIarg + 1, fpscliarg[arg].type) == 0)
+            if (CLI_checkarg(CLIarg + 1, fpscliarg[arg].type) == 0)
             {
                 DEBUG_TRACEPOINT("successful parsing, update default to last");
-                switch(fpscliarg[arg].type) // & 0x0000FFFF)
+                switch (fpscliarg[arg].type) // & 0x0000FFFF)
                 {
-                    case CLIARG_FLOAT32:
-                        data.cmd[cmdi].argdata[arg].val.f32 =
-                            data.cmdargtoken[CLIarg + 1].val.numf;
-                        break;
-                    case CLIARG_FLOAT64:
-                        data.cmd[cmdi].argdata[arg].val.f64 =
-                            data.cmdargtoken[CLIarg + 1].val.numf;
-                        break;
-                    case CLIARG_INT32:
-                        data.cmd[cmdi].argdata[arg].val.i32 =
-                            data.cmdargtoken[CLIarg + 1].val.numl;
-                        break;
-                    case CLIARG_INT64:
-                        data.cmd[cmdi].argdata[arg].val.i64 =
-                            data.cmdargtoken[CLIarg + 1].val.numl;
-                        break;
-                    case CLIARG_UINT32:
-                        data.cmd[cmdi].argdata[arg].val.ui32 =
-                            data.cmdargtoken[CLIarg + 1].val.numl;
-                        break;
-                    case CLIARG_UINT64:
-                        data.cmd[cmdi].argdata[arg].val.ui64 =
-                            data.cmdargtoken[CLIarg + 1].val.numl;
-                        break;
-                    case CLIARG_STR_NOT_IMG:
-                        strcpy(data.cmd[cmdi].argdata[arg].val.s,
-                               data.cmdargtoken[CLIarg + 1].val.string);
-                        break;
-                    case CLIARG_IMG:
-                        strcpy(data.cmd[cmdi].argdata[arg].val.s,
-                               data.cmdargtoken[CLIarg + 1].val.string);
-                        break;
-                    case CLIARG_STR:
-                        strcpy(data.cmd[cmdi].argdata[arg].val.s,
-                               data.cmdargtoken[CLIarg + 1].val.string);
-                        break;
+                case CLIARG_FLOAT32:
+                    data.cmd[cmdi].argdata[arg].val.f32 = data.cmdargtoken[CLIarg + 1].val.numf;
+                    break;
+                case CLIARG_FLOAT64:
+                    data.cmd[cmdi].argdata[arg].val.f64 = data.cmdargtoken[CLIarg + 1].val.numf;
+                    break;
+                case CLIARG_INT32:
+                    data.cmd[cmdi].argdata[arg].val.i32 = data.cmdargtoken[CLIarg + 1].val.numl;
+                    break;
+                case CLIARG_INT64:
+                    data.cmd[cmdi].argdata[arg].val.i64 = data.cmdargtoken[CLIarg + 1].val.numl;
+                    break;
+                case CLIARG_UINT32:
+                    data.cmd[cmdi].argdata[arg].val.ui32 = data.cmdargtoken[CLIarg + 1].val.numl;
+                    break;
+                case CLIARG_UINT64:
+                    data.cmd[cmdi].argdata[arg].val.ui64 = data.cmdargtoken[CLIarg + 1].val.numl;
+                    break;
+                case CLIARG_STR_NOT_IMG:
+                    strcpy(data.cmd[cmdi].argdata[arg].val.s, data.cmdargtoken[CLIarg + 1].val.string);
+                    break;
+                case CLIARG_IMG:
+                    strcpy(data.cmd[cmdi].argdata[arg].val.s, data.cmdargtoken[CLIarg + 1].val.string);
+                    break;
+                case CLIARG_STR:
+                    strcpy(data.cmd[cmdi].argdata[arg].val.s, data.cmdargtoken[CLIarg + 1].val.string);
+                    break;
                 }
             }
             else
             {
-                if(functionhelp_called == 1)
+                if (functionhelp_called == 1)
                 {
                     DEBUG_TRACE_FEXIT();
                     return RETURN_CLICHECKARGARRAY_HELP;
                 }
-                nberr ++;
+                nberr++;
             }
             CLIarg++;
         }
         else
         {
             DEBUG_TRACEPOINT("argument not part of CLI");
-            DEBUG_TRACEPOINT("  arg %d  IGNORED [%7s]  %s", arg, argtypestring,
-                             fpscliarg[arg].fpstag);
+            DEBUG_TRACEPOINT("  arg %d  IGNORED [%7s]  %s", arg, argtypestring, fpscliarg[arg].fpstag);
         }
     }
 
-
-
-
     DEBUG_TRACEPOINT("Number of arg error(s): %d / %d", nberr, CLIarg);
 
-    if(nberr == 0)
+    if (nberr == 0)
     {
         DEBUG_TRACE_FEXIT();
         return RETURN_CLICHECKARGARRAY_SUCCESS;
@@ -779,129 +680,93 @@ errno_t CLI_checkarg_array(
     }
 }
 
-
-
-
-
-
-
 /** @brief Build FPS content from FPSCLIARG list
  *
  * All CLI arguments converted to FPS parameters
  *
  */
-int CLIargs_to_FPSparams_setval(
-    CLICMDARGDEF fpscliarg[],
-    int nbarg,
-    FUNCTION_PARAMETER_STRUCT *fps
-)
+int CLIargs_to_FPSparams_setval(CLICMDARGDEF fpscliarg[], int nbarg, FUNCTION_PARAMETER_STRUCT *fps)
 {
     DEBUG_TRACE_FSTART();
 
     int NBarg_processed = 0;
 
-    for(int arg = 0; arg < nbarg; arg++)
+    for (int arg = 0; arg < nbarg; arg++)
     {
-        if(!(fpscliarg[arg].flag & CLICMDARG_FLAG_NOFPS))
+        if (!(fpscliarg[arg].flag & CLICMDARG_FLAG_NOFPS))
         {
             // if argument is part of FPS
-            switch(fpscliarg[arg].type)
+            switch (fpscliarg[arg].type)
             {
-                case CLIARG_FLOAT:
-                    functionparameter_SetParamValue_FLOAT64(fps,
-                                                            fpscliarg[arg].fpstag,
-                                                            data.cmdargtoken[arg + 1].val.numf);
-                    NBarg_processed++;
-                    break;
-
-                case CLIARG_FLOAT32:
-                    functionparameter_SetParamValue_FLOAT32(fps,
-                                                            fpscliarg[arg].fpstag,
-                                                            data.cmdargtoken[arg + 1].val.numf);
-                    NBarg_processed++;
-                    break;
-
-                case CLIARG_FLOAT64:
-                    functionparameter_SetParamValue_FLOAT64(fps,
-                                                            fpscliarg[arg].fpstag,
-                                                            data.cmdargtoken[arg + 1].val.numf);
-                    NBarg_processed++;
-                    break;
-
-
-                case CLIARG_ONOFF:
-                    functionparameter_SetParamValue_ONOFF(fps,
-                                                          fpscliarg[arg].fpstag,
-                                                          (int) data.cmdargtoken[arg + 1].val.numl);
-                    NBarg_processed++;
-                    break;
-
+            case CLIARG_FLOAT:
+                functionparameter_SetParamValue_FLOAT64(fps, fpscliarg[arg].fpstag, data.cmdargtoken[arg + 1].val.numf);
+                NBarg_processed++;
+                break;
 
-                case CLIARG_LONG:
-                    functionparameter_SetParamValue_INT64(fps,
-                                                          fpscliarg[arg].fpstag,
-                                                          data.cmdargtoken[arg + 1].val.numl);
-                    NBarg_processed++;
-                    break;
+            case CLIARG_FLOAT32:
+                functionparameter_SetParamValue_FLOAT32(fps, fpscliarg[arg].fpstag, data.cmdargtoken[arg + 1].val.numf);
+                NBarg_processed++;
+                break;
 
-                case CLIARG_INT32:
-                    functionparameter_SetParamValue_INT32(fps,
-                                                          fpscliarg[arg].fpstag,
-                                                          data.cmdargtoken[arg + 1].val.numl);
-                    NBarg_processed++;
-                    break;
+            case CLIARG_FLOAT64:
+                functionparameter_SetParamValue_FLOAT64(fps, fpscliarg[arg].fpstag, data.cmdargtoken[arg + 1].val.numf);
+                NBarg_processed++;
+                break;
 
-                case CLIARG_UINT32:
-                    functionparameter_SetParamValue_UINT32(fps,
-                                                           fpscliarg[arg].fpstag,
-                                                           data.cmdargtoken[arg + 1].val.numl);
-                    NBarg_processed++;
-                    break;
+            case CLIARG_ONOFF:
+                functionparameter_SetParamValue_ONOFF(fps, fpscliarg[arg].fpstag,
+                                                      (int)data.cmdargtoken[arg + 1].val.numl);
+                NBarg_processed++;
+                break;
 
-                case CLIARG_INT64:
-                    functionparameter_SetParamValue_INT64(fps,
-                                                          fpscliarg[arg].fpstag,
-                                                          data.cmdargtoken[arg + 1].val.numl);
-                    NBarg_processed++;
-                    break;
+            case CLIARG_LONG:
+                functionparameter_SetParamValue_INT64(fps, fpscliarg[arg].fpstag, data.cmdargtoken[arg + 1].val.numl);
+                NBarg_processed++;
+                break;
 
-                case CLIARG_UINT64:
-                    functionparameter_SetParamValue_UINT64(fps,
-                                                           fpscliarg[arg].fpstag,
-                                                           data.cmdargtoken[arg + 1].val.numl);
-                    NBarg_processed++;
-                    break;
+            case CLIARG_INT32:
+                functionparameter_SetParamValue_INT32(fps, fpscliarg[arg].fpstag, data.cmdargtoken[arg + 1].val.numl);
+                NBarg_processed++;
+                break;
 
+            case CLIARG_UINT32:
+                functionparameter_SetParamValue_UINT32(fps, fpscliarg[arg].fpstag, data.cmdargtoken[arg + 1].val.numl);
+                NBarg_processed++;
+                break;
 
+            case CLIARG_INT64:
+                functionparameter_SetParamValue_INT64(fps, fpscliarg[arg].fpstag, data.cmdargtoken[arg + 1].val.numl);
+                NBarg_processed++;
+                break;
 
-                case CLIARG_STR_NOT_IMG:
-                    functionparameter_SetParamValue_STRING(fps,
-                                                           fpscliarg[arg].fpstag,
-                                                           data.cmdargtoken[arg + 1].val.string);
-                    NBarg_processed++;
-                    break;
+            case CLIARG_UINT64:
+                functionparameter_SetParamValue_UINT64(fps, fpscliarg[arg].fpstag, data.cmdargtoken[arg + 1].val.numl);
+                NBarg_processed++;
+                break;
 
-                case CLIARG_IMG:
-                    functionparameter_SetParamValue_STRING(fps,
-                                                           fpscliarg[arg].fpstag,
-                                                           data.cmdargtoken[arg + 1].val.string);
-                    NBarg_processed++;
-                    break;
+            case CLIARG_STR_NOT_IMG:
+                functionparameter_SetParamValue_STRING(fps, fpscliarg[arg].fpstag,
+                                                       data.cmdargtoken[arg + 1].val.string);
+                NBarg_processed++;
+                break;
 
-                case CLIARG_STREAM:
-                    functionparameter_SetParamValue_STRING(fps,
-                                                           fpscliarg[arg].fpstag,
-                                                           data.cmdargtoken[arg + 1].val.string);
-                    NBarg_processed++;
-                    break;
+            case CLIARG_IMG:
+                functionparameter_SetParamValue_STRING(fps, fpscliarg[arg].fpstag,
+                                                       data.cmdargtoken[arg + 1].val.string);
+                NBarg_processed++;
+                break;
 
-                case CLIARG_STR:
-                    functionparameter_SetParamValue_STRING(fps,
-                                                           fpscliarg[arg].fpstag,
-                                                           data.cmdargtoken[arg + 1].val.string);
-                    NBarg_processed++;
-                    break;
+            case CLIARG_STREAM:
+                functionparameter_SetParamValue_STRING(fps, fpscliarg[arg].fpstag,
+                                                       data.cmdargtoken[arg + 1].val.string);
+                NBarg_processed++;
+                break;
 
+            case CLIARG_STR:
+                functionparameter_SetParamValue_STRING(fps, fpscliarg[arg].fpstag,
+                                                       data.cmdargtoken[arg + 1].val.string);
+                NBarg_processed++;
+                break;
             }
         }
     }
@@ -910,67 +775,57 @@ int CLIargs_to_FPSparams_setval(
     return NBarg_processed;
 }
 
-
 /** @brief Build FPS from command args
  */
-int CMDargs_to_FPSparams_create(
-    FUNCTION_PARAMETER_STRUCT *fps
-)
+int CMDargs_to_FPSparams_create(FUNCTION_PARAMETER_STRUCT *fps)
 {
     DEBUG_TRACE_FSTART();
 
     int NBarg_processed = 0;
 
-    for(int argi = 0; argi < data.cmd[data.cmdindex].nbarg; argi++)
+    for (int argi = 0; argi < data.cmd[data.cmdindex].nbarg; argi++)
     {
-        if(!(data.cmd[data.cmdindex].argdata[argi].flag & CLICMDARG_FLAG_NOFPS))
+        if (!(data.cmd[data.cmdindex].argdata[argi].flag & CLICMDARG_FLAG_NOFPS))
         {
             // if argument is part of FPS
             double tmpvalf = 0.0;
             long tmpvall = 0;
 
-            switch(data.cmd[data.cmdindex].argdata[argi].type)
+            switch (data.cmd[data.cmdindex].argdata[argi].type)
             {
                 // float point types
 
+            case CLIARG_FLOAT32:
+            {
+                float tmpf = data.cmd[data.cmdindex].argdata[argi].val.f32;
+                function_parameter_add_entry(fps, data.cmd[data.cmdindex].argdata[argi].fpstag,
+                                             data.cmd[data.cmdindex].argdata[argi].descr, FPTYPE_FLOAT32,
+                                             FPFLAG_DEFAULT_INPUT, &tmpf, NULL);
+                NBarg_processed++;
+            }
+            break;
 
-                case CLIARG_FLOAT32:
-                {
-                    float tmpf = data.cmd[data.cmdindex].argdata[argi].val.f32;
-                    function_parameter_add_entry(fps, data.cmd[data.cmdindex].argdata[argi].fpstag,
-                                                 data.cmd[data.cmdindex].argdata[argi].descr,
-                                                 FPTYPE_FLOAT32, FPFLAG_DEFAULT_INPUT, &tmpf,
-                                                 NULL);
-                    NBarg_processed++;
-                }
-                break;
-
-                case CLIARG_FLOAT64:
-                {
-                    double tmplf = data.cmd[data.cmdindex].argdata[argi].val.f64;
-                    function_parameter_add_entry(fps, data.cmd[data.cmdindex].argdata[argi].fpstag,
-                                                 data.cmd[data.cmdindex].argdata[argi].descr,
-                                                 FPTYPE_FLOAT64, FPFLAG_DEFAULT_INPUT, &tmplf,
-                                                 NULL);
-                    NBarg_processed++;
-                }
-                break;
-
-
+            case CLIARG_FLOAT64:
+            {
+                double tmplf = data.cmd[data.cmdindex].argdata[argi].val.f64;
+                function_parameter_add_entry(fps, data.cmd[data.cmdindex].argdata[argi].fpstag,
+                                             data.cmd[data.cmdindex].argdata[argi].descr, FPTYPE_FLOAT64,
+                                             FPFLAG_DEFAULT_INPUT, &tmplf, NULL);
+                NBarg_processed++;
+            }
+            break;
 
                 // integer typtes
 
-                case CLIARG_ONOFF: // default to INT64
-                {
-                    tmpvall = data.cmd[data.cmdindex].argdata[argi].val.ui64;
-                    function_parameter_add_entry(fps, data.cmd[data.cmdindex].argdata[argi].fpstag,
-                                                 data.cmd[data.cmdindex].argdata[argi].descr,
-                                                 FPTYPE_ONOFF, FPFLAG_DEFAULT_INPUT, &tmpvall,
-                                                 NULL);
-                    NBarg_processed++;
-                }
-                break;
-
+            case CLIARG_ONOFF: // default to INT64
+            {
+                tmpvall = data.cmd[data.cmdindex].argdata[argi].val.ui64;
+                function_parameter_add_entry(fps, data.cmd[data.cmdindex].argdata[argi].fpstag,
+                                             data.cmd[data.cmdindex].argdata[argi].descr, FPTYPE_ONOFF,
+                                             FPFLAG_DEFAULT_INPUT, &tmpvall, NULL);
+                NBarg_processed++;
+            }
+            break;
 
                 /* case CLIARG_LONG: // default to INT64
                  {
@@ -983,111 +838,88 @@ int CMDargs_to_FPSparams_create(
                  }
                  break;*/
 
+            case CLIARG_INT32:
+            {
+                int32_t tmpi32 = data.cmd[data.cmdindex].argdata[argi].val.i32;
+                function_parameter_add_entry(fps, data.cmd[data.cmdindex].argdata[argi].fpstag,
+                                             data.cmd[data.cmdindex].argdata[argi].descr, FPTYPE_INT32,
+                                             FPFLAG_DEFAULT_INPUT, &tmpi32, NULL);
+                NBarg_processed++;
+            }
+            break;
 
-                case CLIARG_INT32:
-                {
-                    int32_t tmpi32 = data.cmd[data.cmdindex].argdata[argi].val.i32;
-                    function_parameter_add_entry(fps, data.cmd[data.cmdindex].argdata[argi].fpstag,
-                                                 data.cmd[data.cmdindex].argdata[argi].descr,
-                                                 FPTYPE_INT32, FPFLAG_DEFAULT_INPUT, &tmpi32,
-                                                 NULL);
-                    NBarg_processed++;
-                }
-                break;
+            case CLIARG_UINT32:
+            {
+                uint32_t tmpui32 = data.cmd[data.cmdindex].argdata[argi].val.ui32;
+                function_parameter_add_entry(fps, data.cmd[data.cmdindex].argdata[argi].fpstag,
+                                             data.cmd[data.cmdindex].argdata[argi].descr, FPTYPE_UINT32,
+                                             FPFLAG_DEFAULT_INPUT, &tmpui32, NULL);
+                NBarg_processed++;
+            }
+            break;
 
-                case CLIARG_UINT32:
-                {
-                    uint32_t tmpui32 = data.cmd[data.cmdindex].argdata[argi].val.ui32;
-                    function_parameter_add_entry(fps, data.cmd[data.cmdindex].argdata[argi].fpstag,
-                                                 data.cmd[data.cmdindex].argdata[argi].descr,
-                                                 FPTYPE_UINT32, FPFLAG_DEFAULT_INPUT, &tmpui32,
-                                                 NULL);
-                    NBarg_processed++;
-                }
-                break;
+            case CLIARG_INT64:
+            {
+                int64_t tmpi64 = data.cmd[data.cmdindex].argdata[argi].val.i64;
+                function_parameter_add_entry(fps, data.cmd[data.cmdindex].argdata[argi].fpstag,
+                                             data.cmd[data.cmdindex].argdata[argi].descr, FPTYPE_INT64,
+                                             FPFLAG_DEFAULT_INPUT, &tmpi64, NULL);
+                NBarg_processed++;
+            }
+            break;
 
-                case CLIARG_INT64:
-                {
-                    int64_t tmpi64 = data.cmd[data.cmdindex].argdata[argi].val.i64;
-                    function_parameter_add_entry(fps, data.cmd[data.cmdindex].argdata[argi].fpstag,
-                                                 data.cmd[data.cmdindex].argdata[argi].descr,
-                                                 FPTYPE_INT64, FPFLAG_DEFAULT_INPUT, &tmpi64,
-                                                 NULL);
-                    NBarg_processed++;
-                }
-                break;
+            case CLIARG_UINT64:
+            {
+                uint64_t tmpui64 = data.cmd[data.cmdindex].argdata[argi].val.ui64;
+                function_parameter_add_entry(fps, data.cmd[data.cmdindex].argdata[argi].fpstag,
+                                             data.cmd[data.cmdindex].argdata[argi].descr, FPTYPE_UINT64,
+                                             FPFLAG_DEFAULT_INPUT, &tmpui64, NULL);
+                NBarg_processed++;
+            }
+            break;
 
-                case CLIARG_UINT64:
-                {
-                    uint64_t tmpui64 = data.cmd[data.cmdindex].argdata[argi].val.ui64;
-                    function_parameter_add_entry(fps, data.cmd[data.cmdindex].argdata[argi].fpstag,
-                                                 data.cmd[data.cmdindex].argdata[argi].descr,
-                                                 FPTYPE_UINT64, FPFLAG_DEFAULT_INPUT, &tmpui64,
-                                                 NULL);
-                    NBarg_processed++;
-                }
+            case CLIARG_STR_NOT_IMG:
+                function_parameter_add_entry(fps, data.cmd[data.cmdindex].argdata[argi].fpstag,
+                                             data.cmd[data.cmdindex].argdata[argi].descr, FPTYPE_STRING,
+                                             FPFLAG_DEFAULT_INPUT, data.cmd[data.cmdindex].argdata[argi].val.s, NULL);
+                NBarg_processed++;
                 break;
 
+            case CLIARG_IMG:
+                function_parameter_add_entry(fps, data.cmd[data.cmdindex].argdata[argi].fpstag,
+                                             data.cmd[data.cmdindex].argdata[argi].descr, FPTYPE_STREAMNAME,
+                                             FPFLAG_DEFAULT_INPUT, data.cmd[data.cmdindex].argdata[argi].val.s, NULL);
+                NBarg_processed++;
+                break;
 
+            case CLIARG_STREAM:
+                function_parameter_add_entry(fps, data.cmd[data.cmdindex].argdata[argi].fpstag,
+                                             data.cmd[data.cmdindex].argdata[argi].descr, FPTYPE_STREAMNAME,
+                                             FPFLAG_DEFAULT_INPUT, data.cmd[data.cmdindex].argdata[argi].val.s, NULL);
+                NBarg_processed++;
+                break;
 
+            case CLIARG_STR:
+                function_parameter_add_entry(fps, data.cmd[data.cmdindex].argdata[argi].fpstag,
+                                             data.cmd[data.cmdindex].argdata[argi].descr, FPTYPE_STRING,
+                                             FPFLAG_DEFAULT_INPUT, data.cmd[data.cmdindex].argdata[argi].val.s, NULL);
+                NBarg_processed++;
+                break;
 
+            case CLIARG_FILENAME:
+                function_parameter_add_entry(fps, data.cmd[data.cmdindex].argdata[argi].fpstag,
+                                             data.cmd[data.cmdindex].argdata[argi].descr, FPTYPE_FILENAME,
+                                             FPFLAG_DEFAULT_INPUT, data.cmd[data.cmdindex].argdata[argi].val.s, NULL);
+                NBarg_processed++;
+                break;
 
-                case CLIARG_STR_NOT_IMG:
-                    function_parameter_add_entry(fps, data.cmd[data.cmdindex].argdata[argi].fpstag,
-                                                 data.cmd[data.cmdindex].argdata[argi].descr,
-                                                 FPTYPE_STRING, FPFLAG_DEFAULT_INPUT,
-                                                 data.cmd[data.cmdindex].argdata[argi].val.s,
-                                                 NULL);
-                    NBarg_processed++;
-                    break;
-
-                case CLIARG_IMG:
-                    function_parameter_add_entry(fps, data.cmd[data.cmdindex].argdata[argi].fpstag,
-                                                 data.cmd[data.cmdindex].argdata[argi].descr,
-                                                 FPTYPE_STREAMNAME, FPFLAG_DEFAULT_INPUT,
-                                                 data.cmd[data.cmdindex].argdata[argi].val.s,
-                                                 NULL);
-                    NBarg_processed++;
-                    break;
-
-                case CLIARG_STREAM:
-                    function_parameter_add_entry(fps, data.cmd[data.cmdindex].argdata[argi].fpstag,
-                                                 data.cmd[data.cmdindex].argdata[argi].descr,
-                                                 FPTYPE_STREAMNAME, FPFLAG_DEFAULT_INPUT,
-                                                 data.cmd[data.cmdindex].argdata[argi].val.s,
-                                                 NULL);
-                    NBarg_processed++;
-                    break;
-
-                case CLIARG_STR:
-                    function_parameter_add_entry(fps, data.cmd[data.cmdindex].argdata[argi].fpstag,
-                                                 data.cmd[data.cmdindex].argdata[argi].descr,
-                                                 FPTYPE_STRING, FPFLAG_DEFAULT_INPUT,
-                                                 data.cmd[data.cmdindex].argdata[argi].val.s,
-                                                 NULL);
-                    NBarg_processed++;
-                    break;
-
-                case CLIARG_FILENAME:
-                    function_parameter_add_entry(fps, data.cmd[data.cmdindex].argdata[argi].fpstag,
-                                                 data.cmd[data.cmdindex].argdata[argi].descr,
-                                                 FPTYPE_FILENAME, FPFLAG_DEFAULT_INPUT,
-                                                 data.cmd[data.cmdindex].argdata[argi].val.s,
-                                                 NULL);
-                    NBarg_processed++;
-                    break;
-
-                case CLIARG_FITSFILENAME:
-                    function_parameter_add_entry(fps, data.cmd[data.cmdindex].argdata[argi].fpstag,
-                                                 data.cmd[data.cmdindex].argdata[argi].descr,
-                                                 FPTYPE_FITSFILENAME, FPFLAG_DEFAULT_INPUT,
-                                                 data.cmd[data.cmdindex].argdata[argi].val.s,
-                                                 NULL);
-                    NBarg_processed++;
-                    break;
-
+            case CLIARG_FITSFILENAME:
+                function_parameter_add_entry(fps, data.cmd[data.cmdindex].argdata[argi].fpstag,
+                                             data.cmd[data.cmdindex].argdata[argi].descr, FPTYPE_FITSFILENAME,
+                                             FPFLAG_DEFAULT_INPUT, data.cmd[data.cmdindex].argdata[argi].val.s, NULL);
+                NBarg_processed++;
+                break;
             }
-
         }
     }
 
@@ -1095,37 +927,28 @@ int CMDargs_to_FPSparams_create(
     return NBarg_processed;
 }
 
-
-
-
-
 /** @brief get FPS pointer to function argument/parameter
  */
-void *get_farg_ptr(
-    char *tag,
-    long *fpsi
-)
+void *get_farg_ptr(char *tag, long *fpsi)
 {
     DEBUG_TRACE_FSTART();
 
-
     void *ptr = NULL;
 
     DEBUG_TRACEPOINT("looking for pointer %s", tag);
     DEBUG_TRACEPOINT("FPS_CMDCODE = %d", data.FPS_CMDCODE);
 
-
-    if(data.FPS_CMDCODE != 0)
+    if (data.FPS_CMDCODE != 0)
     {
         // look for pointer in FPS
         // We use INT64 type as default
-        ptr = (void *) functionparameter_GetParamPtr_generic(data.fpsptr, tag, fpsi);
+        ptr = (void *)functionparameter_GetParamPtr_generic(data.fpsptr, tag, fpsi);
     }
     else
     {
-        for(int argi = 0; argi < data.cmd[data.cmdindex].nbarg; argi++)
+        for (int argi = 0; argi < data.cmd[data.cmdindex].nbarg; argi++)
         {
-            if(strcmp(data.cmd[data.cmdindex].argdata[argi].fpstag, tag) == 0)
+            if (strcmp(data.cmd[data.cmdindex].argdata[argi].fpstag, tag) == 0)
             {
                 ptr = (void *)(&data.cmd[data.cmdindex].argdata[argi].val);
                 break;
diff --git a/src/CommandLineInterface/CLIcore_checkargs.h b/src/CommandLineInterface/CLIcore_checkargs.h
index b2a11eac..ae0ea869 100644
--- a/src/CommandLineInterface/CLIcore_checkargs.h
+++ b/src/CommandLineInterface/CLIcore_checkargs.h
@@ -8,47 +8,40 @@
 #ifndef CLICORE_CHECKARGS_H
 #define CLICORE_CHECKARGS_H
 
-
 #include "cmdsettings.h"
 
-
 // testing argument type for command line interface
 // CLI ARGS consist of two 16-bit fields
 // lower 16-bit is format input type in CLI
 // higher 16-bit can be more specific and used for conversion
 
-#define CLIARG_MISSING          0x00000000
-#define CLIARG_FLOAT            0x00000001  // floating point number, defaults to float64
-#define CLIARG_LONG             0x00000002  // integer, default to int64
-#define CLIARG_STR_NOT_IMG      0x00000003  // string, not existing image
-#define CLIARG_IMG              0x00000004  // existing image or stream
-#define CLIARG_STR              0x00000005  // string
-#define CLIARG_FILENAME         0x00000006
-#define CLIARG_FITSFILENAME     0x00000007
-
+#define CLIARG_MISSING 0x00000000
+#define CLIARG_FLOAT 0x00000001       // floating point number, defaults to float64
+#define CLIARG_LONG 0x00000002        // integer, default to int64
+#define CLIARG_STR_NOT_IMG 0x00000003 // string, not existing image
+#define CLIARG_IMG 0x00000004         // existing image or stream
+#define CLIARG_STR 0x00000005         // string
+#define CLIARG_FILENAME 0x00000006
+#define CLIARG_FITSFILENAME 0x00000007
 
-#define CLIARG_FLOAT32          0x00010001 // same as float
-#define CLIARG_FLOAT64          0x00020001 // same as double
+#define CLIARG_FLOAT32 0x00010001 // same as float
+#define CLIARG_FLOAT64 0x00020001 // same as double
 
 // integer types
-#define CLIARG_ONOFF            0x00030002
-#define CLIARG_INT32            0x00010002
-#define CLIARG_UINT32           0x00110002
-#define CLIARG_INT64            0x00020002 // same as LONG
-#define CLIARG_UINT64           0x00120002
+#define CLIARG_ONOFF 0x00030002
+#define CLIARG_INT32 0x00010002
+#define CLIARG_UINT32 0x00110002
+#define CLIARG_INT64 0x00020002 // same as LONG
+#define CLIARG_UINT64 0x00120002
 
 // image/stream types
-#define CLIARG_STREAM           0x00010004 // stream
-
-
+#define CLIARG_STREAM 0x00010004 // stream
 
-#define STRINGMAXLEN_FPSCLIARG_TAG       100
-#define STRINGMAXLEN_FPSCLIARG_DESCR     100
-#define STRINGMAXLEN_FPSCLIARG_EXAMPLE   100
+#define STRINGMAXLEN_FPSCLIARG_TAG 100
+#define STRINGMAXLEN_FPSCLIARG_DESCR 100
+#define STRINGMAXLEN_FPSCLIARG_EXAMPLE 100
 #define STRINGMAXLEN_FPSCLIARG_LASTENTRY 100
 
-
-
 #define CLICMDARG_FLAG_DEFAULT 0x00000000
 
 #define CLICMDARG_FLAG_NOCLI 0x00000001 // 1 if argument is not part or CLI call
@@ -56,7 +49,6 @@
 // command line function call in the CLI
 #define CLICMDARG_FLAG_NOFPS 0x00000002 // 1 if argument is not part or FPS
 
-
 typedef struct
 {
     // Type is one of CLIARG_XXXX
@@ -88,7 +80,6 @@ typedef struct
 
 } CLICMDARGDEF;
 
-
 typedef struct
 {
     int type;
@@ -100,23 +91,22 @@ typedef struct
     } val;
 } CMDARGVAL;
 
-
 #define STRINGMAXLEN_CLICMDARG 256
 typedef struct
 {
-    int       type;    // Command line argument type
-    uint64_t  fptype;  // FPS type (could be more speccific than CLI type)
-    char      fpstag[STRINGMAXLEN_FPSCLIARG_TAG];
-    char      descr[STRINGMAXLEN_FPSCLIARG_DESCR];
-    char      example[STRINGMAXLEN_FPSCLIARG_EXAMPLE];
-    uint64_t  flag;
+    int type;        // Command line argument type
+    uint64_t fptype; // FPS type (could be more speccific than CLI type)
+    char fpstag[STRINGMAXLEN_FPSCLIARG_TAG];
+    char descr[STRINGMAXLEN_FPSCLIARG_DESCR];
+    char example[STRINGMAXLEN_FPSCLIARG_EXAMPLE];
+    uint64_t flag;
     union
     {
-        float  f32;
+        float f32;
         double f64;
 
-        int32_t  i32;
-        int64_t  i64;
+        int32_t i32;
+        int64_t i64;
         uint32_t ui32;
         uint64_t ui64;
 
@@ -124,13 +114,6 @@ typedef struct
     } val;
 } CLICMDARGDATA;
 
-
-
-
-
-
-
-
 typedef struct
 {
     char key[100];
@@ -146,26 +129,14 @@ typedef struct
     // pointer to CMD struct initialized by CLI function registration
     CMDSETTINGS *cmdsettings;
 
-    errno_t (*FPS_customCONFsetup)
-    ();    // pointer to optional custom FPS conf setup function
-    errno_t (*FPS_customCONFcheck)
-    ();    // pointer to optional custom FPS conf check function
+    errno_t (*FPS_customCONFsetup)(); // pointer to optional custom FPS conf setup function
+    errno_t (*FPS_customCONFcheck)(); // pointer to optional custom FPS conf check function
 
 } CLICMDDATA;
 
-
-
-#define CLICMD_SUCCESS          0
-#define CLICMD_INVALID_ARG      1
-#define CLICMD_ERROR            2
-
-
-
-
-
-
-
-
+#define CLICMD_SUCCESS 0
+#define CLICMD_INVALID_ARG 1
+#define CLICMD_ERROR 2
 
 //int CLI_checkarg0(int argnum, int argtype, int errmsg);
 
@@ -173,30 +144,12 @@ int CLI_checkarg(int argnum, uint32_t argtype);
 
 int CLI_checkarg_noerrmsg(int argnum, uint32_t argtype);
 
-errno_t CLI_checkarg_array(
-    CLICMDARGDEF fpscliarg[],
-    int nbarg
-);
-
-
-
-int CLIargs_to_FPSparams_setval(
-    CLICMDARGDEF fpscliarg[],
-    int nbarg,
-    FUNCTION_PARAMETER_STRUCT *fps
-);
-
-int CMDargs_to_FPSparams_create(
-    FUNCTION_PARAMETER_STRUCT *fps
-);
-
-
+errno_t CLI_checkarg_array(CLICMDARGDEF fpscliarg[], int nbarg);
 
-void *get_farg_ptr(
-    char *tag,
-    long *fpsi
-);
+int CLIargs_to_FPSparams_setval(CLICMDARGDEF fpscliarg[], int nbarg, FUNCTION_PARAMETER_STRUCT *fps);
 
+int CMDargs_to_FPSparams_create(FUNCTION_PARAMETER_STRUCT *fps);
 
+void *get_farg_ptr(char *tag, long *fpsi);
 
 #endif
diff --git a/src/CommandLineInterface/CLIcore_datainit.c b/src/CommandLineInterface/CLIcore_datainit.c
index f5e408c1..da5af277 100644
--- a/src/CommandLineInterface/CLIcore_datainit.c
+++ b/src/CommandLineInterface/CLIcore_datainit.c
@@ -5,14 +5,11 @@
  *
  */
 
-
 #include <math.h>
 #include <sys/time.h>
 
-#include "CommandLineInterface/CLIcore.h"
 #include "COREMOD_memory/COREMOD_memory.h"
-
-
+#include "CommandLineInterface/CLIcore.h"
 
 /*^-----------------------------------------------------------------------------
 |  Initialization the "data" structure
@@ -29,108 +26,91 @@ errno_t CLI_data_init()
     //  int i;
     struct timeval t1;
 
-
     /* initialization of the data structure
      */
-    data.NB_MAX_IMAGE    = STATIC_NB_MAX_IMAGE;
+    data.NB_MAX_IMAGE = STATIC_NB_MAX_IMAGE;
     data.NB_MAX_VARIABLE = STATIC_NB_MAX_VARIABLE;
-    data.NB_MAX_FPS      = 100;
-    data.INVRANDMAX      = 1.0 / RAND_MAX;
+    data.NB_MAX_FPS = 100;
+    data.INVRANDMAX = 1.0 / RAND_MAX;
 
     // do not remove files when delete command on SHM
-    data.rmSHMfile       = 0;
-
-
-
+    data.rmSHMfile = 0;
 
     // Allocate data.image
 
 #ifdef DATA_STATIC_ALLOC
     // image static allocation mode
     data.NB_MAX_IMAGE = STATIC_NB_MAX_IMAGE;
-    printf("STATIC ALLOCATION mode: set data.NB_MAX_IMAGE      = %5ld\n",
-           data.NB_MAX_IMAGE);
+    printf("STATIC ALLOCATION mode: set data.NB_MAX_IMAGE      = %5ld\n", data.NB_MAX_IMAGE);
 #else
-    data.image           = (IMAGE *) calloc(data.NB_MAX_IMAGE, sizeof(IMAGE));
-    if(data.image == NULL)
+    data.image = (IMAGE *)calloc(data.NB_MAX_IMAGE, sizeof(IMAGE));
+    if (data.image == NULL)
     {
         PRINT_ERROR("Allocation of data.image has failed - exiting program");
         exit(1);
     }
-    if(data.Debug > 0)
+    if (data.Debug > 0)
     {
         printf("Allocation of data.image completed %p\n", data.image);
         fflush(stdout);
     }
 #endif
 
-    for(long i = 0; i < data.NB_MAX_IMAGE; i++)
+    for (long i = 0; i < data.NB_MAX_IMAGE; i++)
     {
         data.image[i].used = 0;
         data.image[i].createcnt = 0;
     }
 
-
-
-
     // Allocate data.variable
 
 #ifdef DATA_STATIC_ALLOC
     // variable static allocation mode
     data.NB_MAX_VARIABLE = STATIC_NB_MAX_VARIABLE;
-    printf("STATIC ALLOCATION mode: set data.NB_MAX_VARIABLE   = %5ld\n",
-           data.NB_MAX_VARIABLE);
+    printf("STATIC ALLOCATION mode: set data.NB_MAX_VARIABLE   = %5ld\n", data.NB_MAX_VARIABLE);
 #else
-    data.variable = (VARIABLE *) calloc(data.NB_MAX_VARIABLE, sizeof(VARIABLE));
-    if(data.variable == NULL)
+    data.variable = (VARIABLE *)calloc(data.NB_MAX_VARIABLE, sizeof(VARIABLE));
+    if (data.variable == NULL)
     {
         PRINT_ERROR("Allocation of data.variable has failed - exiting program");
         exit(1);
     }
 
-    data.image[0].used   = 0;
-    data.image[0].shmfd  = -1;
-    tmplong              = data.NB_MAX_VARIABLE;
-    data.NB_MAX_VARIABLE = data.NB_MAX_VARIABLE + NB_VARIABLES_BUFFER_REALLOC ;
-
+    data.image[0].used = 0;
+    data.image[0].shmfd = -1;
+    tmplong = data.NB_MAX_VARIABLE;
+    data.NB_MAX_VARIABLE = data.NB_MAX_VARIABLE + NB_VARIABLES_BUFFER_REALLOC;
 
-    data.variable = (VARIABLE *) realloc(data.variable,
-                                         data.NB_MAX_VARIABLE * sizeof(VARIABLE));
-    for(long i = tmplong; i < data.NB_MAX_VARIABLE; i++)
+    data.variable = (VARIABLE *)realloc(data.variable, data.NB_MAX_VARIABLE * sizeof(VARIABLE));
+    for (long i = tmplong; i < data.NB_MAX_VARIABLE; i++)
     {
         data.variable[i].used = 0;
         data.variable[i].type = 0; /** defaults to floating point type */
     }
 
-    if(data.variable == NULL)
+    if (data.variable == NULL)
     {
         PRINT_ERROR("Reallocation of data.variable has failed - exiting program");
         exit(1);
     }
 #endif
 
-
-
-
     // Allocate data.fps
     data.fpsarray = malloc(sizeof(FUNCTION_PARAMETER_STRUCT) * data.NB_MAX_FPS);
-    if(data.fpsarray==NULL)
+    if (data.fpsarray == NULL)
     {
         FUNC_RETURN_FAILURE("memory allocation error");
     }
 
     // Initialize file descriptors to -1
     //
-    for(int fpsindex = 0; fpsindex < data.NB_MAX_FPS; fpsindex++)
+    for (int fpsindex = 0; fpsindex < data.NB_MAX_FPS; fpsindex++)
     {
         data.fpsarray[fpsindex].SMfd = -1;
         data.fpsarray[fpsindex].md = NULL;
         data.fpsarray[fpsindex].parray = NULL;
     }
 
-
-
-
     create_variable_ID("_PI", 3.14159265358979323846264338328);
     create_variable_ID("_e", exp(1));
     create_variable_ID("_gamma", 0.5772156649);
@@ -141,7 +121,6 @@ errno_t CLI_data_init()
     create_variable_ID("_ly", 9.460730472e15);
     create_variable_ID("_AU", 1.4959787066e11);
 
-
     gettimeofday(&t1, NULL);
     srand(t1.tv_usec * t1.tv_sec);
     //	printf("RAND: %ld\n", t1.tv_usec * t1.tv_sec);
diff --git a/src/CommandLineInterface/CLIcore_datainit.h b/src/CommandLineInterface/CLIcore_datainit.h
index 1a88f9c7..673d0663 100644
--- a/src/CommandLineInterface/CLIcore_datainit.h
+++ b/src/CommandLineInterface/CLIcore_datainit.h
@@ -1,16 +1,14 @@
 /**
  * @file CLIcore_datainit.h
- * 
+ *
  * @brief data structure init
  *
  */
 
-
 #ifndef CLICORE_DATAINIT_H
 
 #define CLICORE_DATAINIT_H
 
-
 void CLI_data_init();
 
 #endif
diff --git a/src/CommandLineInterface/CLIcore_help.c b/src/CommandLineInterface/CLIcore_help.c
index c3183548..3e8ed89d 100644
--- a/src/CommandLineInterface/CLIcore_help.c
+++ b/src/CommandLineInterface/CLIcore_help.c
@@ -1,26 +1,24 @@
 #define _GNU_SOURCE
-#include <malloc.h>
 #include <libgen.h>
+#include <malloc.h>
 
-#include <readline/readline.h>
 #include <fitsio.h>
+#include <readline/readline.h>
 #include <regex.h>
 
+#include <assert.h>
 #include <sched.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <stdio.h>
-#include <assert.h>
 
 #include "CommandLineInterface/CLIcore.h"
 
-
-#define COLORRESET      "\033[0m"
-#define COLORCMD        "\033[94m"
-#define COLORINFO       "\033[32m" // green
-#define COLORARGCLI     "\033[36m" // argument part of CLI call: cyan
-#define COLORARGnotCLI  "\033[35m" // argument not part of CLI call: yellow
-
+#define COLORRESET "\033[0m"
+#define COLORCMD "\033[94m"
+#define COLORINFO "\033[32m"      // green
+#define COLORARGCLI "\033[36m"    // argument part of CLI call: cyan
+#define COLORARGnotCLI "\033[35m" // argument not part of CLI call: yellow
 
 errno_t printInfo()
 {
@@ -28,25 +26,23 @@ errno_t printInfo()
     printf("\n");
     printf("  PID = %d\n", CLIPID);
 
-
     printf("--------------- GENERAL ----------------------\n");
-    printf("%s  %s\n",  data.package_name, data.package_version);
+    printf("%s  %s\n", data.package_name, data.package_version);
     printf("IMAGESTRUCT_VERSION %s\n", IMAGESTRUCT_VERSION);
     printf("%s BUILT   %s %s\n", __FILE__, __DATE__, __TIME__);
     printf("\n");
     printf("--------------- SETTINGS ---------------------\n");
     printf("procinfo status = %d\n", data.processinfo);
 
-    if(data.precision == 0)
+    if (data.precision == 0)
     {
         printf("Default precision upon startup : float\n");
     }
-    if(data.precision == 1)
+    if (data.precision == 1)
     {
         printf("Default precision upon startup : double\n");
     }
-    printf("sizeof(struct timespec)        = %4ld bit\n",
-           sizeof(struct timespec) * 8);
+    printf("sizeof(struct timespec)        = %4ld bit\n", sizeof(struct timespec) * 8);
     printf("sizeof(pid_t)                  = %4ld bit\n", sizeof(pid_t) * 8);
     printf("sizeof(short int)              = %4ld bit\n", sizeof(short int) * 8);
     printf("sizeof(int)                    = %4ld bit\n", sizeof(int) * 8);
@@ -57,206 +53,194 @@ errno_t printInfo()
     printf("sizeof(int_fast32_t)           = %4ld bit\n", sizeof(int_fast32_t) * 8);
     printf("sizeof(int_fast64_t)           = %4ld bit\n", sizeof(int_fast64_t) * 8);
     printf("sizeof(uint_fast8_t)           = %4ld bit\n", sizeof(uint_fast8_t) * 8);
-    printf("sizeof(uint_fast16_t)          = %4ld bit\n",
-           sizeof(uint_fast16_t) * 8);
-    printf("sizeof(uint_fast32_t)          = %4ld bit\n",
-           sizeof(uint_fast32_t) * 8);
-    printf("sizeof(uint_fast64_t)          = %4ld bit\n",
-           sizeof(uint_fast64_t) * 8);
-    printf("sizeof(IMAGE_KEYWORD)          = %4ld bit\n",
-           sizeof(IMAGE_KEYWORD) * 8);
+    printf("sizeof(uint_fast16_t)          = %4ld bit\n", sizeof(uint_fast16_t) * 8);
+    printf("sizeof(uint_fast32_t)          = %4ld bit\n", sizeof(uint_fast32_t) * 8);
+    printf("sizeof(uint_fast64_t)          = %4ld bit\n", sizeof(uint_fast64_t) * 8);
+    printf("sizeof(IMAGE_KEYWORD)          = %4ld bit\n", sizeof(IMAGE_KEYWORD) * 8);
 
     size_t offsetval = 0;
     size_t offsetval0 = 0;
 
-    printf("sizeof(IMAGE_METADATA)         = %4ld bit  = %4zu byte ------------------\n",
-           sizeof(IMAGE_METADATA) * 8, sizeof(IMAGE_METADATA));
+    printf("sizeof(IMAGE_METADATA)         = %4ld bit  = %4zu byte ------------------\n", sizeof(IMAGE_METADATA) * 8,
+           sizeof(IMAGE_METADATA));
 
     offsetval = offsetof(IMAGE_METADATA, version);
 
-
     offsetval0 = offsetval;
     offsetval = offsetof(IMAGE_METADATA, name);
-    printf("   version                     offset = %4zu bit  = %4zu byte     [%4zu byte]\n",
-           8 * offsetval0, offsetval0, offsetval - offsetval0);
+    printf("   version                     offset = %4zu bit  = %4zu byte     [%4zu byte]\n", 8 * offsetval0,
+           offsetval0, offsetval - offsetval0);
 
     offsetval0 = offsetval;
     offsetval = offsetof(IMAGE_METADATA, naxis);
-    printf("   name                        offset = %4zu bit  = %4zu byte     [%4zu byte]\n",
-           8 * offsetval0, offsetval0, offsetval - offsetval0);
+    printf("   name                        offset = %4zu bit  = %4zu byte     [%4zu byte]\n", 8 * offsetval0,
+           offsetval0, offsetval - offsetval0);
 
     offsetval0 = offsetval;
     offsetval = offsetof(IMAGE_METADATA, size);
-    printf("   naxis                       offset = %4zu bit  = %4zu byte     [%4zu byte]\n",
-           8 * offsetval0, offsetval0, offsetval - offsetval0);
+    printf("   naxis                       offset = %4zu bit  = %4zu byte     [%4zu byte]\n", 8 * offsetval0,
+           offsetval0, offsetval - offsetval0);
 
     offsetval0 = offsetval;
     offsetval = offsetof(IMAGE_METADATA, nelement);
-    printf("   size                        offset = %4zu bit  = %4zu byte     [%4zu byte]\n",
-           8 * offsetval0, offsetval0, offsetval - offsetval0);
+    printf("   size                        offset = %4zu bit  = %4zu byte     [%4zu byte]\n", 8 * offsetval0,
+           offsetval0, offsetval - offsetval0);
 
     offsetval0 = offsetval;
     offsetval = offsetof(IMAGE_METADATA, datatype);
-    printf("   nelement                    offset = %4zu bit  = %4zu byte     [%4zu byte]\n",
-           8 * offsetval0, offsetval0, offsetval - offsetval0);
+    printf("   nelement                    offset = %4zu bit  = %4zu byte     [%4zu byte]\n", 8 * offsetval0,
+           offsetval0, offsetval - offsetval0);
 
     offsetval0 = offsetval;
     offsetval = offsetof(IMAGE_METADATA, imagetype);
-    printf("   datatype                    offset = %4zu bit  = %4zu byte     [%4zu byte]\n",
-           8 * offsetval0, offsetval0, offsetval - offsetval0);
+    printf("   datatype                    offset = %4zu bit  = %4zu byte     [%4zu byte]\n", 8 * offsetval0,
+           offsetval0, offsetval - offsetval0);
 
     offsetval0 = offsetval;
     offsetval = offsetof(IMAGE_METADATA, creationtime);
-    printf("   imagetype                   offset = %4zu bit  = %4zu byte     [%4zu byte]\n",
-           8 * offsetval0, offsetval0, offsetval - offsetval0);
-
+    printf("   imagetype                   offset = %4zu bit  = %4zu byte     [%4zu byte]\n", 8 * offsetval0,
+           offsetval0, offsetval - offsetval0);
 
     offsetval0 = offsetval;
     offsetval = offsetof(IMAGE_METADATA, lastaccesstime);
-    printf("   creationtime                offset = %4zu bit  = %4zu byte     [%4zu byte]\n",
-           8 * offsetval0, offsetval0, offsetval - offsetval0);
+    printf("   creationtime                offset = %4zu bit  = %4zu byte     [%4zu byte]\n", 8 * offsetval0,
+           offsetval0, offsetval - offsetval0);
 
     offsetval0 = offsetval;
     offsetval = offsetof(IMAGE_METADATA, atime);
-    printf("   lastaccesstime              offset = %4zu bit  = %4zu byte     [%4zu byte]\n",
-           8 * offsetval0, offsetval0, offsetval - offsetval0);
+    printf("   lastaccesstime              offset = %4zu bit  = %4zu byte     [%4zu byte]\n", 8 * offsetval0,
+           offsetval0, offsetval - offsetval0);
 
     offsetval0 = offsetval;
     offsetval = offsetof(IMAGE_METADATA, writetime);
-    printf("   atime                       offset = %4zu bit  = %4zu byte     [%4zu byte]\n",
-           8 * offsetval0, offsetval0, offsetval - offsetval0);
+    printf("   atime                       offset = %4zu bit  = %4zu byte     [%4zu byte]\n", 8 * offsetval0,
+           offsetval0, offsetval - offsetval0);
 
     offsetval0 = offsetval;
     offsetval = offsetof(IMAGE_METADATA, location);
-    printf("   writetime                   offset = %4zu bit  = %4zu byte     [%4zu byte]\n",
-           8 * offsetval0, offsetval0, offsetval - offsetval0);
+    printf("   writetime                   offset = %4zu bit  = %4zu byte     [%4zu byte]\n", 8 * offsetval0,
+           offsetval0, offsetval - offsetval0);
 
     offsetval0 = offsetval;
     offsetval = offsetof(IMAGE_METADATA, location);
-    printf("   shared                      offset = %4zu bit  = %4zu byte     [%4zu byte]\n",
-           8 * offsetval0, offsetval0, offsetval - offsetval0);
+    printf("   shared                      offset = %4zu bit  = %4zu byte     [%4zu byte]\n", 8 * offsetval0,
+           offsetval0, offsetval - offsetval0);
 
     offsetval0 = offsetval;
     offsetval = offsetof(IMAGE_METADATA, status);
-    printf("   location                    offset = %4zu bit  = %4zu byte     [%4zu byte]\n",
-           8 * offsetval0, offsetval0, offsetval - offsetval0);
+    printf("   location                    offset = %4zu bit  = %4zu byte     [%4zu byte]\n", 8 * offsetval0,
+           offsetval0, offsetval - offsetval0);
 
     offsetval0 = offsetval;
     offsetval = offsetof(IMAGE_METADATA, flag);
-    printf("   status                      offset = %4zu bit  = %4zu byte     [%4zu byte]\n",
-           8 * offsetval0, offsetval0, offsetval - offsetval0);
+    printf("   status                      offset = %4zu bit  = %4zu byte     [%4zu byte]\n", 8 * offsetval0,
+           offsetval0, offsetval - offsetval0);
 
     offsetval0 = offsetval;
     offsetval = offsetof(IMAGE_METADATA, sem);
-    printf("   flag                        offset = %4zu bit  = %4zu byte     [%4zu byte]\n",
-           8 * offsetval0, offsetval0, offsetval - offsetval0);
+    printf("   flag                        offset = %4zu bit  = %4zu byte     [%4zu byte]\n", 8 * offsetval0,
+           offsetval0, offsetval - offsetval0);
 
     offsetval0 = offsetval;
     offsetval = offsetof(IMAGE_METADATA, sem);
-    printf("   logflag                     offset = %4zu bit  = %4zu byte     [%4zu byte]\n",
-           8 * offsetval0, offsetval0, offsetval - offsetval0);
+    printf("   logflag                     offset = %4zu bit  = %4zu byte     [%4zu byte]\n", 8 * offsetval0,
+           offsetval0, offsetval - offsetval0);
 
     offsetval0 = offsetval;
     offsetval = offsetof(IMAGE_METADATA, cnt0);
-    printf("   sem                         offset = %4zu bit  = %4zu byte     [%4zu byte]\n",
-           8 * offsetval0, offsetval0, offsetval - offsetval0);
+    printf("   sem                         offset = %4zu bit  = %4zu byte     [%4zu byte]\n", 8 * offsetval0,
+           offsetval0, offsetval - offsetval0);
 
     offsetval0 = offsetval;
     offsetval = offsetof(IMAGE_METADATA, cnt1);
-    printf("   cnt0                        offset = %4zu bit  = %4zu byte     [%4zu byte]\n",
-           8 * offsetval0, offsetval0, offsetval - offsetval0);
+    printf("   cnt0                        offset = %4zu bit  = %4zu byte     [%4zu byte]\n", 8 * offsetval0,
+           offsetval0, offsetval - offsetval0);
 
     offsetval0 = offsetval;
     offsetval = offsetof(IMAGE_METADATA, cnt2);
-    printf("   cnt1                        offset = %4zu bit  = %4zu byte     [%4zu byte]\n",
-           8 * offsetval0, offsetval0, offsetval - offsetval0);
+    printf("   cnt1                        offset = %4zu bit  = %4zu byte     [%4zu byte]\n", 8 * offsetval0,
+           offsetval0, offsetval - offsetval0);
 
     offsetval0 = offsetval;
     offsetval = offsetof(IMAGE_METADATA, write);
-    printf("   cnt2                        offset = %4zu bit  = %4zu byte     [%4zu byte]\n",
-           8 * offsetval0, offsetval0, offsetval - offsetval0);
+    printf("   cnt2                        offset = %4zu bit  = %4zu byte     [%4zu byte]\n", 8 * offsetval0,
+           offsetval0, offsetval - offsetval0);
 
     offsetval0 = offsetval;
     offsetval = offsetof(IMAGE_METADATA, NBkw);
-    printf("   write                       offset = %4zu bit  = %4zu byte     [%4zu byte]\n",
-           8 * offsetval0, offsetval, offsetval - offsetval0);
+    printf("   write                       offset = %4zu bit  = %4zu byte     [%4zu byte]\n", 8 * offsetval0, offsetval,
+           offsetval - offsetval0);
 
     offsetval0 = offsetval;
     offsetval = offsetof(IMAGE_METADATA, cudaMemHandle);
-    printf("   NBkw                        offset = %4zu bit  = %4zu byte     [%4zu byte]\n",
-           8 * offsetval0, offsetval0, offsetval - offsetval0);
+    printf("   NBkw                        offset = %4zu bit  = %4zu byte     [%4zu byte]\n", 8 * offsetval0,
+           offsetval0, offsetval - offsetval0);
 
     offsetval0 = offsetval;
-    printf("   cudaMemHandle               offset = %4zu bit  = %4zu byte\n",
-           8 * offsetval0, offsetval0);
-
+    printf("   cudaMemHandle               offset = %4zu bit  = %4zu byte\n", 8 * offsetval0, offsetval0);
 
+    printf("sizeof(IMAGE)                  offset = %4zu bit  = %4zu byte ------------------\n", sizeof(IMAGE) * 8,
+           sizeof(IMAGE));
+    printf("   name                        offset = %4zu bit  = %4zu byte\n", 8 * offsetof(IMAGE, name),
+           offsetof(IMAGE, name));
 
-    printf("sizeof(IMAGE)                  offset = %4zu bit  = %4zu byte ------------------\n",
-           sizeof(IMAGE) * 8, sizeof(IMAGE));
-    printf("   name                        offset = %4zu bit  = %4zu byte\n",
-           8 * offsetof(IMAGE, name),                      offsetof(IMAGE, name));
+    printf("   used                        offset = %4zu bit  = %4zu byte\n", 8 * offsetof(IMAGE, used),
+           offsetof(IMAGE, used));
 
-    printf("   used                        offset = %4zu bit  = %4zu byte\n",
-           8 * offsetof(IMAGE, used),                      offsetof(IMAGE, used));
+    printf("   shmfd                       offset = %4zu bit  = %4zu byte\n", 8 * offsetof(IMAGE, shmfd),
+           offsetof(IMAGE, shmfd));
 
-    printf("   shmfd                       offset = %4zu bit  = %4zu byte\n",
-           8 * offsetof(IMAGE, shmfd),                     offsetof(IMAGE, shmfd));
+    printf("   memsize                     offset = %4zu bit  = %4zu byte\n", 8 * offsetof(IMAGE, memsize),
+           offsetof(IMAGE, memsize));
 
-    printf("   memsize                     offset = %4zu bit  = %4zu byte\n",
-           8 * offsetof(IMAGE, memsize),                   offsetof(IMAGE, memsize));
+    printf("   semlog                      offset = %4zu bit  = %4zu byte\n", 8 * offsetof(IMAGE, semlog),
+           offsetof(IMAGE, semlog));
 
-    printf("   semlog                      offset = %4zu bit  = %4zu byte\n",
-           8 * offsetof(IMAGE, semlog),                    offsetof(IMAGE, semlog));
+    printf("   md                          offset = %4zu bit  = %4zu byte\n", 8 * offsetof(IMAGE, md),
+           offsetof(IMAGE, md));
 
-    printf("   md                          offset = %4zu bit  = %4zu byte\n",
-           8 * offsetof(IMAGE, md),                        offsetof(IMAGE, md));
+    printf("   atimearray                  offset = %4zu bit  = %4zu byte\n", 8 * offsetof(IMAGE, atimearray),
+           offsetof(IMAGE, atimearray));
 
-    printf("   atimearray                  offset = %4zu bit  = %4zu byte\n",
-           8 * offsetof(IMAGE, atimearray),                offsetof(IMAGE, atimearray));
+    printf("   writetimearray              offset = %4zu bit  = %4zu byte\n", 8 * offsetof(IMAGE, writetimearray),
+           offsetof(IMAGE, writetimearray));
 
-    printf("   writetimearray              offset = %4zu bit  = %4zu byte\n",
-           8 * offsetof(IMAGE, writetimearray),            offsetof(IMAGE,
-                   writetimearray));
+    printf("   flagarray                   offset = %4zu bit  = %4zu byte\n", 8 * offsetof(IMAGE, flagarray),
+           offsetof(IMAGE, flagarray));
 
-    printf("   flagarray                   offset = %4zu bit  = %4zu byte\n",
-           8 * offsetof(IMAGE, flagarray),                 offsetof(IMAGE, flagarray));
+    printf("   cntarray                    offset = %4zu bit  = %4zu byte\n", 8 * offsetof(IMAGE, cntarray),
+           offsetof(IMAGE, cntarray));
 
-    printf("   cntarray                    offset = %4zu bit  = %4zu byte\n",
-           8 * offsetof(IMAGE, cntarray),                  offsetof(IMAGE, cntarray));
+    printf("   array                       offset = %4zu bit  = %4zu byte\n", 8 * offsetof(IMAGE, array),
+           offsetof(IMAGE, array));
 
-    printf("   array                       offset = %4zu bit  = %4zu byte\n",
-           8 * offsetof(IMAGE, array),                     offsetof(IMAGE, array));
-
-    printf("   semptr                      offset = %4zu bit  = %4zu byte\n",
-           8 * offsetof(IMAGE, semptr),                    offsetof(IMAGE, semptr));
-
-    printf("   kw                          offset = %4zu bit  = %4zu byte\n",
-           8 * offsetof(IMAGE, kw),                        offsetof(IMAGE, kw));
+    printf("   semptr                      offset = %4zu bit  = %4zu byte\n", 8 * offsetof(IMAGE, semptr),
+           offsetof(IMAGE, semptr));
 
+    printf("   kw                          offset = %4zu bit  = %4zu byte\n", 8 * offsetof(IMAGE, kw),
+           offsetof(IMAGE, kw));
 
     printf("sizeof(IMAGE_KEYWORD)          offset = %4zu bit  = %4zu byte ------------------\n",
            sizeof(IMAGE_KEYWORD) * 8, sizeof(IMAGE_KEYWORD));
 
-    printf("   name                        offset = %4zu bit  = %4zu byte\n",
-           8 * offsetof(IMAGE_KEYWORD, name), offsetof(IMAGE_KEYWORD, name));
+    printf("   name                        offset = %4zu bit  = %4zu byte\n", 8 * offsetof(IMAGE_KEYWORD, name),
+           offsetof(IMAGE_KEYWORD, name));
 
-    printf("   type                        offset = %4zu bit  = %4zu byte\n",
-           8 * offsetof(IMAGE_KEYWORD, type), offsetof(IMAGE_KEYWORD, type));
+    printf("   type                        offset = %4zu bit  = %4zu byte\n", 8 * offsetof(IMAGE_KEYWORD, type),
+           offsetof(IMAGE_KEYWORD, type));
 
-    printf("   value                       offset = %4zu bit  = %4zu byte\n",
-           8 * offsetof(IMAGE_KEYWORD, value), offsetof(IMAGE_KEYWORD, value));
-
-    printf("   comment                     offset = %4zu bit  = %4zu byte\n",
-           8 * offsetof(IMAGE_KEYWORD, comment), offsetof(IMAGE_KEYWORD, comment));
+    printf("   value                       offset = %4zu bit  = %4zu byte\n", 8 * offsetof(IMAGE_KEYWORD, value),
+           offsetof(IMAGE_KEYWORD, value));
 
+    printf("   comment                     offset = %4zu bit  = %4zu byte\n", 8 * offsetof(IMAGE_KEYWORD, comment),
+           offsetof(IMAGE_KEYWORD, comment));
 
     printf("\n");
     printf("--------------- LIBRARIES --------------------\n");
     printf("READLINE : version %x\n", RL_READLINE_VERSION);
-# ifdef _OPENMP
+#ifdef _OPENMP
     printf("OPENMP   : Compiled by an OpenMP-compliant implementation.\n");
-# endif
+#endif
     printf("CFITSIO  : version %f\n", fits_get_version(&f1));
     printf("\n");
 
@@ -273,51 +257,36 @@ errno_t printInfo()
     return RETURN_SUCCESS;
 }
 
-
-
-
-
-
-
 errno_t list_commands()
 {
     int cmdinfoslen = 38;
     char cmdinfoshort[cmdinfoslen];
 
     printf("----------- LIST OF COMMANDS ---------\n");
-    for(unsigned int i = 0; i < data.NBcmd; i++)
+    for (unsigned int i = 0; i < data.NBcmd; i++)
     {
         strncpy(cmdinfoshort, data.cmd[i].info, cmdinfoslen - 1);
-        printf("   %-16s %-20s %-40s %-30s\n", data.cmd[i].key, data.cmd[i].module,
-               cmdinfoshort, data.cmd[i].example);
+        printf("   %-16s %-20s %-40s %-30s\n", data.cmd[i].key, data.cmd[i].module, cmdinfoshort, data.cmd[i].example);
     }
 
     return RETURN_SUCCESS;
 }
 
-
-
-
-
-
-
-errno_t list_commands_module(
-    const char *__restrict modulename
-)
+errno_t list_commands_module(const char *__restrict modulename)
 {
     int mOK = 0;
     int cmdinfoslen = 38;
     char cmdinfoshort[cmdinfoslen];
 
     int moduleindex = -1;
-    for(int m = 0; m < data.NBmodule; m++)
+    for (int m = 0; m < data.NBmodule; m++)
     {
-        if(strcmp(modulename, data.module[m].name) == 0)
+        if (strcmp(modulename, data.module[m].name) == 0)
         {
             moduleindex = m;
         }
     }
-    if(moduleindex == -1)
+    if (moduleindex == -1)
     {
         printf("---- MODULE %s DOES NOT EXIST / NOT LOADED ---------\n", modulename);
     }
@@ -331,39 +300,34 @@ errno_t list_commands_module(
         printf("   sofilename   %s\n", data.module[moduleindex].sofilename);
         printf("   version      %d %d %d\n", data.module[moduleindex].versionmajor,
                data.module[moduleindex].versionminor, data.module[moduleindex].versionpatch);
-        printf("   date         %s %s\n", data.module[moduleindex].datestring,
-               data.module[moduleindex].timestring);
+        printf("   date         %s %s\n", data.module[moduleindex].datestring, data.module[moduleindex].timestring);
         printf("   info         %s\n", data.module[moduleindex].info);
 
-        for(unsigned int i = 0; i < data.NBcmd; i++)
+        for (unsigned int i = 0; i < data.NBcmd; i++)
         {
             char cmpstring[200];
-//            sprintf(cmpstring, "%s", basename(data.cmd[i].module));
+            //            sprintf(cmpstring, "%s", basename(data.cmd[i].module));
             sprintf(cmpstring, "%s", data.cmd[i].module);
 
-            if(strcmp(modulename, cmpstring) == 0)
+            if (strcmp(modulename, cmpstring) == 0)
             {
-                if(mOK == 0)
+                if (mOK == 0)
                 {
                     printf("---- MODULE %s COMMANDS ---------\n", modulename);
                 }
 
                 strncpy(cmdinfoshort, data.cmd[i].info, cmdinfoslen - 1);
-                printf(COLORCMD "   %-24s" COLORRESET COLORINFO "  %-40s\n" COLORRESET,
-                       data.cmd[i].key, cmdinfoshort);
-//                printf("   %-16s %-20s %-40s %-30s\n", data.cmd[i].key, cmpstring, cmdinfoshort, data.cmd[i].example);
+                printf(COLORCMD "   %-24s" COLORRESET COLORINFO "  %-40s\n" COLORRESET, data.cmd[i].key, cmdinfoshort);
+                //                printf("   %-16s %-20s %-40s %-30s\n", data.cmd[i].key, cmpstring, cmdinfoshort, data.cmd[i].example);
                 mOK = 1;
             }
         }
 
-
-
-        if(mOK == 0)
+        if (mOK == 0)
         {
-            if(strlen(modulename) > 0)
+            if (strlen(modulename) > 0)
             {
-                printf("---- MODULE %s DOES NOT HAVE COMMANDS ---------\n",
-                       modulename);
+                printf("---- MODULE %s DOES NOT HAVE COMMANDS ---------\n", modulename);
             }
         }
     }
@@ -389,75 +353,55 @@ errno_t list_commands_module(
     return RETURN_SUCCESS;
 }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
 /** @brief Construct command line (CLI) arguments help string
  *
  */
-int CLIhelp_make_argstring(
-    CLICMDARGDEF fpscliarg[],
-    int nbarg,
-    char *outargstring
-)
+int CLIhelp_make_argstring(CLICMDARGDEF fpscliarg[], int nbarg, char *outargstring)
 {
     char tmpstr[STRINGMAXLEN_CMD_SYNTAX];
 
-    for(int arg = 0; arg < nbarg; arg++)
+    for (int arg = 0; arg < nbarg; arg++)
     {
-        if(!(fpscliarg[arg].flag & CLICMDARG_FLAG_NOCLI))
+        if (!(fpscliarg[arg].flag & CLICMDARG_FLAG_NOCLI))
         {
             char typestring[100] = "?";
 
-            switch(fpscliarg[arg].type)
+            switch (fpscliarg[arg].type)
             {
-                case CLIARG_FLOAT:
-                    strcpy(typestring, "float");
-                    break;
+            case CLIARG_FLOAT:
+                strcpy(typestring, "float");
+                break;
 
-                case CLIARG_LONG:
-                    strcpy(typestring, "long");
-                    break;
+            case CLIARG_LONG:
+                strcpy(typestring, "long");
+                break;
 
-                case CLIARG_STR_NOT_IMG:
-                    strcpy(typestring, "string");
-                    break;
+            case CLIARG_STR_NOT_IMG:
+                strcpy(typestring, "string");
+                break;
 
-                case CLIARG_IMG:
-                    strcpy(typestring, "string");
-                    break;
+            case CLIARG_IMG:
+                strcpy(typestring, "string");
+                break;
 
-                case CLIARG_STR:
-                    strcpy(typestring, "string");
-                    break;
+            case CLIARG_STR:
+                strcpy(typestring, "string");
+                break;
             }
 
-            if(arg == 0)
+            if (arg == 0)
             {
-                sprintf(tmpstr, "<%s [%s] ->(%s)>", fpscliarg[arg].descr, typestring,
-                        fpscliarg[arg].fpstag);
+                sprintf(tmpstr, "<%s [%s] ->(%s)>", fpscliarg[arg].descr, typestring, fpscliarg[arg].fpstag);
             }
             else
             {
                 char tmpstr1[STRINGMAXLEN_CMD_SYNTAX];
-                snprintf(tmpstr1,
-                         STRINGMAXLEN_CMD_SYNTAX - 1,
-                         " <%s [%s] ->(%s)>", fpscliarg[arg].descr, typestring,
+                snprintf(tmpstr1, STRINGMAXLEN_CMD_SYNTAX - 1, " <%s [%s] ->(%s)>", fpscliarg[arg].descr, typestring,
                          fpscliarg[arg].fpstag);
 
                 // max number of chars we can write
                 int n = STRINGMAXLEN_CMD_SYNTAX - strlen(tmpstr1);
-                if(n > 2)
+                if (n > 2)
                 {
                     strncat(tmpstr, tmpstr1, n - 1);
                 }
@@ -469,36 +413,25 @@ int CLIhelp_make_argstring(
     return strlen(outargstring);
 }
 
-
-
-
 /** @brief Assemble command line (CLI) example command string
  *
  */
-int CLIhelp_make_cmdexamplestring(
-    CLICMDARGDEF fpscliarg[],
-    int nbarg,
-    char *shortname,
-    char *outcmdexstring
-)
+int CLIhelp_make_cmdexamplestring(CLICMDARGDEF fpscliarg[], int nbarg, char *shortname, char *outcmdexstring)
 {
     char tmpstr[STRINGMAXLEN_CMD_EXAMPLE];
 
     sprintf(tmpstr, "%s", shortname);
 
-    for(int arg = 0; arg < nbarg; arg++)
+    for (int arg = 0; arg < nbarg; arg++)
     {
-        if(!(fpscliarg[arg].flag & CLICMDARG_FLAG_NOCLI))
+        if (!(fpscliarg[arg].flag & CLICMDARG_FLAG_NOCLI))
         {
             char tmpstr1[STRINGMAXLEN_CMD_EXAMPLE];
-            snprintf(tmpstr1,
-                     STRINGMAXLEN_CMD_EXAMPLE - 1,
-                     " %s",
-                     fpscliarg[arg].example);
+            snprintf(tmpstr1, STRINGMAXLEN_CMD_EXAMPLE - 1, " %s", fpscliarg[arg].example);
 
             // max number of chars we can write
             int n = STRINGMAXLEN_CMD_EXAMPLE - strlen(tmpstr1);
-            if(n > 2)
+            if (n > 2)
             {
                 strncat(tmpstr, tmpstr1, n - 1);
             }
@@ -509,105 +442,81 @@ int CLIhelp_make_cmdexamplestring(
     return strlen(outcmdexstring);
 }
 
-
-
-
-
-
-static int checkFlag64(
-    uint64_t flags,
-    uint64_t testflag,
-    char *flagdescription
-)
+static int checkFlag64(uint64_t flags, uint64_t testflag, char *flagdescription)
 {
     int rval = 0;
 
     // printf("--------- flags: %ld\n", flags);
 
-    if(flags & testflag)
+    if (flags & testflag)
     {
         rval = 1;
-        printf("    [%c[%d;%dm ON%c[%dm]  %s\n",
-               (char) 27, 1, 32, (char) 27, 0, flagdescription);
+        printf("    [%c[%d;%dm ON%c[%dm]  %s\n", (char)27, 1, 32, (char)27, 0, flagdescription);
     }
     else
     {
         rval = 0;
-        printf("    [%c[%d;%dmOFF%c[%dm]  %s\n",
-               (char) 27, 1, 31, (char) 27, 0, flagdescription);
+        printf("    [%c[%d;%dmOFF%c[%dm]  %s\n", (char)27, 1, 31, (char)27, 0, flagdescription);
     }
     return rval;
 }
 
-
-
-
 /**
  * @brief command help\n
  *
  * @param[in] cmdkey Commmand name
  */
 
-errno_t help_command(
-    const char *__restrict cmdkey
-)
+errno_t help_command(const char *__restrict cmdkey)
 {
     int cOK = 0;
 
-
-    for(unsigned int cmdi = 0; cmdi < data.NBcmd; cmdi++)
+    for (unsigned int cmdi = 0; cmdi < data.NBcmd; cmdi++)
     {
-        if(!strcmp(cmdkey, data.cmd[cmdi].key))
+        if (!strcmp(cmdkey, data.cmd[cmdi].key))
         {
             printf("\n");
-            printf(COLORCMD "%s" COLORRESET " in %s [%s]\n\t" COLORINFO "%s\n" COLORRESET,
-                   data.cmd[cmdi].key,
-                   data.cmd[cmdi].module,
-                   data.module[data.cmd[cmdi].moduleindex].shortname,
-                   data.cmd[cmdi].info);
+            printf(COLORCMD "%s" COLORRESET " in %s [%s]\n\t" COLORINFO "%s\n" COLORRESET, data.cmd[cmdi].key,
+                   data.cmd[cmdi].module, data.module[data.cmd[cmdi].moduleindex].shortname, data.cmd[cmdi].info);
 
             //printf("syntax     :    %s\n", data.cmd[cmdi].syntax);
             printf("\texample> %s\n", data.cmd[cmdi].example);
             printf("\tsrc: %s\n", data.cmd[cmdi].srcfile);
 
-            int FPSsupport = checkFlag64(data.cmd[cmdi].cmdsettings.flags, CLICMDFLAG_FPS,
-                                         "FPS support");
-            if(FPSsupport == 1)
+            int FPSsupport = checkFlag64(data.cmd[cmdi].cmdsettings.flags, CLICMDFLAG_FPS, "FPS support");
+            if (FPSsupport == 1)
             {
-                if(checkFlag64(data.cmd[cmdi].cmdsettings.flags, CLICMDFLAG_PROCINFO,
-                               "processinfo support (..procinfo 0/1)") == 1)
+                if (checkFlag64(data.cmd[cmdi].cmdsettings.flags, CLICMDFLAG_PROCINFO,
+                                "processinfo support (..procinfo 0/1)") == 1)
                 {
-                    printf("        loopcntMax         : %ld\n",
-                           data.cmd[cmdi].cmdsettings.procinfo_loopcntMax);
+                    printf("        loopcntMax         : %ld\n", data.cmd[cmdi].cmdsettings.procinfo_loopcntMax);
                     printf("      Triggering:\n");
 
-                    printf("        triggermode        : %d ",
-                           data.cmd[cmdi].cmdsettings.triggermode);
-                    switch(data.cmd[cmdi].cmdsettings.triggermode)
+                    printf("        triggermode        : %d ", data.cmd[cmdi].cmdsettings.triggermode);
+                    switch (data.cmd[cmdi].cmdsettings.triggermode)
                     {
-                        case PROCESSINFO_TRIGGERMODE_IMMEDIATE:
-                            printf("IMMEDIATE");
-                            break;
-                        case PROCESSINFO_TRIGGERMODE_CNT0:
-                            printf("CNT0");
-                            break;
-                        case PROCESSINFO_TRIGGERMODE_CNT1:
-                            printf("CNT1");
-                            break;
-                        case PROCESSINFO_TRIGGERMODE_SEMAPHORE:
-                            printf("SEMAPHORE");
-                            break;
-                        case PROCESSINFO_TRIGGERMODE_DELAY:
-                            printf("DELAY");
-                            break;
-                        default:
-                            printf("unknown");
-                            break;
+                    case PROCESSINFO_TRIGGERMODE_IMMEDIATE:
+                        printf("IMMEDIATE");
+                        break;
+                    case PROCESSINFO_TRIGGERMODE_CNT0:
+                        printf("CNT0");
+                        break;
+                    case PROCESSINFO_TRIGGERMODE_CNT1:
+                        printf("CNT1");
+                        break;
+                    case PROCESSINFO_TRIGGERMODE_SEMAPHORE:
+                        printf("SEMAPHORE");
+                        break;
+                    case PROCESSINFO_TRIGGERMODE_DELAY:
+                        printf("DELAY");
+                        break;
+                    default:
+                        printf("unknown");
+                        break;
                     }
                     printf("\n");
 
-                    printf("        triggerstreamname  : %s\n",
-                           data.cmd[cmdi].cmdsettings.triggerstreamname);
+                    printf("        triggerstreamname  : %s\n", data.cmd[cmdi].cmdsettings.triggerstreamname);
 
                     printf("        triggerdelay       : %lld.%09ld\n",
                            (long long)data.cmd[cmdi].cmdsettings.triggerdelay.tv_sec,
@@ -620,32 +529,30 @@ errno_t help_command(
                     printf("      Resources:\n");
                     printf("        RT_priority        : %d\n",
 
-                           data.cmd[cmdi].cmdsettings. RT_priority);
+                           data.cmd[cmdi].cmdsettings.RT_priority);
 
                     printf("        CPUmask            : ");
 
                     int nproc = sysconf(_SC_NPROCESSORS_ONLN);
-                    for(int cpu = 0; cpu < nproc; cpu++)
+                    for (int cpu = 0; cpu < nproc; cpu++)
                     {
                         printf(" %d", CPU_ISSET(cpu, &data.cmd[cmdi].cmdsettings.CPUmask));
                     }
                     printf("\n");
-                    printf("        MeasureTiming      : %d\n",
-                           data.cmd[cmdi].cmdsettings.procinfo_MeasureTiming);
+                    printf("        MeasureTiming      : %d\n", data.cmd[cmdi].cmdsettings.procinfo_MeasureTiming);
                 }
             }
 
-
             printf("\n");
             printf("  CLI call arguments:\n");
             //printf("  CLI#       tagname             Value         description\n");
 
             int CLIargcnt = 0;
-            for(int argi = 0; argi < data.cmd[cmdi].nbarg; argi++)
+            for (int argi = 0; argi < data.cmd[cmdi].nbarg; argi++)
             {
                 //int colorcode = colorcodeargCLI;
 
-                if(!(data.cmd[cmdi].argdata[argi].flag & CLICMDARG_FLAG_NOCLI))
+                if (!(data.cmd[cmdi].argdata[argi].flag & CLICMDARG_FLAG_NOCLI))
                 {
                     printf("%6d  ", CLIargcnt);
                 }
@@ -655,93 +562,83 @@ errno_t help_command(
                 }
                 CLIargcnt++;
 
-
-
-
                 char valuestring[STRINGMAXLEN_CLICMDARG] = "???";
 
-                switch(data.cmd[cmdi].argdata[argi].type)
+                switch (data.cmd[cmdi].argdata[argi].type)
                 {
                     /*case CLIARG_FLOAT:
                         SNPRINTF_CHECK(valuestring, STRINGMAXLEN_CLICMDARG, "[ float ]  %f",
                                        data.cmd[cmdi].argdata[argi].val.f);
                         break;*/
 
-                    case CLIARG_FLOAT32:
-                        SNPRINTF_CHECK(valuestring, STRINGMAXLEN_CLICMDARG, "[float32]  %f",
-                                       data.cmd[cmdi].argdata[argi].val.f32);
-                        break;
+                case CLIARG_FLOAT32:
+                    SNPRINTF_CHECK(valuestring, STRINGMAXLEN_CLICMDARG, "[float32]  %f",
+                                   data.cmd[cmdi].argdata[argi].val.f32);
+                    break;
 
-                    case CLIARG_FLOAT64:
-                        SNPRINTF_CHECK(valuestring, STRINGMAXLEN_CLICMDARG, "[float64]  %lf",
-                                       data.cmd[cmdi].argdata[argi].val.f64);
-                        break;
+                case CLIARG_FLOAT64:
+                    SNPRINTF_CHECK(valuestring, STRINGMAXLEN_CLICMDARG, "[float64]  %lf",
+                                   data.cmd[cmdi].argdata[argi].val.f64);
+                    break;
 
-                    case CLIARG_ONOFF:
-                        SNPRINTF_CHECK(valuestring, STRINGMAXLEN_CLICMDARG, "[ ONOFF ]  %ld",
-                                       data.cmd[cmdi].argdata[argi].val.ui64);
-                        break;
+                case CLIARG_ONOFF:
+                    SNPRINTF_CHECK(valuestring, STRINGMAXLEN_CLICMDARG, "[ ONOFF ]  %ld",
+                                   data.cmd[cmdi].argdata[argi].val.ui64);
+                    break;
 
                     /*case CLIARG_LONG:
                         SNPRINTF_CHECK(valuestring, STRINGMAXLEN_CLICMDARG, "[ long  ]  %ld",
                                        data.cmd[cmdi].argdata[argi].val.l);
                         break;*/
 
-                    case CLIARG_INT32:
-                        SNPRINTF_CHECK(valuestring, STRINGMAXLEN_CLICMDARG, "[ int32 ]  %d",
-                                       data.cmd[cmdi].argdata[argi].val.i32);
-                        break;
+                case CLIARG_INT32:
+                    SNPRINTF_CHECK(valuestring, STRINGMAXLEN_CLICMDARG, "[ int32 ]  %d",
+                                   data.cmd[cmdi].argdata[argi].val.i32);
+                    break;
 
-                    case CLIARG_UINT32:
-                        SNPRINTF_CHECK(valuestring, STRINGMAXLEN_CLICMDARG, "[uint32 ]  %u",
-                                       data.cmd[cmdi].argdata[argi].val.ui32);
-                        break;
+                case CLIARG_UINT32:
+                    SNPRINTF_CHECK(valuestring, STRINGMAXLEN_CLICMDARG, "[uint32 ]  %u",
+                                   data.cmd[cmdi].argdata[argi].val.ui32);
+                    break;
 
-                    case CLIARG_INT64:
-                        SNPRINTF_CHECK(valuestring, STRINGMAXLEN_CLICMDARG, "[ int64 ]  %ld",
-                                       data.cmd[cmdi].argdata[argi].val.i64);
-                        break;
+                case CLIARG_INT64:
+                    SNPRINTF_CHECK(valuestring, STRINGMAXLEN_CLICMDARG, "[ int64 ]  %ld",
+                                   data.cmd[cmdi].argdata[argi].val.i64);
+                    break;
 
-                    case CLIARG_UINT64:
-                        SNPRINTF_CHECK(valuestring, STRINGMAXLEN_CLICMDARG, "[uint64 ]  %lu",
-                                       data.cmd[cmdi].argdata[argi].val.ui64);
-                        break;
+                case CLIARG_UINT64:
+                    SNPRINTF_CHECK(valuestring, STRINGMAXLEN_CLICMDARG, "[uint64 ]  %lu",
+                                   data.cmd[cmdi].argdata[argi].val.ui64);
+                    break;
 
-                    case CLIARG_STR_NOT_IMG:
-                        SNPRINTF_CHECK(valuestring, STRINGMAXLEN_CLICMDARG, "[ STRnI ]  %s",
-                                       data.cmd[cmdi].argdata[argi].val.s);
-                        break;
+                case CLIARG_STR_NOT_IMG:
+                    SNPRINTF_CHECK(valuestring, STRINGMAXLEN_CLICMDARG, "[ STRnI ]  %s",
+                                   data.cmd[cmdi].argdata[argi].val.s);
+                    break;
 
-                    case CLIARG_IMG:
-                        SNPRINTF_CHECK(valuestring, STRINGMAXLEN_CLICMDARG, "[  IMG  ]  %s",
-                                       data.cmd[cmdi].argdata[argi].val.s);
-                        break;
+                case CLIARG_IMG:
+                    SNPRINTF_CHECK(valuestring, STRINGMAXLEN_CLICMDARG, "[  IMG  ]  %s",
+                                   data.cmd[cmdi].argdata[argi].val.s);
+                    break;
 
-                    case CLIARG_STR:
-                        SNPRINTF_CHECK(valuestring, STRINGMAXLEN_CLICMDARG, "[  STR  ]  %s",
-                                       data.cmd[cmdi].argdata[argi].val.s);
-                        break;
+                case CLIARG_STR:
+                    SNPRINTF_CHECK(valuestring, STRINGMAXLEN_CLICMDARG, "[  STR  ]  %s",
+                                   data.cmd[cmdi].argdata[argi].val.s);
+                    break;
                 }
 
-
-
-
-                if(!(data.cmd[cmdi].argdata[argi].flag & CLICMDARG_FLAG_NOCLI))
+                if (!(data.cmd[cmdi].argdata[argi].flag & CLICMDARG_FLAG_NOCLI))
                 {
-                    printf(COLORARGCLI " %-16s" COLORRESET " %-24s %s\n",
-                           data.cmd[cmdi].argdata[argi].fpstag,
+                    printf(COLORARGCLI " %-16s" COLORRESET " %-24s %s\n", data.cmd[cmdi].argdata[argi].fpstag,
                            valuestring, data.cmd[cmdi].argdata[argi].descr);
                 }
                 else
                 {
-                    printf(COLORARGnotCLI " %-16s" COLORRESET " %-24s %s\n",
-                           data.cmd[cmdi].argdata[argi].fpstag,
+                    printf(COLORARGnotCLI " %-16s" COLORRESET " %-24s %s\n", data.cmd[cmdi].argdata[argi].fpstag,
                            valuestring, data.cmd[cmdi].argdata[argi].descr);
                 }
             }
 
-
-
             printf("\n");
 
             cOK = 1;
@@ -750,16 +647,15 @@ errno_t help_command(
 
     int foundsubstring = 0;
     int foundregexmatch = 0;
-    if(cOK == 0)
+    if (cOK == 0)
     {
         printf("Command \"%s\" does not exist. Partial matches:\n", cmdkey);
 
-
         regex_t regex;
         int reti;
         /* Compile regular expression */
         reti = regcomp(&regex, cmdkey, REG_EXTENDED);
-        if(reti)
+        if (reti)
         {
             fprintf(stderr, "Could not compile regex : \"%s\"\n", cmdkey);
             exit(1);
@@ -767,49 +663,42 @@ errno_t help_command(
         int maxGroups = 8;
         regmatch_t groupArray[maxGroups];
 
-
-
-        for(unsigned int cmdi = 0; cmdi < data.NBcmd; cmdi++)
+        for (unsigned int cmdi = 0; cmdi < data.NBcmd; cmdi++)
         {
 
             int matchsubstring = 0;
             // look for substring match
 
-            if(strstr(data.cmd[cmdi].key, cmdkey) != NULL)
+            if (strstr(data.cmd[cmdi].key, cmdkey) != NULL)
             {
                 foundsubstring = 1;
                 matchsubstring = 1;
-                printf(COLORCMD "%s" COLORRESET " in %s [%s]\n\t" COLORINFO "%s\n" COLORRESET,
-                       data.cmd[cmdi].key,
-                       data.cmd[cmdi].module,
-                       data.module[data.cmd[cmdi].moduleindex].shortname,
-                       data.cmd[cmdi].info);
+                printf(COLORCMD "%s" COLORRESET " in %s [%s]\n\t" COLORINFO "%s\n" COLORRESET, data.cmd[cmdi].key,
+                       data.cmd[cmdi].module, data.module[data.cmd[cmdi].moduleindex].shortname, data.cmd[cmdi].info);
             }
 
             // Regular expression search
-            if(matchsubstring == 0)
+            if (matchsubstring == 0)
             {
                 // Regular expression search
                 reti = regexec(&regex, data.cmd[cmdi].key, maxGroups, groupArray, 0);
-                if(!reti)
+                if (!reti)
                 {
                     foundregexmatch = 1;
-                    printf(COLORCMD "%s" COLORRESET " in %s [%s]\n\t" COLORINFO "%s\n" COLORRESET,
-                           data.cmd[cmdi].key,
-                           data.cmd[cmdi].module,
-                           data.module[data.cmd[cmdi].moduleindex].shortname,
+                    printf(COLORCMD "%s" COLORRESET " in %s [%s]\n\t" COLORINFO "%s\n" COLORRESET, data.cmd[cmdi].key,
+                           data.cmd[cmdi].module, data.module[data.cmd[cmdi].moduleindex].shortname,
                            data.cmd[cmdi].info);
 
                     char *cursor = data.cmd[cmdi].key;
                     unsigned int offset = 0;
-                    for(int g = 0; g < maxGroups; g++)
+                    for (int g = 0; g < maxGroups; g++)
                     {
-                        if(groupArray[g].rm_so == (regoff_t)((size_t) -1))
+                        if (groupArray[g].rm_so == (regoff_t)((size_t)-1))
                         {
-                            break;    // No more groups
+                            break; // No more groups
                         }
 
-                        if(g == 0)
+                        if (g == 0)
                         {
                             offset = groupArray[g].rm_eo;
                         }
@@ -823,7 +712,7 @@ errno_t help_command(
                     }
                     cursor += offset;
                 }
-                else if(reti == REG_NOMATCH)
+                else if (reti == REG_NOMATCH)
                 {
                     //puts("No match");
                 }
@@ -839,9 +728,9 @@ errno_t help_command(
 
         regfree(&regex);
 
-        if(foundsubstring == 0)
+        if (foundsubstring == 0)
         {
-            if(foundregexmatch == 0)
+            if (foundregexmatch == 0)
             {
                 printf("\tNo substring or regex match to \"%s\"\n", cmdkey);
             }
@@ -851,27 +740,22 @@ errno_t help_command(
     return RETURN_SUCCESS;
 }
 
-
-
-
 /**
  * @brief search for string in command info
  *
  */
 
-errno_t command_info_search(
-    const char *restrict searchstring
-)
+errno_t command_info_search(const char *restrict searchstring)
 {
     int foundsubstring = 0;
     int foundregexmatch = 0;
-    int colorcodecmd = 31; // red
+    int colorcodecmd = 31;  // red
     int colorcodeinfo = 32; // green
 
     regex_t regex;
     /* Compile regular expression */
     int reti = regcomp(&regex, searchstring, REG_EXTENDED);
-    if(reti)
+    if (reti)
     {
         fprintf(stderr, "Could not compile regex : \"%s\"\n", searchstring);
         exit(1);
@@ -879,58 +763,45 @@ errno_t command_info_search(
     int maxGroups = 8;
     regmatch_t groupArray[maxGroups];
 
-
-
-    for(unsigned int cmdi = 0; cmdi < data.NBcmd; cmdi++)
+    for (unsigned int cmdi = 0; cmdi < data.NBcmd; cmdi++)
     {
 
         int matchsubstring = 0;
         // look for substring match
 
-        if(strstr(data.cmd[cmdi].info, searchstring) != NULL)
+        if (strstr(data.cmd[cmdi].info, searchstring) != NULL)
         {
             foundsubstring = 1;
             matchsubstring = 1;
-            printf("%c[%d;%dm%s%c[%dm in %s [%s]\n\t%c[%d;%dm%s%c[%dm\n",
-                   (char) 27, 1, colorcodecmd,
-                   data.cmd[cmdi].key,
-                   (char) 27, 0,
-                   data.cmd[cmdi].module,
-                   data.module[data.cmd[cmdi].moduleindex].shortname,
-                   (char) 27, 1, colorcodeinfo,
-                   data.cmd[cmdi].info,
-                   (char) 27, 0);
+            printf("%c[%d;%dm%s%c[%dm in %s [%s]\n\t%c[%d;%dm%s%c[%dm\n", (char)27, 1, colorcodecmd, data.cmd[cmdi].key,
+                   (char)27, 0, data.cmd[cmdi].module, data.module[data.cmd[cmdi].moduleindex].shortname, (char)27, 1,
+                   colorcodeinfo, data.cmd[cmdi].info, (char)27, 0);
         }
 
         // Regular expression search
-        if(matchsubstring == 0)
+        if (matchsubstring == 0)
         {
             // Regular expression search
             reti = regexec(&regex, data.cmd[cmdi].info, maxGroups, groupArray, 0);
-            if(!reti)
+            if (!reti)
             {
                 foundregexmatch = 1;
 
-                printf("%c[%d;%dm%s%c[%dm in %s [%s]\n\t%c[%d;%dm%s%c[%dm\n",
-                       (char) 27, 1, colorcodecmd,
-                       data.cmd[cmdi].key,
-                       (char) 27, 0,
-                       data.cmd[cmdi].module,
-                       data.module[data.cmd[cmdi].moduleindex].shortname,
-                       (char) 27, 1, colorcodeinfo,
-                       data.cmd[cmdi].info,
-                       (char) 27, 0);
+                printf("%c[%d;%dm%s%c[%dm in %s [%s]\n\t%c[%d;%dm%s%c[%dm\n", (char)27, 1, colorcodecmd,
+                       data.cmd[cmdi].key, (char)27, 0, data.cmd[cmdi].module,
+                       data.module[data.cmd[cmdi].moduleindex].shortname, (char)27, 1, colorcodeinfo,
+                       data.cmd[cmdi].info, (char)27, 0);
 
                 char *cursor = data.cmd[cmdi].info;
                 unsigned int offset = 0;
-                for(int g = 0; g < maxGroups; g++)
+                for (int g = 0; g < maxGroups; g++)
                 {
-                    if(groupArray[g].rm_so == (regoff_t)((size_t) -1))
+                    if (groupArray[g].rm_so == (regoff_t)((size_t)-1))
                     {
-                        break;    // No more groups
+                        break; // No more groups
                     }
 
-                    if(g == 0)
+                    if (g == 0)
                     {
                         offset = groupArray[g].rm_eo;
                     }
@@ -944,7 +815,7 @@ errno_t command_info_search(
                 }
                 cursor += offset;
             }
-            else if(reti == REG_NOMATCH)
+            else if (reti == REG_NOMATCH)
             {
                 //puts("No match");
             }
@@ -960,63 +831,39 @@ errno_t command_info_search(
 
     regfree(&regex);
 
-    if(foundsubstring == 0)
+    if (foundsubstring == 0)
     {
-        if(foundregexmatch == 0)
+        if (foundregexmatch == 0)
         {
             printf("\tNo substring or regex match to \"%s\"\n", searchstring);
         }
     }
 
-
     return RETURN_SUCCESS;
 }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 errno_t help()
 {
 
-    EXECUTE_SYSTEM_COMMAND("more %s/src/CommandLineInterface/doc/help.txt",
-                           data.sourcedir);
+    EXECUTE_SYSTEM_COMMAND("more %s/src/CommandLineInterface/doc/help.txt", data.sourcedir);
 
     return RETURN_SUCCESS;
 }
 
-
 errno_t helpreadline()
 {
 
-    EXECUTE_SYSTEM_COMMAND("more %s/src/CommandLineInterface/doc/helpreadline.md",
-                           data.sourcedir);
+    EXECUTE_SYSTEM_COMMAND("more %s/src/CommandLineInterface/doc/helpreadline.md", data.sourcedir);
 
     return RETURN_SUCCESS;
 }
 
-
 errno_t help_cmd()
 {
-    if((data.cmdargtoken[1].type == CMDARGTOKEN_TYPE_STRING)
-            || (data.cmdargtoken[1].type == CMDARGTOKEN_TYPE_EXISTINGIMAGE)
-            || (data.cmdargtoken[1].type == CMDARGTOKEN_TYPE_COMMAND)
-            || (data.cmdargtoken[1].type == CMDARGTOKEN_TYPE_RAWSTRING))
+    if ((data.cmdargtoken[1].type == CMDARGTOKEN_TYPE_STRING) ||
+        (data.cmdargtoken[1].type == CMDARGTOKEN_TYPE_EXISTINGIMAGE) ||
+        (data.cmdargtoken[1].type == CMDARGTOKEN_TYPE_COMMAND) ||
+        (data.cmdargtoken[1].type == CMDARGTOKEN_TYPE_RAWSTRING))
     {
         help_command(data.cmdargtoken[1].val.string);
     }
@@ -1030,10 +877,10 @@ errno_t help_cmd()
 
 errno_t cmdinfosearch()
 {
-    if((data.cmdargtoken[1].type == CMDARGTOKEN_TYPE_STRING)
-            || (data.cmdargtoken[1].type == CMDARGTOKEN_TYPE_EXISTINGIMAGE)
-            || (data.cmdargtoken[1].type == CMDARGTOKEN_TYPE_COMMAND)
-            || (data.cmdargtoken[1].type == CMDARGTOKEN_TYPE_RAWSTRING))
+    if ((data.cmdargtoken[1].type == CMDARGTOKEN_TYPE_STRING) ||
+        (data.cmdargtoken[1].type == CMDARGTOKEN_TYPE_EXISTINGIMAGE) ||
+        (data.cmdargtoken[1].type == CMDARGTOKEN_TYPE_COMMAND) ||
+        (data.cmdargtoken[1].type == CMDARGTOKEN_TYPE_RAWSTRING))
     {
         command_info_search(data.cmdargtoken[1].val.string);
     }
@@ -1045,15 +892,10 @@ errno_t cmdinfosearch()
     return RETURN_SUCCESS;
 }
 
-
-
-
-
-
 errno_t help_module()
 {
 
-    if(data.cmdargtoken[1].type == 3)
+    if (data.cmdargtoken[1].type == 3)
     {
         list_commands_module(data.cmdargtoken[1].val.string);
     }
@@ -1061,27 +903,21 @@ errno_t help_module()
     {
         long i;
         printf("\n");
-        printf("%2s  %10s %32s %10s %7s    %20s %s\n", "#", "shortname", "Name",
-               "Package", "Version", "last compiled",
+        printf("%2s  %10s %32s %10s %7s    %20s %s\n", "#", "shortname", "Name", "Package", "Version", "last compiled",
                "description");
-        printf("--------------------------------------------------------------------------------------------------------------\n");
-        for(i = 0; i < data.NBmodule; i++)
+        printf("-------------------------------------------------------------------------------------------------------"
+               "-------\n");
+        for (i = 0; i < data.NBmodule; i++)
         {
-            printf("%2ld %10s \033[1m%32s\033[0m %10s %2d.%02d.%02d    %11s %8s  %s\n",
-                   i,
-                   data.module[i].shortname,
-                   data.module[i].name,
-                   data.module[i].package,
-                   data.module[i].versionmajor, data.module[i].versionminor,
-                   data.module[i].versionpatch,
-                   data.module[i].datestring, data.module[i].timestring,
-                   data.module[i].info);
+            printf("%2ld %10s \033[1m%32s\033[0m %10s %2d.%02d.%02d    %11s %8s  %s\n", i, data.module[i].shortname,
+                   data.module[i].name, data.module[i].package, data.module[i].versionmajor,
+                   data.module[i].versionminor, data.module[i].versionpatch, data.module[i].datestring,
+                   data.module[i].timestring, data.module[i].info);
         }
-        printf("-------------------------------------------------------------------------------------------------------\n");
+        printf("-------------------------------------------------------------------------------------------------------"
+               "\n");
         printf("\n");
     }
 
     return RETURN_SUCCESS;
 }
-
-
diff --git a/src/CommandLineInterface/CLIcore_help.h b/src/CommandLineInterface/CLIcore_help.h
index 43350bac..7d1bb167 100644
--- a/src/CommandLineInterface/CLIcore_help.h
+++ b/src/CommandLineInterface/CLIcore_help.h
@@ -5,35 +5,22 @@
  *
  */
 
-
 #ifndef CLICORE_HELP_H
 #define CLICORE_HELP_H
 
 #ifdef __cplusplus
-typedef const char * CONST_WORD;
+typedef const char *CONST_WORD;
 #else
-typedef const char *__restrict  CONST_WORD;
+typedef const char *__restrict CONST_WORD;
 #endif
 
-
 errno_t help();
 
 errno_t helpreadline();
 
+int CLIhelp_make_argstring(CLICMDARGDEF fpscliarg[], int nbarg, char *outargstring);
 
-int CLIhelp_make_argstring(
-    CLICMDARGDEF fpscliarg[],
-    int nbarg,
-    char *outargstring
-);
-
-int CLIhelp_make_cmdexamplestring(
-    CLICMDARGDEF fpscliarg[],
-    int nbarg,
-    char *shortname,
-	char *outcmdexstring
-);
-
+int CLIhelp_make_cmdexamplestring(CLICMDARGDEF fpscliarg[], int nbarg, char *shortname, char *outcmdexstring);
 
 errno_t help_cmd();
 
@@ -41,21 +28,12 @@ errno_t cmdinfosearch();
 
 errno_t help_module();
 
-
-
 errno_t printInfo();
 
 errno_t list_commands();
 
-errno_t list_commands_module(
-    CONST_WORD modulename
-);
-
-
-
-errno_t help_command(
-    CONST_WORD cmdkey
-);
+errno_t list_commands_module(CONST_WORD modulename);
 
+errno_t help_command(CONST_WORD cmdkey);
 
 #endif
diff --git a/src/CommandLineInterface/CLIcore_memory.c b/src/CommandLineInterface/CLIcore_memory.c
index 293e5d61..e2c899dd 100644
--- a/src/CommandLineInterface/CLIcore_memory.c
+++ b/src/CommandLineInterface/CLIcore_memory.c
@@ -2,16 +2,12 @@
 
 #include "COREMOD_memory/COREMOD_memory.h"
 
-
-
-
 errno_t memory_re_alloc()
 {
     /* keeps the number of images addresses available
      *  NB_IMAGES_BUFFER above the number of used images
      */
 
-
 #ifdef DATA_STATIC_ALLOC
     //printf("image static allocation mode\n");
     //fflush(stdout);
@@ -24,81 +20,78 @@ errno_t memory_re_alloc()
     //printf("DYNAMIC ALLOC. Current = %d, buffer = %d, max = %ld\n", current_NBimage, NB_IMAGES_BUFFER, data.NB_MAX_IMAGE);
     //fflush(stdout);
 
-    if((current_NBimage + NB_IMAGES_BUFFER) > data.NB_MAX_IMAGE)
+    if ((current_NBimage + NB_IMAGES_BUFFER) > data.NB_MAX_IMAGE)
     {
         long tmplong;
         IMAGE *ptrtmp;
 
         //   if(data.Debug>0)
         //    {
-        printf("%p IMAGE STRUCT SIZE = %ld\n", data.image, (long) sizeof(IMAGE));
+        printf("%p IMAGE STRUCT SIZE = %ld\n", data.image, (long)sizeof(IMAGE));
         printf("REALLOCATING IMAGE DATA BUFFER: %ld -> %ld\n", data.NB_MAX_IMAGE,
                data.NB_MAX_IMAGE + NB_IMAGES_BUFFER_REALLOC);
         fflush(stdout);
         //    }
         tmplong = data.NB_MAX_IMAGE;
         data.NB_MAX_IMAGE = data.NB_MAX_IMAGE + NB_IMAGES_BUFFER_REALLOC;
-        ptrtmp = (IMAGE *) realloc(data.image, sizeof(IMAGE) * data.NB_MAX_IMAGE);
-        if(data.Debug > 0)
+        ptrtmp = (IMAGE *)realloc(data.image, sizeof(IMAGE) * data.NB_MAX_IMAGE);
+        if (data.Debug > 0)
         {
             printf("NEW POINTER = %p\n", ptrtmp);
             fflush(stdout);
         }
         data.image = ptrtmp;
-        if(data.image == NULL)
+        if (data.image == NULL)
         {
             PRINT_ERROR("Reallocation of data.image has failed - exiting program");
-            return -1;      //  exit(0);
+            return -1; //  exit(0);
         }
-        if(data.Debug > 0)
+        if (data.Debug > 0)
         {
             printf("REALLOCATION DONE\n");
             fflush(stdout);
         }
 
         imageID i;
-        for(i = tmplong; i < data.NB_MAX_IMAGE; i++)
+        for (i = tmplong; i < data.NB_MAX_IMAGE; i++)
         {
-            data.image[i].used    = 0;
+            data.image[i].used = 0;
             data.image[i].createcnt = 0;
-            data.image[i].shmfd   = -1;
+            data.image[i].shmfd = -1;
             data.image[i].memsize = 0;
-            data.image[i].semptr  = NULL;
-            data.image[i].semlog  = NULL;
+            data.image[i].semptr = NULL;
+            data.image[i].semlog = NULL;
         }
     }
 #endif
 
-
     /* keeps the number of variables addresses available
      *  NB_VARIABLES_BUFFER above the number of used variables
      */
 
-
 #ifdef DATA_STATIC_ALLOC
     // variable static allocation mode
 #else
-    if((compute_nb_variable() + NB_VARIABLES_BUFFER) > data.NB_MAX_VARIABLE)
+    if ((compute_nb_variable() + NB_VARIABLES_BUFFER) > data.NB_MAX_VARIABLE)
     {
         long tmplong;
 
-        if(data.Debug > 0)
+        if (data.Debug > 0)
         {
             printf("REALLOCATING VARIABLE DATA BUFFER\n");
             fflush(stdout);
         }
         tmplong = data.NB_MAX_VARIABLE;
         data.NB_MAX_VARIABLE = data.NB_MAX_VARIABLE + NB_VARIABLES_BUFFER_REALLOC;
-        data.variable = (VARIABLE *) realloc(data.variable,
-                                             sizeof(VARIABLE) * data.NB_MAX_VARIABLE);
-        if(data.variable == NULL)
+        data.variable = (VARIABLE *)realloc(data.variable, sizeof(VARIABLE) * data.NB_MAX_VARIABLE);
+        if (data.variable == NULL)
         {
             PRINT_ERROR("Reallocation of data.variable has failed - exiting program");
-            return -1;   // exit(0);
+            return -1; // exit(0);
         }
 
         int i;
-        for(i = tmplong; i < data.NB_MAX_VARIABLE; i++)
+        for (i = tmplong; i < data.NB_MAX_VARIABLE; i++)
         {
             data.variable[i].used = 0;
             data.variable[i].type = -1;
@@ -106,12 +99,5 @@ errno_t memory_re_alloc()
     }
 #endif
 
-
-
     return RETURN_SUCCESS;
 }
-
-
-
-
-
diff --git a/src/CommandLineInterface/CLIcore_memory.h b/src/CommandLineInterface/CLIcore_memory.h
index 1a12518d..e81c3ccb 100644
--- a/src/CommandLineInterface/CLIcore_memory.h
+++ b/src/CommandLineInterface/CLIcore_memory.h
@@ -1,17 +1,14 @@
 /**
  * @file CLIcore_memory.h
- * 
+ *
  * @brief memory functions
  *
  */
 
-
 #ifndef CLICORE_MEMORY_H
 
 #define CLICORE_MEMORY_H
 
-
 errno_t memory_re_alloc();
 
-
 #endif
diff --git a/src/CommandLineInterface/CLIcore_modules.c b/src/CommandLineInterface/CLIcore_modules.c
index 4bde90b3..a4de5a7d 100644
--- a/src/CommandLineInterface/CLIcore_modules.c
+++ b/src/CommandLineInterface/CLIcore_modules.c
@@ -5,106 +5,85 @@
  *
  */
 
-
-#include <dlfcn.h>
 #include <dirent.h>
+#include <dlfcn.h>
 
 #include "CommandLineInterface/CLIcore.h"
 
-
-
-#define KNRM  "\x1B[0m"
-#define KRED  "\x1B[31m"
-#define KGRN  "\x1B[32m"
-#define KYEL  "\x1B[33m"
-#define KBLU  "\x1B[34m"
-#define KMAG  "\x1B[35m"
-#define KCYN  "\x1B[36m"
-#define KWHT  "\x1B[37m"
-#define KRES  "\033[0m"
-
-
-
+#define KNRM "\x1B[0m"
+#define KRED "\x1B[31m"
+#define KGRN "\x1B[32m"
+#define KYEL "\x1B[33m"
+#define KBLU "\x1B[34m"
+#define KMAG "\x1B[35m"
+#define KCYN "\x1B[36m"
+#define KWHT "\x1B[37m"
+#define KRES "\033[0m"
 
 // local valiables to keep track of library last loaded
 static int DLib_index;
 static void *DLib_handle[1000];
 static char libnameloaded[STRINGMAXLEN_MODULE_SOFILENAME];
 
-
-
-errno_t load_sharedobj(
-    const char *__restrict libname
-)
+errno_t load_sharedobj(const char *__restrict libname)
 {
     DEBUG_TRACE_FSTART();
 
     DEBUG_TRACEPOINT("[%5d] Loading shared object \"%s\"", DLib_index, libname);
     strncpy(libnameloaded, libname, STRINGMAXLEN_MODULE_SOFILENAME - 1);
 
-
     // check if already loaded
     DEBUG_TRACEPOINT("--- %ld modules loaded ---", data.NBmodule);
     int mmatch = -1;
-    for(int m = 0; m < data.NBmodule; m++)
+    for (int m = 0; m < data.NBmodule; m++)
     {
         //printf("  [%03d] %s\n", m, data.module[m].sofilename);
-        if(strcmp(libnameloaded, data.module[m].sofilename) == 0)
+        if (strcmp(libnameloaded, data.module[m].sofilename) == 0)
         {
             mmatch = m;
         }
     }
-    if(mmatch > -1)
+    if (mmatch > -1)
     {
-        printf("    Shared object %s already loaded - no action taken\n",
-               libnameloaded);
+        printf("    Shared object %s already loaded - no action taken\n", libnameloaded);
         DEBUG_TRACE_FEXIT();
         return RETURN_FAILURE;
     }
 
-
-
     DLib_handle[DLib_index] = dlopen(libname, RTLD_LAZY | RTLD_GLOBAL);
-    if(!DLib_handle[DLib_index])
+    if (!DLib_handle[DLib_index])
     {
-        fprintf(stderr, KRED"%s\n"KRES, dlerror());
+        fprintf(stderr, KRED "%s\n" KRES, dlerror());
         //exit(EXIT_FAILURE);
     }
     else
     {
         dlerror();
-        printf(KGRN"   LOADED : %s\n"KRES, libnameloaded);
+        printf(KGRN "   LOADED : %s\n" KRES, libnameloaded);
         // increment number of libs dynamically loaded
-        DLib_index ++;
+        DLib_index++;
     }
 
     DEBUG_TRACE_FEXIT();
     return RETURN_SUCCESS;
 }
 
-
-
-
-errno_t load_module_shared(
-    const char *__restrict modulename
-)
+errno_t load_module_shared(const char *__restrict modulename)
 {
     DEBUG_TRACE_FSTART();
     char libname[STRINGMAXLEN_MODULE_SOFILENAME];
 
-
     // make locacl copy of module name
     char modulenameLC[STRINGMAXLEN_MODULE_SOFILENAME];
 
     {
-        int slen = snprintf(modulenameLC, STRINGMAXLEN_MODULE_SOFILENAME, "%s",
-                            modulename);
-        if(slen < 1)
+        int slen = snprintf(modulenameLC, STRINGMAXLEN_MODULE_SOFILENAME, "%s", modulename);
+        if (slen < 1)
         {
             PRINT_ERROR("snprintf wrote <1 char");
             abort(); // can't handle this error any other way
         }
-        if(slen >= STRINGMAXLEN_MODULE_SOFILENAME)
+        if (slen >= STRINGMAXLEN_MODULE_SOFILENAME)
         {
             PRINT_ERROR("snprintf string truncation");
             abort(); // can't handle this error any other way
@@ -113,18 +92,16 @@ errno_t load_module_shared(
 
     // Assemble absolute path module filename
     //printf("Searching for shared object in directory MILK_INSTALLDIR/lib : %s/lib\n", getenv("MILK_INSTALLDIR"));
-    DEBUG_TRACEPOINT("Searching for shared object in directory [data.installdir]/lib : %s/lib",
-                     data.installdir);
+    DEBUG_TRACEPOINT("Searching for shared object in directory [data.installdir]/lib : %s/lib", data.installdir);
 
     {
-        int slen = snprintf(libname, STRINGMAXLEN_MODULE_SOFILENAME,
-                            "%s/lib/lib%s.so", data.installdir, modulenameLC);
-        if(slen < 1)
+        int slen = snprintf(libname, STRINGMAXLEN_MODULE_SOFILENAME, "%s/lib/lib%s.so", data.installdir, modulenameLC);
+        if (slen < 1)
         {
             PRINT_ERROR("snprintf wrote <1 char");
             abort(); // can't handle this error any other way
         }
-        if(slen >= STRINGMAXLEN_MODULE_SOFILENAME)
+        if (slen >= STRINGMAXLEN_MODULE_SOFILENAME)
         {
             PRINT_ERROR("snprintf string truncation");
             abort(); // can't handle this error any other way
@@ -140,7 +117,7 @@ errno_t load_module_shared(
     data.moduletype = MODULE_TYPE_CUSTOMLOAD;
     strncpy(data.moduleloadname, modulenameLC, STRINGMAXLEN_MODULE_LOADNAME - 1);
     strncpy(data.modulesofilename, libname, STRINGMAXLEN_MODULE_SOFILENAME - 1);
-    if(load_sharedobj(libname) == RETURN_SUCCESS)
+    if (load_sharedobj(libname) == RETURN_SUCCESS)
     {
         //
     }
@@ -153,17 +130,13 @@ errno_t load_module_shared(
     return RETURN_SUCCESS;
 }
 
-
-
-
-
 errno_t load_module_shared_ALL()
 {
     DEBUG_TRACE_FSTART();
 
     char libname[STRINGMAXLEN_FULLFILENAME];
     char dirname[STRINGMAXLEN_DIRNAME];
-    DIR           *d;
+    DIR *d;
     struct dirent *dir;
     int iter;
     int loopOK;
@@ -171,7 +144,7 @@ errno_t load_module_shared_ALL()
 
     WRITE_DIRNAME(dirname, "%s/lib", data.installdir);
 
-    if(data.quiet == 0)
+    if (data.quiet == 0)
     {
         printf("LOAD MODULES SHARED ALL: %s\n", dirname);
     }
@@ -179,16 +152,16 @@ errno_t load_module_shared_ALL()
     loopOK = 0;
     iter = 0;
     itermax = 4; // number of passes
-    while((loopOK == 0) && (iter < itermax))
+    while ((loopOK == 0) && (iter < itermax))
     {
         loopOK = 1;
         d = opendir(dirname);
-        if(d)
+        if (d)
         {
-            while((dir = readdir(d)) != NULL)
+            while ((dir = readdir(d)) != NULL)
             {
                 char *dot = strrchr(dir->d_name, '.');
-                if(dot && !strcmp(dot, ".so"))
+                if (dot && !strcmp(dot, ".so"))
                 {
                     WRITE_FULLFILENAME(libname, "%s/lib/%s", data.installdir, dir->d_name);
                     //printf("%02d   (re-?) LOADING shared object  %40s -> %s\n", DLib_index, dir->d_name, libname);
@@ -196,11 +169,10 @@ errno_t load_module_shared_ALL()
 
                     printf("    [%5d] Loading shared object \"%s\"\n", DLib_index, libname);
                     DLib_handle[DLib_index] = dlopen(libname, RTLD_LAZY | RTLD_GLOBAL);
-                    if(!DLib_handle[DLib_index])
+                    if (!DLib_handle[DLib_index])
                     {
-                        fprintf(stderr, KMAG
-                                "        WARNING: linker pass # %d, module # %d\n          %s\n" KRES, iter,
-                                DLib_index, dlerror());
+                        fprintf(stderr, KMAG "        WARNING: linker pass # %d, module # %d\n          %s\n" KRES,
+                                iter, DLib_index, dlerror());
                         fflush(stderr);
                         //exit(EXIT_FAILURE);
                         loopOK = 0;
@@ -209,24 +181,22 @@ errno_t load_module_shared_ALL()
                     {
                         dlerror();
                         // increment number of libs dynamically loaded
-                        DLib_index ++;
+                        DLib_index++;
                     }
-
-
                 }
             }
 
             closedir(d);
         }
-        if(iter > 0)
-            if(loopOK == 1)
+        if (iter > 0)
+            if (loopOK == 1)
             {
                 printf(KGRN "        Linker pass #%d successful\n" KRES, iter);
             }
         iter++;
     }
 
-    if(loopOK != 1)
+    if (loopOK != 1)
     {
         printf("Some libraries could not be loaded -> EXITING\n");
         exit(2);
@@ -238,18 +208,8 @@ errno_t load_module_shared_ALL()
     return RETURN_SUCCESS;
 }
 
-
-
-
-
-errno_t RegisterModule(
-    const char *__restrict FileName,
-    const char *__restrict PackageName,
-    const char *__restrict InfoString,
-    int versionmajor,
-    int versionminor,
-    int versionpatch
-)
+errno_t RegisterModule(const char *__restrict FileName, const char *__restrict PackageName,
+                       const char *__restrict InfoString, int versionmajor, int versionminor, int versionpatch)
 {
     DEBUG_TRACE_FSTART();
 
@@ -257,21 +217,20 @@ errno_t RegisterModule(
 
     //printf("REGISTERING MODULE %s\n", FileName);
 
-    if(strlen(data.modulename) == 0)
+    if (strlen(data.modulename) == 0)
     {
         strcpy(data.module[data.NBmodule].name, "???");
     }
     else
     {
-        strcpy(data.module[data.NBmodule].name,         data.modulename);
+        strcpy(data.module[data.NBmodule].name, data.modulename);
     }
 
-
     int stringlen = strlen(data.moduleshortname);
-    if(stringlen == 0)
+    if (stringlen == 0)
     {
         // if no shortname provided, try to use default
-        if(strlen(data.moduleshortname_default) > 0)
+        if (strlen(data.moduleshortname_default) > 0)
         {
             // otherwise, construct call key as <shortname_default>.<CLIkey>
             strcpy(data.moduleshortname, data.moduleshortname_default);
@@ -280,13 +239,13 @@ errno_t RegisterModule(
 
     data.moduleindex = data.NBmodule; // current module index
 
-    strcpy(data.module[data.NBmodule].package,      PackageName);
-    strcpy(data.module[data.NBmodule].info,         InfoString);
+    strcpy(data.module[data.NBmodule].package, PackageName);
+    strcpy(data.module[data.NBmodule].info, InfoString);
 
-    strcpy(data.module[data.NBmodule].shortname,    data.moduleshortname);
+    strcpy(data.module[data.NBmodule].shortname, data.moduleshortname);
 
-    strcpy(data.module[data.NBmodule].datestring,   data.moduledatestring);
-    strcpy(data.module[data.NBmodule].timestring,   data.moduletimestring);
+    strcpy(data.module[data.NBmodule].datestring, data.moduledatestring);
+    strcpy(data.module[data.NBmodule].timestring, data.moduletimestring);
 
     data.module[data.NBmodule].versionmajor = versionmajor;
     data.module[data.NBmodule].versionminor = versionminor;
@@ -294,19 +253,16 @@ errno_t RegisterModule(
 
     data.module[data.NBmodule].type = data.moduletype;
 
-    strncpy(data.module[data.NBmodule].loadname, data.moduleloadname,
-            STRINGMAXLEN_MODULE_LOADNAME - 1);
-    strncpy(data.module[data.NBmodule].sofilename, data.modulesofilename,
-            STRINGMAXLEN_MODULE_SOFILENAME - 1);
+    strncpy(data.module[data.NBmodule].loadname, data.moduleloadname, STRINGMAXLEN_MODULE_LOADNAME - 1);
+    strncpy(data.module[data.NBmodule].sofilename, data.modulesofilename, STRINGMAXLEN_MODULE_SOFILENAME - 1);
 
     //printf("--- libnameloaded : %s\n", libnameloaded);
-    strncpy(data.module[data.NBmodule].sofilename, libnameloaded,
-            STRINGMAXLEN_MODULE_SOFILENAME - 1);
+    strncpy(data.module[data.NBmodule].sofilename, libnameloaded, STRINGMAXLEN_MODULE_SOFILENAME - 1);
 
-    if(data.progStatus == 0)
+    if (data.progStatus == 0)
     {
         OKmsg = 1;
-        if(!getenv("MILK_QUIET"))
+        if (!getenv("MILK_QUIET"))
         {
             printf(".");
         }
@@ -314,58 +270,40 @@ errno_t RegisterModule(
         //	fflush(stdout);
     }
 
-    if(data.progStatus == 1)
+    if (data.progStatus == 1)
     {
         OKmsg = 1;
-        DEBUG_TRACEPOINT("  %02ld  Found unloaded shared object in ./libs/ -> LOADING %10s  module %40s",
-                         data.NBmodule,
-                         PackageName,
-                         FileName);
+        DEBUG_TRACEPOINT("  %02ld  Found unloaded shared object in ./libs/ -> LOADING %10s  module %40s", data.NBmodule,
+                         PackageName, FileName);
         fflush(stdout);
     }
 
-    if(OKmsg == 0)
+    if (OKmsg == 0)
     {
         printf("  %02ld  ERROR: module load requested outside of normal step -> LOADING %10s  module %40s",
-               data.NBmodule,
-               PackageName,
-               FileName);
+               data.NBmodule, PackageName, FileName);
         fflush(stdout);
     }
 
     data.NBmodule++;
 
-
     DEBUG_TRACE_FEXIT();
     return RETURN_SUCCESS;
 }
 
-
-
-
 // Legacy function
 //
-uint32_t RegisterCLIcommand(
-    const char *__restrict CLIkey,
-    const char *__restrict CLImodulesrc,
-    errno_t (*CLIfptr)(),
-    const char *__restrict CLIinfo,
-    const char *__restrict CLIsyntax,
-    const char *__restrict CLIexample,
-    const char *__restrict CLICcall
-)
+uint32_t RegisterCLIcommand(const char *__restrict CLIkey, const char *__restrict CLImodulesrc, errno_t (*CLIfptr)(),
+                            const char *__restrict CLIinfo, const char *__restrict CLIsyntax,
+                            const char *__restrict CLIexample, const char *__restrict CLICcall)
 {
     DEBUG_TRACE_FSTART();
 
-    DEBUG_TRACEPOINT("FARG CLIkey %s -> command index %u / %d", CLIkey, data.NBcmd,
-                     DATA_NB_MAX_COMMAND);
-
-
-
+    DEBUG_TRACEPOINT("FARG CLIkey %s -> command index %u / %d", CLIkey, data.NBcmd, DATA_NB_MAX_COMMAND);
 
     data.cmd[data.NBcmd].moduleindex = data.moduleindex;
 
-    if(data.cmd[data.NBcmd].moduleindex == -1)
+    if (data.cmd[data.NBcmd].moduleindex == -1)
     {
         strcpy(data.cmd[data.NBcmd].module, "MAIN");
         strcpy(data.cmd[data.NBcmd].key, CLIkey);
@@ -373,20 +311,19 @@ uint32_t RegisterCLIcommand(
     else
     {
 
-        if(strlen(data.module[data.moduleindex].shortname) == 0)
+        if (strlen(data.module[data.moduleindex].shortname) == 0)
         {
             strcpy(data.cmd[data.NBcmd].key, CLIkey);
         }
         else
         {
             // otherwise, construct call key as <shortname>.<CLIkey>
-            sprintf(data.cmd[data.NBcmd].key, "%s.%s",
-                    data.module[data.moduleindex].shortname, CLIkey);
+            sprintf(data.cmd[data.NBcmd].key, "%s.%s", data.module[data.moduleindex].shortname, CLIkey);
         }
     }
 
     DEBUG_TRACEPOINT("set module name");
-    if(strlen(data.modulename) == 0)
+    if (strlen(data.modulename) == 0)
     {
         strcpy(data.cmd[data.NBcmd].module, "unknown");
     }
@@ -397,18 +334,17 @@ uint32_t RegisterCLIcommand(
 
     DEBUG_TRACEPOINT("load function data");
 
-    strncpy(data.cmd[data.NBcmd].srcfile, CLImodulesrc,
-            STRINGMAXLEN_CMD_SRCFILE - 1);
+    strncpy(data.cmd[data.NBcmd].srcfile, CLImodulesrc, STRINGMAXLEN_CMD_SRCFILE - 1);
 
     data.cmd[data.NBcmd].fp = CLIfptr;
 
-    strncpy(data.cmd[data.NBcmd].info,    CLIinfo, STRINGMAXLEN_CMD_INFO - 1);
+    strncpy(data.cmd[data.NBcmd].info, CLIinfo, STRINGMAXLEN_CMD_INFO - 1);
 
-    strncpy(data.cmd[data.NBcmd].syntax,  CLIsyntax, STRINGMAXLEN_CMD_SYNTAX - 1);
+    strncpy(data.cmd[data.NBcmd].syntax, CLIsyntax, STRINGMAXLEN_CMD_SYNTAX - 1);
 
     strncpy(data.cmd[data.NBcmd].example, CLIexample, STRINGMAXLEN_CMD_EXAMPLE - 1);
 
-    strncpy(data.cmd[data.NBcmd].Ccall,   CLICcall, STRINGMAXLEN_CMD_CCALL - 1);
+    strncpy(data.cmd[data.NBcmd].Ccall, CLICcall, STRINGMAXLEN_CMD_CCALL - 1);
 
     data.cmd[data.NBcmd].nbarg = 0;
     data.NBcmd++;
@@ -419,25 +355,18 @@ uint32_t RegisterCLIcommand(
 
     DEBUG_TRACEPOINT("NBcmd = %u", data.NBcmd);
 
-    return(data.NBcmd);
+    return (data.NBcmd);
 }
 
-
-
-
 // Register command
 // Replaces legacy function RegisterCLIcommand
 //
-uint32_t RegisterCLIcmd(
-    CLICMDDATA CLIcmddata,
-    errno_t (*CLIfptr)()
-)
+uint32_t RegisterCLIcmd(CLICMDDATA CLIcmddata, errno_t (*CLIfptr)())
 {
     DEBUG_TRACE_FSTART();
 
-
     data.cmd[data.NBcmd].moduleindex = data.moduleindex;
-    if(data.cmd[data.NBcmd].moduleindex == -1)
+    if (data.cmd[data.NBcmd].moduleindex == -1)
     {
         strcpy(data.cmd[data.NBcmd].module, "MAIN");
         strcpy(data.cmd[data.NBcmd].key, CLIcmddata.key);
@@ -445,7 +374,7 @@ uint32_t RegisterCLIcmd(
     else
     {
 
-        if(strlen(data.module[data.moduleindex].shortname) == 0)
+        if (strlen(data.module[data.moduleindex].shortname) == 0)
         {
             strcpy(data.cmd[data.NBcmd].key, CLIcmddata.key);
         }
@@ -454,21 +383,20 @@ uint32_t RegisterCLIcmd(
             // otherwise, construct call key as <shortname>.<CLIkey>
             int slen = snprintf(data.cmd[data.NBcmd].key, STRINGMAXLEN_CMD_KEY, "%s.%s",
                                 data.module[data.moduleindex].shortname, CLIcmddata.key);
-            if(slen < 1)
+            if (slen < 1)
             {
                 PRINT_ERROR("failed to write call key");
                 abort();
             }
-            if(slen >= STRINGMAXLEN_CMD_KEY)
+            if (slen >= STRINGMAXLEN_CMD_KEY)
             {
                 PRINT_ERROR("call key string too long");
                 abort();
             }
-
         }
     }
 
-    if(strlen(data.modulename) == 0)
+    if (strlen(data.modulename) == 0)
     {
         strcpy(data.cmd[data.NBcmd].module, "unknown");
     }
@@ -480,43 +408,36 @@ uint32_t RegisterCLIcmd(
     DEBUG_TRACEPOINT("settingsrcfile to %s", CLIcmddata.sourcefilename);
     strcpy(data.cmd[data.NBcmd].srcfile, CLIcmddata.sourcefilename);
     data.cmd[data.NBcmd].fp = CLIfptr;
-    strcpy(data.cmd[data.NBcmd].info,    CLIcmddata.description);
+    strcpy(data.cmd[data.NBcmd].info, CLIcmddata.description);
 
     // assemble argument syntax string for help
     char argstring[STRINGMAXLEN_CMD_SYNTAX];
     CLIhelp_make_argstring(CLIcmddata.funcfpscliarg, CLIcmddata.nbarg, argstring);
-    strcpy(data.cmd[data.NBcmd].syntax,  argstring);
+    strcpy(data.cmd[data.NBcmd].syntax, argstring);
 
     // assemble example string for help
     char cmdexamplestring[STRINGMAXLEN_CMD_EXAMPLE];
-    CLIhelp_make_cmdexamplestring(CLIcmddata.funcfpscliarg, CLIcmddata.nbarg,
-                                  CLIcmddata.key,
-                                  cmdexamplestring);
+    CLIhelp_make_cmdexamplestring(CLIcmddata.funcfpscliarg, CLIcmddata.nbarg, CLIcmddata.key, cmdexamplestring);
     strcpy(data.cmd[data.NBcmd].example, cmdexamplestring);
 
-    strcpy(data.cmd[data.NBcmd].Ccall,   "--callstring--");
-
+    strcpy(data.cmd[data.NBcmd].Ccall, "--callstring--");
 
     DEBUG_TRACEPOINT("define arguments to CLI function from content of CLIcmddata.funcfpscliarg");
     data.cmd[data.NBcmd].nbarg = CLIcmddata.nbarg;
-    if(CLIcmddata.nbarg > 0)
+    if (CLIcmddata.nbarg > 0)
     {
-        data.cmd[data.NBcmd].argdata =
-            (CLICMDARGDATA *) malloc(sizeof(CLICMDARGDATA) * CLIcmddata.nbarg);
+        data.cmd[data.NBcmd].argdata = (CLICMDARGDATA *)malloc(sizeof(CLICMDARGDATA) * CLIcmddata.nbarg);
 
-        for(int argi = 0; argi < CLIcmddata.nbarg; argi++)
+        for (int argi = 0; argi < CLIcmddata.nbarg; argi++)
         {
             data.cmd[data.NBcmd].argdata[argi].type = CLIcmddata.funcfpscliarg[argi].type;
             data.cmd[data.NBcmd].argdata[argi].flag = CLIcmddata.funcfpscliarg[argi].flag;
-            strcpy(data.cmd[data.NBcmd].argdata[argi].descr,
-                   CLIcmddata.funcfpscliarg[argi].descr);
-            strcpy(data.cmd[data.NBcmd].argdata[argi].fpstag,
-                   CLIcmddata.funcfpscliarg[argi].fpstag);
-            strcpy(data.cmd[data.NBcmd].argdata[argi].example,
-                   CLIcmddata.funcfpscliarg[argi].example);
+            strcpy(data.cmd[data.NBcmd].argdata[argi].descr, CLIcmddata.funcfpscliarg[argi].descr);
+            strcpy(data.cmd[data.NBcmd].argdata[argi].fpstag, CLIcmddata.funcfpscliarg[argi].fpstag);
+            strcpy(data.cmd[data.NBcmd].argdata[argi].example, CLIcmddata.funcfpscliarg[argi].example);
 
             // Set default values
-            switch(data.cmd[data.NBcmd].argdata[argi].type)
+            switch (data.cmd[data.NBcmd].argdata[argi].type)
             {
 
                 /*case CLIARG_FLOAT:
@@ -524,56 +445,46 @@ uint32_t RegisterCLIcmd(
                                 CLIcmddata.funcfpscliarg[argi].example);
                     break;*/
 
-                case CLIARG_FLOAT32:
-                    data.cmd[data.NBcmd].argdata[argi].val.f32 = atof(
-                                CLIcmddata.funcfpscliarg[argi].example);
-                    break;
+            case CLIARG_FLOAT32:
+                data.cmd[data.NBcmd].argdata[argi].val.f32 = atof(CLIcmddata.funcfpscliarg[argi].example);
+                break;
 
-                case CLIARG_FLOAT64:
-                    data.cmd[data.NBcmd].argdata[argi].val.f64 = atof(
-                                CLIcmddata.funcfpscliarg[argi].example);
-                    break;
+            case CLIARG_FLOAT64:
+                data.cmd[data.NBcmd].argdata[argi].val.f64 = atof(CLIcmddata.funcfpscliarg[argi].example);
+                break;
 
                 /*case CLIARG_LONG:
                     data.cmd[data.NBcmd].argdata[argi].val.l = atol(
                                 CLIcmddata.funcfpscliarg[argi].example);
                     break;*/
 
-                case CLIARG_INT32:
-                    data.cmd[data.NBcmd].argdata[argi].val.i32 =
-                        (int32_t) atol(CLIcmddata.funcfpscliarg[argi].example);
-                    break;
-
-                case CLIARG_UINT32:
-                    data.cmd[data.NBcmd].argdata[argi].val.ui32 =
-                        (uint32_t) atol(CLIcmddata.funcfpscliarg[argi].example);
-                    break;
-
-                case CLIARG_INT64:
-                    data.cmd[data.NBcmd].argdata[argi].val.i64 =
-                        (int64_t) atol(CLIcmddata.funcfpscliarg[argi].example);
-                    break;
-
-                case CLIARG_UINT64:
-                    data.cmd[data.NBcmd].argdata[argi].val.ui64 =
-                        (uint64_t) atol(CLIcmddata.funcfpscliarg[argi].example);
-                    break;
-
-
-                case CLIARG_STR_NOT_IMG:
-                    strcpy(data.cmd[data.NBcmd].argdata[argi].val.s,
-                           CLIcmddata.funcfpscliarg[argi].example);
-                    break;
-
-                case CLIARG_IMG:
-                    strcpy(data.cmd[data.NBcmd].argdata[argi].val.s,
-                           CLIcmddata.funcfpscliarg[argi].example);
-                    break;
-
-                case CLIARG_STR:
-                    strcpy(data.cmd[data.NBcmd].argdata[argi].val.s,
-                           CLIcmddata.funcfpscliarg[argi].example);
-                    break;
+            case CLIARG_INT32:
+                data.cmd[data.NBcmd].argdata[argi].val.i32 = (int32_t)atol(CLIcmddata.funcfpscliarg[argi].example);
+                break;
+
+            case CLIARG_UINT32:
+                data.cmd[data.NBcmd].argdata[argi].val.ui32 = (uint32_t)atol(CLIcmddata.funcfpscliarg[argi].example);
+                break;
+
+            case CLIARG_INT64:
+                data.cmd[data.NBcmd].argdata[argi].val.i64 = (int64_t)atol(CLIcmddata.funcfpscliarg[argi].example);
+                break;
+
+            case CLIARG_UINT64:
+                data.cmd[data.NBcmd].argdata[argi].val.ui64 = (uint64_t)atol(CLIcmddata.funcfpscliarg[argi].example);
+                break;
+
+            case CLIARG_STR_NOT_IMG:
+                strcpy(data.cmd[data.NBcmd].argdata[argi].val.s, CLIcmddata.funcfpscliarg[argi].example);
+                break;
+
+            case CLIARG_IMG:
+                strcpy(data.cmd[data.NBcmd].argdata[argi].val.s, CLIcmddata.funcfpscliarg[argi].example);
+                break;
+
+            case CLIARG_STR:
+                strcpy(data.cmd[data.NBcmd].argdata[argi].val.s, CLIcmddata.funcfpscliarg[argi].example);
+                break;
             }
         }
     }
@@ -588,6 +499,5 @@ uint32_t RegisterCLIcmd(
 
     DEBUG_TRACE_FEXIT();
 
-    return((uint32_t)((int) data.NBcmd - 1));
+    return ((uint32_t)((int)data.NBcmd - 1));
 }
-
diff --git a/src/CommandLineInterface/CLIcore_modules.h b/src/CommandLineInterface/CLIcore_modules.h
index a3e8f324..651dac40 100644
--- a/src/CommandLineInterface/CLIcore_modules.h
+++ b/src/CommandLineInterface/CLIcore_modules.h
@@ -5,47 +5,27 @@
  *
  */
 
-
 #ifndef CLICORE_MODULES_H
 #define CLICORE_MODULES_H
 
 #ifdef __cplusplus
-typedef const char * CONST_WORD;
+typedef const char *CONST_WORD;
 #else
-typedef const char *restrict  CONST_WORD;
+typedef const char *restrict CONST_WORD;
 #endif
 
-
 errno_t load_sharedobj(CONST_WORD libname);
 
 errno_t load_module_shared(CONST_WORD modulename);
 
 errno_t load_module_shared_ALL();
 
-errno_t RegisterModule(
-    CONST_WORD FileName,
-    CONST_WORD PackageName,
-    CONST_WORD InfoString,
-    int versionmajor,
-    int versionminor,
-    int versionpatch
-);
-
-
-uint32_t RegisterCLIcommand(
-    CONST_WORD CLIkey,
-    CONST_WORD CLImodulesrc,
-    errno_t (*CLIfptr)(),
-    CONST_WORD CLIinfo,
-    CONST_WORD CLIsyntax,
-    CONST_WORD CLIexample,
-    CONST_WORD CLICcall
-);
-
-
-uint32_t RegisterCLIcmd(
-    CLICMDDATA CLIcmddata,
-    errno_t (*CLIfptr)()
-);
+errno_t RegisterModule(CONST_WORD FileName, CONST_WORD PackageName, CONST_WORD InfoString, int versionmajor,
+                       int versionminor, int versionpatch);
+
+uint32_t RegisterCLIcommand(CONST_WORD CLIkey, CONST_WORD CLImodulesrc, errno_t (*CLIfptr)(), CONST_WORD CLIinfo,
+                            CONST_WORD CLIsyntax, CONST_WORD CLIexample, CONST_WORD CLICcall);
+
+uint32_t RegisterCLIcmd(CLICMDDATA CLIcmddata, errno_t (*CLIfptr)());
 
 #endif
diff --git a/src/CommandLineInterface/CLIcore_setSHMdir.c b/src/CommandLineInterface/CLIcore_setSHMdir.c
index f57b2930..997adfba 100644
--- a/src/CommandLineInterface/CLIcore_setSHMdir.c
+++ b/src/CommandLineInterface/CLIcore_setSHMdir.c
@@ -1,20 +1,17 @@
+#include <dirent.h>
 #include <stdio.h>
 #include <string.h>
-#include <dirent.h>
-
 
 #include "CommandLineInterface/CLIcore.h"
 
-
-
 /** @brief Set shared memory directory
- * 
+ *
  * SHM directory to store shared memory
- * 
+ *
  * If MILK_SHM_DIR environment variable exists, use it.
  * If fails, print warning, use SHAREDMEMDIR defined in ImageStruct.h
  * If fails -> use /tmp
- * 
+ *
  */
 errno_t setSHMdir()
 {
@@ -24,9 +21,9 @@ errno_t setSHMdir()
 
     // first, we try the env variable if it exists
     char *MILK_SHM_DIR = getenv("MILK_SHM_DIR");
-    if(MILK_SHM_DIR != NULL)
+    if (MILK_SHM_DIR != NULL)
     {
-        if(data.quiet == 0)
+        if (data.quiet == 0)
         {
             printf("        MILK_SHM_DIR '%s'\n", MILK_SHM_DIR);
         }
@@ -34,55 +31,58 @@ errno_t setSHMdir()
 
         // does this direcory exist ?
         tmpdir = opendir(shmdirname);
-        if(tmpdir)   // directory exits
+        if (tmpdir) // directory exits
         {
             shmdirOK = 1;
             closedir(tmpdir);
-            if(data.quiet == 0)
+            if (data.quiet == 0)
             {
                 printf("        Using SHM directory %s\n", shmdirname);
             }
         }
         else
         {
-            printf("%c[%d;%dm", (char) 27, 1, 31); // set color red
+            printf("%c[%d;%dm", (char)27, 1, 31); // set color red
             printf("    ERROR: Directory %s : %s\n", shmdirname, strerror(errno));
-            printf("%c[%d;m", (char) 27, 0); // unset color red
+            printf("%c[%d;m", (char)27, 0); // unset color red
             exit(EXIT_FAILURE);
         }
     }
     else
     {
-        if(data.quiet == 0)
+        if (data.quiet == 0)
         {
-            printf("%c[%d;%dm", (char) 27, 1, 31); // set color red
+            printf("%c[%d;%dm", (char)27, 1, 31); // set color red
             printf("    WARNING: Environment variable MILK_SHM_DIR not specified -> falling back to default %s\n",
                    SHAREDMEMDIR);
-            printf("    BEWARE : Other milk users may be using the same SHM directory on this machine, and could see your milk session data and temporary files\n");
-            printf("    BEWARE : Some scripts may rely on MILK_SHM_DIR to find/access shared memory and temporary files, and WILL not run.\n");
-            printf("             Please set MILK_SHM_DIR and restart CLI to set up user-specific shared memory and temporary files\n");
+            printf("    BEWARE : Other milk users may be using the same SHM directory on this machine, and could see "
+                   "your milk session data and temporary files\n");
+            printf("    BEWARE : Some scripts may rely on MILK_SHM_DIR to find/access shared memory and temporary "
+                   "files, and WILL not run.\n");
+            printf("             Please set MILK_SHM_DIR and restart CLI to set up user-specific shared memory and "
+                   "temporary files\n");
             printf("             Example: Add \"export MILK_SHM_DIR=/milk/shm\" to .bashrc\n");
-            printf("%c[%d;m", (char) 27, 0); // unset color red
+            printf("%c[%d;m", (char)27, 0); // unset color red
         }
     }
 
     // second, we try SHAREDMEMDIR default
-    if(shmdirOK == 0)
+    if (shmdirOK == 0)
     {
         tmpdir = opendir(SHAREDMEMDIR);
-        if(tmpdir)   // directory exits
+        if (tmpdir) // directory exits
         {
             sprintf(shmdirname, "%s", SHAREDMEMDIR);
             shmdirOK = 1;
             closedir(tmpdir);
-            if(data.quiet == 0)
+            if (data.quiet == 0)
             {
                 printf("        Using SHM directory %s\n", shmdirname);
             }
         }
         else
         {
-            if(data.quiet == 0)
+            if (data.quiet == 0)
             {
                 printf("        Directory %s : %s\n", SHAREDMEMDIR, strerror(errno));
             }
@@ -90,10 +90,10 @@ errno_t setSHMdir()
     }
 
     // if all above fails, set to /tmp
-    if(shmdirOK == 0)
+    if (shmdirOK == 0)
     {
         tmpdir = opendir("/tmp");
-        if(!tmpdir)
+        if (!tmpdir)
         {
             printf("        ERROR: Directory %s : %s\n", shmdirname, strerror(errno));
             exit(EXIT_FAILURE);
@@ -102,13 +102,13 @@ errno_t setSHMdir()
         {
             sprintf(shmdirname, "/tmp");
             shmdirOK = 1;
-            if(data.quiet == 0)
+            if (data.quiet == 0)
             {
                 printf("        Using SHM directory %s\n", shmdirname);
 
-                printf("        NOTE: Consider creating tmpfs directory and setting env var MILK_SHM_DIR for improved performance :\n");
-                printf("        $ echo \"tmpfs %s tmpfs rw,nosuid,nodev\" | sudo tee -a /etc/fstab\n",
-                       SHAREDMEMDIR);
+                printf("        NOTE: Consider creating tmpfs directory and setting env var MILK_SHM_DIR for improved "
+                       "performance :\n");
+                printf("        $ echo \"tmpfs %s tmpfs rw,nosuid,nodev\" | sudo tee -a /etc/fstab\n", SHAREDMEMDIR);
                 printf("        $ sudo mkdir -p %s\n", SHAREDMEMDIR);
                 printf("        $ sudo mount %s\n", SHAREDMEMDIR);
             }
@@ -117,22 +117,19 @@ errno_t setSHMdir()
 
     sprintf(data.shmdir, "%s", shmdirname);
 
-
     // change / to . and write to shmsemdirname
     unsigned int stri;
-    for(stri = 0; stri < strlen(shmdirname); stri++)
-        if(shmdirname[stri] == '/')   // replace '/' by '.'
+    for (stri = 0; stri < strlen(shmdirname); stri++)
+        if (shmdirname[stri] == '/') // replace '/' by '.'
         {
             shmdirname[stri] = '.';
         }
 
     sprintf(data.shmsemdirname, "%s", shmdirname);
-    if(data.quiet == 0)
+    if (data.quiet == 0)
     {
-        printf("        semaphore naming : /dev/shm/sem.%s.<sname>_sem<xx>\n",
-               data.shmsemdirname);
+        printf("        semaphore naming : /dev/shm/sem.%s.<sname>_sem<xx>\n", data.shmsemdirname);
     }
 
     return RETURN_SUCCESS;
 }
-
diff --git a/src/CommandLineInterface/CLIcore_setSHMdir.h b/src/CommandLineInterface/CLIcore_setSHMdir.h
index 1087051c..a0a36ed4 100644
--- a/src/CommandLineInterface/CLIcore_setSHMdir.h
+++ b/src/CommandLineInterface/CLIcore_setSHMdir.h
@@ -1,17 +1,14 @@
 /**
  * @file CLIcore_setSHMdir.h
- * 
+ *
  * @brief set shared memory directory
  *
  */
 
-
 #ifndef CLICORE_SETSHMDIR_H
 
 #define CLICORE_SETSHMDIR_H
 
-
 errno_t setSHMdir();
 
-
 #endif
diff --git a/src/CommandLineInterface/CLIcore_signals.c b/src/CommandLineInterface/CLIcore_signals.c
index 467b3037..4fc0241a 100644
--- a/src/CommandLineInterface/CLIcore_signals.c
+++ b/src/CommandLineInterface/CLIcore_signals.c
@@ -5,21 +5,15 @@
  *
  */
 
-
-#include <sys/resource.h> // getrlimit
-#include <termios.h>
 #include <stdarg.h>
+#include <sys/resource.h> // getrlimit
 #include <sys/stat.h>
+#include <termios.h>
 
-#include "CommandLineInterface/CLIcore.h"
 #include "CLIcore_UI.h"
+#include "CommandLineInterface/CLIcore.h"
 #include "timeutils.h"
 
-
-
-
-
-
 /**
  * @brief Write entry into debug log
  *
@@ -35,19 +29,14 @@ errno_t write_process_log()
     thisPID = getpid();
     WRITE_FILENAME(fname, "logreport.%05d.log", thisPID);
 
-
     fplog = fopen(fname, "a");
 
-    if(fplog != NULL)
+    if (fplog != NULL)
     {
         char timestring[20];
         mkUTtimestring_nanosec(timestring, data.testpoint.time);
 
-
-        fprintf(fplog, "%18ld  %s ",
-                logcnt,
-                timestring
-               );
+        fprintf(fplog, "%18ld  %s ", logcnt, timestring);
 
         {
             // extract last word
@@ -69,27 +58,19 @@ errno_t write_process_log()
     return RETURN_SUCCESS;
 }
 
-
-
-
-
-
 static void set_terminal_echo_on()
 {
     // Terminal settings
     struct termios termInfo;
-    if(tcgetattr(0, &termInfo) == -1)
+    if (tcgetattr(0, &termInfo) == -1)
     {
         perror("tcgetattr");
         exit(1);
     }
-    termInfo.c_lflag |= ECHO;  /* turn on ECHO */
+    termInfo.c_lflag |= ECHO; /* turn on ECHO */
     tcsetattr(0, TCSADRAIN, &termInfo);
 }
 
-
-
-
 static void fprintf_stdout(FILE *f, char const *fmt, ...)
 {
     va_list ap;
@@ -101,47 +82,43 @@ static void fprintf_stdout(FILE *f, char const *fmt, ...)
     va_end(ap);
 }
 
-
-
-
-
 /** @brief signal catching
  *
  */
 errno_t set_signal_catch()
 {
     // catch signals for clean exit
-    if(sigaction(SIGTERM, &data.sigact, NULL) == -1)
+    if (sigaction(SIGTERM, &data.sigact, NULL) == -1)
     {
         printf("\ncan't catch SIGTERM\n");
     }
 
-    if(sigaction(SIGINT, &data.sigact, NULL) == -1)
+    if (sigaction(SIGINT, &data.sigact, NULL) == -1)
     {
         printf("\ncan't catch SIGINT\n");
     }
 
-    if(sigaction(SIGABRT, &data.sigact, NULL) == -1)
+    if (sigaction(SIGABRT, &data.sigact, NULL) == -1)
     {
         printf("\ncan't catch SIGABRT\n");
     }
 
-    if(sigaction(SIGBUS, &data.sigact, NULL) == -1)
+    if (sigaction(SIGBUS, &data.sigact, NULL) == -1)
     {
         printf("\ncan't catch SIGBUS\n");
     }
 
-    if(sigaction(SIGSEGV, &data.sigact, NULL) == -1)
+    if (sigaction(SIGSEGV, &data.sigact, NULL) == -1)
     {
         printf("\ncan't catch SIGSEGV\n");
     }
 
-    if(sigaction(SIGHUP, &data.sigact, NULL) == -1)
+    if (sigaction(SIGHUP, &data.sigact, NULL) == -1)
     {
         printf("\ncan't catch SIGHUP\n");
     }
 
-    if(sigaction(SIGPIPE, &data.sigact, NULL) == -1)
+    if (sigaction(SIGPIPE, &data.sigact, NULL) == -1)
     {
         printf("\ncan't catch SIGPIPE\n");
     }
@@ -149,9 +126,6 @@ errno_t set_signal_catch()
     return RETURN_SUCCESS;
 }
 
-
-
-
 /**
  * @brief Write to disk a process report
  *
@@ -160,9 +134,7 @@ errno_t set_signal_catch()
  * errortypestring describes the type of error or reason to issue report
  *
  */
-errno_t write_process_exit_report(
-    const char *__restrict errortypestring
-)
+errno_t write_process_exit_report(const char *__restrict errortypestring)
 {
 #ifndef NDEBUG
     FILE *fpexit;
@@ -174,8 +146,7 @@ errno_t write_process_exit_report(
 
     WRITE_FILENAME(fname, "exitreport-%s.%05d.log", errortypestring, thisPID);
 
-    printf("EXIT CONDITION < %s >: See report in file %s\n", errortypestring,
-           fname);
+    printf("EXIT CONDITION < %s >: See report in file %s\n", errortypestring, fname);
     printf("    File    : %s\n", data.testpoint.file);
     printf("    Function: %s\n", data.testpoint.func);
     printf("    Line    : %d\n", data.testpoint.line);
@@ -185,9 +156,8 @@ errno_t write_process_exit_report(
     struct tm *uttime;
     time_t tvsec0, tvsec1;
 
-
     fpexit = fopen(fname, "w");
-    if(fpexit != NULL)
+    if (fpexit != NULL)
     {
         fprintf_stdout(fpexit, "PID : %d\n", thisPID);
 
@@ -196,19 +166,17 @@ errno_t write_process_exit_report(
         clock_gettime(CLOCK_REALTIME, &tnow);
         tvsec0 = tnow.tv_sec;
         uttime = gmtime(&tvsec0);
-        fprintf_stdout(fpexit, "Time: %04d%02d%02dT%02d%02d%02d.%09ld\n\n",
-                       1900 + uttime->tm_year, 1 + uttime->tm_mon, uttime->tm_mday, uttime->tm_hour,
-                       uttime->tm_min,  uttime->tm_sec, tnow.tv_nsec);
+        fprintf_stdout(fpexit, "Time: %04d%02d%02dT%02d%02d%02d.%09ld\n\n", 1900 + uttime->tm_year, 1 + uttime->tm_mon,
+                       uttime->tm_mday, uttime->tm_hour, uttime->tm_min, uttime->tm_sec, tnow.tv_nsec);
 
         fprintf_stdout(fpexit, "Last encountered test point\n");
         tvsec1 = data.testpoint.time.tv_sec;
         uttime = gmtime(&tvsec1);
-        fprintf_stdout(fpexit, "    Time    : %04d%02d%02dT%02d%02d%02d.%09ld\n",
-                       1900 + uttime->tm_year, 1 + uttime->tm_mon, uttime->tm_mday, uttime->tm_hour,
-                       uttime->tm_min,  uttime->tm_sec, data.testpoint.time.tv_nsec);
+        fprintf_stdout(fpexit, "    Time    : %04d%02d%02dT%02d%02d%02d.%09ld\n", 1900 + uttime->tm_year,
+                       1 + uttime->tm_mon, uttime->tm_mday, uttime->tm_hour, uttime->tm_min, uttime->tm_sec,
+                       data.testpoint.time.tv_nsec);
 
-        double timediff = 1.0 * (tvsec0 - tvsec1) + 1.0e-9 * (tnow.tv_nsec -
-                          data.testpoint.time.tv_nsec);
+        double timediff = 1.0 * (tvsec0 - tvsec1) + 1.0e-9 * (tnow.tv_nsec - data.testpoint.time.tv_nsec);
         fprintf_stdout(fpexit, "              %.9f sec ago\n", timediff);
 
         fprintf_stdout(fpexit, "    File    : %s\n", data.testpoint.file);
@@ -217,7 +185,6 @@ errno_t write_process_exit_report(
         fprintf_stdout(fpexit, "    Message : %s\n", data.testpoint.msg);
         fprintf_stdout(fpexit, "\n");
 
-
         // write function trace
         write_tracedebugfile();
 
@@ -231,12 +198,12 @@ errno_t write_process_exit_report(
         fprintf_stdout(fpexit, "    max_fd_number  : %d\n", max_fd_number);
         fprintf_stdout(fpexit, "    rlim_cur       : %lu\n", rlimits.rlim_cur);
         fprintf_stdout(fpexit, "    rlim_max       : %lu\n", rlimits.rlim_max);
-        for(int i = 0; i <= max_fd_number; i++)
+        for (int i = 0; i <= max_fd_number; i++)
         {
             struct stat stats;
 
             fstat(i, &stats);
-            if(errno != EBADF)
+            if (errno != EBADF)
             {
                 fd_counter++;
             }
@@ -250,83 +217,75 @@ errno_t write_process_exit_report(
     return RETURN_SUCCESS;
 }
 
-
-
-
-
 /**
  * @brief Signal handler
  *
  *
  */
-void sig_handler(
-    int signo
-)
+void sig_handler(int signo)
 {
-    switch(signo)
+    switch (signo)
     {
 
-        case SIGINT:
-            printf("PID %d sig_handler received SIGINT\n", CLIPID);
-            data.signal_INT = 1;
-            //set_terminal_echo_on();
-            //exit(EXIT_FAILURE);
-            break;
-
-        case SIGTERM:
-            printf("PID %d sig_handler received SIGTERM\n", CLIPID);
-            data.signal_TERM = 1;
-            set_terminal_echo_on();
-            exit(EXIT_FAILURE);
-            break;
-
-        case SIGUSR1:
-            printf("PID %d sig_handler received SIGUSR1\n", CLIPID);
-            data.signal_USR1 = 1;
-            break;
-
-        case SIGUSR2:
-            printf("PID %d sig_handler received SIGUSR2\n", CLIPID);
-            data.signal_USR2 = 1;
-            break;
-
-        case SIGBUS: // exit program after SIGSEGV
-            printf("PID %d sig_handler received SIGBUS \n", CLIPID);
-            write_process_exit_report("SIGBUS");
-            data.signal_BUS = 1;
-            set_terminal_echo_on();
-            exit(EXIT_FAILURE);
-            break;
-
-        case SIGABRT:
-            printf("PID %d sig_handler received SIGABRT\n", CLIPID);
-            write_process_exit_report("SIGABRT");
-            data.signal_ABRT = 1;
-            set_terminal_echo_on();
-            exit(EXIT_FAILURE);
-            break;
-
-        case SIGSEGV: // exit program after SIGSEGV
-            printf("PID %d sig_handler received SIGSEGV\n", CLIPID);
-            write_process_exit_report("SIGSEGV");
-            data.signal_SEGV = 1;
-            set_terminal_echo_on();
-            exit(EXIT_FAILURE);
-            break;
-
-        case SIGHUP:
-            printf("PID %d sig_handler received SIGHUP\n", CLIPID);
-            write_process_exit_report("SIGHUP");
-            data.signal_HUP = 1;
-            set_terminal_echo_on();
-            exit(EXIT_FAILURE);
-            break;
-
-        case SIGPIPE:
-            printf("PID %d sig_handler received SIGPIPE\n", CLIPID);
-            data.signal_PIPE = 1;
-            break;
+    case SIGINT:
+        printf("PID %d sig_handler received SIGINT\n", CLIPID);
+        data.signal_INT = 1;
+        //set_terminal_echo_on();
+        //exit(EXIT_FAILURE);
+        break;
+
+    case SIGTERM:
+        printf("PID %d sig_handler received SIGTERM\n", CLIPID);
+        data.signal_TERM = 1;
+        set_terminal_echo_on();
+        exit(EXIT_FAILURE);
+        break;
+
+    case SIGUSR1:
+        printf("PID %d sig_handler received SIGUSR1\n", CLIPID);
+        data.signal_USR1 = 1;
+        break;
+
+    case SIGUSR2:
+        printf("PID %d sig_handler received SIGUSR2\n", CLIPID);
+        data.signal_USR2 = 1;
+        break;
+
+    case SIGBUS: // exit program after SIGSEGV
+        printf("PID %d sig_handler received SIGBUS \n", CLIPID);
+        write_process_exit_report("SIGBUS");
+        data.signal_BUS = 1;
+        set_terminal_echo_on();
+        exit(EXIT_FAILURE);
+        break;
+
+    case SIGABRT:
+        printf("PID %d sig_handler received SIGABRT\n", CLIPID);
+        write_process_exit_report("SIGABRT");
+        data.signal_ABRT = 1;
+        set_terminal_echo_on();
+        exit(EXIT_FAILURE);
+        break;
+
+    case SIGSEGV: // exit program after SIGSEGV
+        printf("PID %d sig_handler received SIGSEGV\n", CLIPID);
+        write_process_exit_report("SIGSEGV");
+        data.signal_SEGV = 1;
+        set_terminal_echo_on();
+        exit(EXIT_FAILURE);
+        break;
+
+    case SIGHUP:
+        printf("PID %d sig_handler received SIGHUP\n", CLIPID);
+        write_process_exit_report("SIGHUP");
+        data.signal_HUP = 1;
+        set_terminal_echo_on();
+        exit(EXIT_FAILURE);
+        break;
+
+    case SIGPIPE:
+        printf("PID %d sig_handler received SIGPIPE\n", CLIPID);
+        data.signal_PIPE = 1;
+        break;
     }
 }
-
-
diff --git a/src/CommandLineInterface/CLIcore_signals.h b/src/CommandLineInterface/CLIcore_signals.h
index 384bfe4b..0c978150 100644
--- a/src/CommandLineInterface/CLIcore_signals.h
+++ b/src/CommandLineInterface/CLIcore_signals.h
@@ -5,25 +5,16 @@
  *
  */
 
-
 #ifndef CLICORE_SIGNALS_H
 
 #define CLICORE_SIGNALS_H
 
-
 errno_t write_process_log();
 
 errno_t set_signal_catch();
 
+errno_t write_process_exit_report(const char *__restrict errortypestring);
 
-errno_t write_process_exit_report(
-    const char *__restrict errortypestring
-);
-
-
-void sig_handler(
-    int signo
-);
-
+void sig_handler(int signo);
 
 #endif
diff --git a/src/CommandLineInterface/CLIcore_utils.c b/src/CommandLineInterface/CLIcore_utils.c
index a6c957fc..30a5b573 100644
--- a/src/CommandLineInterface/CLIcore_utils.c
+++ b/src/CommandLineInterface/CLIcore_utils.c
@@ -1,8 +1,8 @@
 /**
  * @file    CLIcore_utils.c
  * @brief   Util functions for coding convenience and performance
- * 
- * 
+ *
+ *
  */
 
 // currently empty placeholder
diff --git a/src/CommandLineInterface/CLIcore_utils.h b/src/CommandLineInterface/CLIcore_utils.h
index 055acfca..0a56c808 100644
--- a/src/CommandLineInterface/CLIcore_utils.h
+++ b/src/CommandLineInterface/CLIcore_utils.h
@@ -20,12 +20,12 @@ typedef const char *__restrict CONST_WORD;
 #include "COREMOD_memory/COREMOD_memory.h"
 #include "CommandLineInterface/IMGID.h"
 
-#define CLIARG_VISIBLE_DEFAULT  CLICMDARG_FLAG_DEFAULT, FPTYPE_AUTO, FPFLAG_DEFAULT_INPUT
-#define CLIARG_HIDDEN_DEFAULT   CLICMDARG_FLAG_NOCLI, FPTYPE_AUTO, FPFLAG_DEFAULT_INPUT
-#define CLIARG_OUTPUT_DEFAULT   CLICMDARG_FLAG_NOCLI, FPTYPE_AUTO, FPFLAG_DEFAULT_OUTPUT
+#define CLIARG_VISIBLE_DEFAULT CLICMDARG_FLAG_DEFAULT, FPTYPE_AUTO, FPFLAG_DEFAULT_INPUT
+#define CLIARG_HIDDEN_DEFAULT CLICMDARG_FLAG_NOCLI, FPTYPE_AUTO, FPFLAG_DEFAULT_INPUT
+#define CLIARG_OUTPUT_DEFAULT CLICMDARG_FLAG_NOCLI, FPTYPE_AUTO, FPFLAG_DEFAULT_OUTPUT
 
-
-#define CLICMD_FIELDS_FPSPROC __FILE__, sizeof(farg) / sizeof(CLICMDARGDEF), farg, CLICMDFLAG_FPS|CLICMDFLAG_PROCINFO, NULL, NULL, NULL
+#define CLICMD_FIELDS_FPSPROC                                                                                          \
+    __FILE__, sizeof(farg) / sizeof(CLICMDARGDEF), farg, CLICMDFLAG_FPS | CLICMDFLAG_PROCINFO, NULL, NULL, NULL
 #define CLICMD_FIELDS_DEFAULTS __FILE__, sizeof(farg) / sizeof(CLICMDARGDEF), farg, CLICMDFLAG_FPS, NULL, NULL, NULL
 #define CLICMD_FIELDS_NOFPS __FILE__, sizeof(farg) / sizeof(CLICMDARGDEF), farg, 0, NULL, NULL, NULL
 
@@ -35,20 +35,15 @@ typedef const char *__restrict CONST_WORD;
 #define RETURN_CLICHECKARGARRAY_FUNCPARAMSET 2
 #define RETURN_CLICHECKARGARRAY_HELP 3
 
-
-
-
 typedef struct
 {
     char *name;
 } LOCVAR_INIMG;
 
-#define FARG_INPUTIM(imkey)                                         \
-        {CLIARG_STR, "." #imkey ".name", "input image", #imkey,     \
-        CLIARG_VISIBLE_DEFAULT,                                     \
-        (void **)&imkey.name}
-
-
+#define FARG_INPUTIM(imkey)                                                                                            \
+    {                                                                                                                  \
+        CLIARG_STR, "." #imkey ".name", "input image", #imkey, CLIARG_VISIBLE_DEFAULT, (void **)&imkey.name            \
+    }
 
 typedef struct
 {
@@ -63,42 +58,28 @@ typedef struct
 /** @brief Template for ouput image argument to CLI function
  *
  */
-#define FARG_OUTIM2D(imkey)                                         \
-        {CLIARG_STR, "." #imkey ".name", "output image", #imkey,    \
-        CLIARG_VISIBLE_DEFAULT,                                     \
-        (void **)&imkey.name, NULL},                                \
-        {CLIARG_LONG, "." #imkey ".xsize", "x size", "256",         \
-        CLIARG_VISIBLE_DEFAULT,                                     \
-        (void **)&imkey.xsize, NULL},                               \
-        {CLIARG_LONG, "." #imkey ".ysize", "y size", "256",         \
-        CLIARG_VISIBLE_DEFAULT,                                     \
-        (void **)&imkey.ysize, NULL},                               \
-        {CLIARG_LONG, "." #imkey ".shared", "shared flag", "0",     \
-         CLIARG_HIDDEN_DEFAULT,                                     \
-        (void **)&imkey.shared, NULL},                              \
-        {CLIARG_LONG, "." #imkey ".NBkw", "number keywords", "10",  \
-        CLIARG_HIDDEN_DEFAULT,                                      \
-        (void **)&imkey.NBkw, NULL},                                \
-        {CLIARG_LONG, "." #imkey ".CBsize", "circ buffer size", "0",\
-        CLIARG_HIDDEN_DEFAULT,                                      \
-        (void **)&imkey.CBsize, NULL}
-
-
-
-
-
-
+#define FARG_OUTIM2D(imkey)                                                                                            \
+    {CLIARG_STR, "." #imkey ".name", "output image", #imkey, CLIARG_VISIBLE_DEFAULT, (void **)&imkey.name, NULL},      \
+        {CLIARG_LONG, "." #imkey ".xsize", "x size", "256", CLIARG_VISIBLE_DEFAULT, (void **)&imkey.xsize, NULL},      \
+        {CLIARG_LONG, "." #imkey ".ysize", "y size", "256", CLIARG_VISIBLE_DEFAULT, (void **)&imkey.ysize, NULL},      \
+        {CLIARG_LONG, "." #imkey ".shared", "shared flag", "0", CLIARG_HIDDEN_DEFAULT, (void **)&imkey.shared, NULL},  \
+        {CLIARG_LONG, "." #imkey ".NBkw", "number keywords", "10", CLIARG_HIDDEN_DEFAULT, (void **)&imkey.NBkw, NULL}, \
+    {                                                                                                                  \
+        CLIARG_LONG, "." #imkey ".CBsize", "circ buffer size", "0", CLIARG_HIDDEN_DEFAULT, (void **)&imkey.CBsize,     \
+            NULL                                                                                                       \
+    }
 
 // binding between variables and function args/params
-#define STD_FARG_LINKfunction                                                     \
-    for (int argi = 0; argi < (int)(sizeof(farg) / sizeof(CLICMDARGDEF)); argi++) \
-    {                                                                             \
-        long fpsi = -1;                                                           \
-        void *ptr = get_farg_ptr(farg[argi].fpstag, &fpsi);                       \
-        *(farg[argi].valptr) = ptr;                                               \
-        if(farg[argi].indexptr != NULL) {                                         \
-           *(farg[argi].indexptr) = fpsi;                                         \
-        }                                                                         \
+#define STD_FARG_LINKfunction                                                                                          \
+    for (int argi = 0; argi < (int)(sizeof(farg) / sizeof(CLICMDARGDEF)); argi++)                                      \
+    {                                                                                                                  \
+        long fpsi = -1;                                                                                                \
+        void *ptr = get_farg_ptr(farg[argi].fpstag, &fpsi);                                                            \
+        *(farg[argi].valptr) = ptr;                                                                                    \
+        if (farg[argi].indexptr != NULL)                                                                               \
+        {                                                                                                              \
+            *(farg[argi].indexptr) = fpsi;                                                                             \
+        }                                                                                                              \
     }
 
 /** @brief Standard Function call wrapper
@@ -112,23 +93,23 @@ typedef struct
  * Arguments not contained in CLI call line are extracted from the
  * command argument list
  */
-#define INSERT_STD_CLIfunction                                       \
-    static errno_t CLIfunction(void)                                 \
-    {                                                                \
-        errno_t retval = CLI_checkarg_array(farg, CLIcmddata.nbarg); \
-        if (retval == RETURN_SUCCESS)                                \
-        {                                                            \
-            STD_FARG_LINKfunction return compute_function();         \
-        }                                                            \
-        if (retval == RETURN_CLICHECKARGARRAY_HELP)                  \
-        {                                                            \
-            return RETURN_SUCCESS;                                   \
-        }                                                            \
-        if (retval == RETURN_CLICHECKARGARRAY_FUNCPARAMSET)          \
-        {                                                            \
-            return RETURN_SUCCESS;                                   \
-        }                                                            \
-        return retval;                                               \
+#define INSERT_STD_CLIfunction                                                                                         \
+    static errno_t CLIfunction(void)                                                                                   \
+    {                                                                                                                  \
+        errno_t retval = CLI_checkarg_array(farg, CLIcmddata.nbarg);                                                   \
+        if (retval == RETURN_SUCCESS)                                                                                  \
+        {                                                                                                              \
+            STD_FARG_LINKfunction return compute_function();                                                           \
+        }                                                                                                              \
+        if (retval == RETURN_CLICHECKARGARRAY_HELP)                                                                    \
+        {                                                                                                              \
+            return RETURN_SUCCESS;                                                                                     \
+        }                                                                                                              \
+        if (retval == RETURN_CLICHECKARGARRAY_FUNCPARAMSET)                                                            \
+        {                                                                                                              \
+            return RETURN_SUCCESS;                                                                                     \
+        }                                                                                                              \
+        return retval;                                                                                                 \
     }
 
 /** @brief FPS conf function
@@ -166,152 +147,133 @@ typedef struct
  *
  */
 
-#define INSERT_STD_FPSCONFfunction                                                              \
-    static errno_t FPSCONFfunction()                                                            \
-    {                                                                                           \
-        FPS_SETUP_INIT(data.FPS_name, data.FPS_CMDCODE);                                        \
-        if (CLIcmddata.cmdsettings->flags & CLICMDFLAG_PROCINFO)                                \
-        {                                                                                       \
-            fps.cmdset.flags = CLIcmddata.cmdsettings->flags;                                   \
-            fps.cmdset.RT_priority = CLIcmddata.cmdsettings->RT_priority;                       \
-            fps.cmdset.procinfo_loopcntMax = CLIcmddata.cmdsettings->procinfo_loopcntMax;       \
-            fps.cmdset.triggermode = CLIcmddata.cmdsettings->triggermode;                       \
-            strcpy(fps.cmdset.triggerstreamname, CLIcmddata.cmdsettings->triggerstreamname);    \
-            fps.cmdset.semindexrequested = CLIcmddata.cmdsettings->semindexrequested;           \
-            fps.cmdset.triggerdelay.tv_sec = CLIcmddata.cmdsettings->triggerdelay.tv_sec;       \
-            fps.cmdset.triggerdelay.tv_nsec = CLIcmddata.cmdsettings->triggerdelay.tv_nsec;     \
-            fps.cmdset.triggertimeout.tv_sec = CLIcmddata.cmdsettings->triggertimeout.tv_sec;   \
-            fps.cmdset.triggertimeout.tv_nsec = CLIcmddata.cmdsettings->triggertimeout.tv_nsec; \
-            fps_add_processinfo_entries(&fps);                                                  \
-        }                                                                                       \
-        data.fpsptr = &fps;                                                                     \
-        CMDargs_to_FPSparams_create(&fps);                                                      \
-        STD_FARG_LINKfunction                                                                   \
-        if (CLIcmddata.FPS_customCONFsetup != NULL) {                                           \
-            CLIcmddata.FPS_customCONFsetup();                                                   \
-        }                                                                                       \
-            FPS_CONFLOOP_START                                                                  \
-                if (CLIcmddata.FPS_customCONFcheck != NULL)                                     \
-                    CLIcmddata.FPS_customCONFcheck();                                           \
-        FPS_CONFLOOP_END                                                                        \
-        data.fpsptr = NULL;                                                                     \
-        return RETURN_SUCCESS;                                                                  \
+#define INSERT_STD_FPSCONFfunction                                                                                     \
+    static errno_t FPSCONFfunction()                                                                                   \
+    {                                                                                                                  \
+        FPS_SETUP_INIT(data.FPS_name, data.FPS_CMDCODE);                                                               \
+        if (CLIcmddata.cmdsettings->flags & CLICMDFLAG_PROCINFO)                                                       \
+        {                                                                                                              \
+            fps.cmdset.flags = CLIcmddata.cmdsettings->flags;                                                          \
+            fps.cmdset.RT_priority = CLIcmddata.cmdsettings->RT_priority;                                              \
+            fps.cmdset.procinfo_loopcntMax = CLIcmddata.cmdsettings->procinfo_loopcntMax;                              \
+            fps.cmdset.triggermode = CLIcmddata.cmdsettings->triggermode;                                              \
+            strcpy(fps.cmdset.triggerstreamname, CLIcmddata.cmdsettings->triggerstreamname);                           \
+            fps.cmdset.semindexrequested = CLIcmddata.cmdsettings->semindexrequested;                                  \
+            fps.cmdset.triggerdelay.tv_sec = CLIcmddata.cmdsettings->triggerdelay.tv_sec;                              \
+            fps.cmdset.triggerdelay.tv_nsec = CLIcmddata.cmdsettings->triggerdelay.tv_nsec;                            \
+            fps.cmdset.triggertimeout.tv_sec = CLIcmddata.cmdsettings->triggertimeout.tv_sec;                          \
+            fps.cmdset.triggertimeout.tv_nsec = CLIcmddata.cmdsettings->triggertimeout.tv_nsec;                        \
+            fps_add_processinfo_entries(&fps);                                                                         \
+        }                                                                                                              \
+        data.fpsptr = &fps;                                                                                            \
+        CMDargs_to_FPSparams_create(&fps);                                                                             \
+        STD_FARG_LINKfunction if (CLIcmddata.FPS_customCONFsetup != NULL) { CLIcmddata.FPS_customCONFsetup(); }        \
+        FPS_CONFLOOP_START                                                                                             \
+        if (CLIcmddata.FPS_customCONFcheck != NULL)                                                                    \
+            CLIcmddata.FPS_customCONFcheck();                                                                          \
+        FPS_CONFLOOP_END                                                                                               \
+        data.fpsptr = NULL;                                                                                            \
+        return RETURN_SUCCESS;                                                                                         \
     }
 
-
-
-
-
-
-
-#define INSERT_STD_PROCINFO_COMPUTEFUNC_INIT                                                            \
-    int processloopOK = 1;                                                                              \
-    PROCESSINFO *processinfo = NULL;                                                                    \
-    if (data.fpsptr != NULL)                                                                            \
-    { /* If FPS mode, then FPS settings override defaults*/                                             \
-        /* data.fpsptr->cmset entries are read by fps_connect */                                        \
-        /*CLIcmddata.cmdsettings->flags = data.fpsptr->cmdset.flags;*/                                  \
-        CLIcmddata.cmdsettings->RT_priority = data.fpsptr->cmdset.RT_priority;                          \
-        CLIcmddata.cmdsettings->procinfo_loopcntMax = data.fpsptr->cmdset.procinfo_loopcntMax;          \
-        CLIcmddata.cmdsettings->triggermode = data.fpsptr->cmdset.triggermode;                          \
-        strcpy(CLIcmddata.cmdsettings->triggerstreamname, data.fpsptr->cmdset.triggerstreamname);       \
-        CLIcmddata.cmdsettings->semindexrequested = data.fpsptr->cmdset.semindexrequested;              \
-        CLIcmddata.cmdsettings->triggerdelay.tv_sec = data.fpsptr->cmdset.triggerdelay.tv_sec;          \
-        CLIcmddata.cmdsettings->triggerdelay.tv_nsec = data.fpsptr->cmdset.triggerdelay.tv_nsec;        \
-        CLIcmddata.cmdsettings->triggertimeout.tv_sec = data.fpsptr->cmdset.triggertimeout.tv_sec;      \
-        CLIcmddata.cmdsettings->triggertimeout.tv_nsec = data.fpsptr->cmdset.triggertimeout.tv_nsec;    \
-    }                                                                                                   \
-    if (CLIcmddata.cmdsettings->flags & CLICMDFLAG_PROCINFO)                                            \
-    {                                                                                                   \
-        char pinfodescr[200];                                                                           \
-        int slen = snprintf(pinfodescr, 200, "function %.10s", CLIcmddata.key);                         \
-        if (slen < 1)                                                                                   \
-        {                                                                                               \
-            PRINT_ERROR("snprintf wrote <1 char");                                                      \
-            abort();                                                                                    \
-        }                                                                                               \
-        if (slen >= 200)                                                                                \
-        {                                                                                               \
-            PRINT_ERROR("snprintf string truncation");                                                  \
-            abort();                                                                                    \
-        }                                                                                               \
-        if (data.fpsptr != NULL)                                                                        \
-        {                                                                                               \
-            processinfo = processinfo_setup(data.FPS_name, pinfodescr,                                  \
-                                            "startup", __FUNCTION__, __FILE__, __LINE__);               \
-            fps_to_processinfo(data.fpsptr, processinfo);                                               \
-        }                                                                                               \
-        else                                                                                            \
-        {                                                                                               \
-            processinfo = processinfo_setup(CLIcmddata.key, pinfodescr,                                 \
-                                            "startup", __FUNCTION__, __FILE__, __LINE__);               \
-        }                                                                                               \
-        DEBUG_TRACEPOINT("setting processinfo parameters");                                             \
-        processinfo->loopcntMax = CLIcmddata.cmdsettings->procinfo_loopcntMax;                          \
-        processinfo->triggerstreamID = -2;                                                              \
-        processinfo->triggermode = CLIcmddata.cmdsettings->triggermode;                                 \
-        strcpy(processinfo->triggerstreamname, CLIcmddata.cmdsettings->triggerstreamname);              \
-        processinfo->triggerdelay = CLIcmddata.cmdsettings->triggerdelay;                               \
-        processinfo->triggertimeout = CLIcmddata.cmdsettings->triggertimeout;                           \
-        processinfo->triggerstreamID = image_ID(processinfo->triggerstreamname);                        \
-        DEBUG_TRACEPOINT("triggerstreamID = %ld", processinfo->triggerstreamID);                        \
-        FUNC_CHECK_RETURN(processinfo_waitoninputstream_init(processinfo, processinfo->triggerstreamID, \
-                                                             CLIcmddata.cmdsettings->triggermode, CLIcmddata.cmdsettings->semindexrequested));  \
-        DEBUG_TRACEPOINT("setting RT priority to %d", CLIcmddata.cmdsettings->RT_priority);             \
-        processinfo->RT_priority = CLIcmddata.cmdsettings->RT_priority;                                 \
-        processinfo->CPUmask = CLIcmddata.cmdsettings->CPUmask;                                         \
-        processinfo->MeasureTiming = CLIcmddata.cmdsettings->procinfo_MeasureTiming;                    \
-        DEBUG_TRACEPOINT("loopstart");                                                                  \
-        processinfo_loopstart(processinfo);                                                             \
+#define INSERT_STD_PROCINFO_COMPUTEFUNC_INIT                                                                           \
+    int processloopOK = 1;                                                                                             \
+    PROCESSINFO *processinfo = NULL;                                                                                   \
+    if (data.fpsptr != NULL)                                                                                           \
+    { /* If FPS mode, then FPS settings override defaults*/                                                            \
+        /* data.fpsptr->cmset entries are read by fps_connect */                                                       \
+        /*CLIcmddata.cmdsettings->flags = data.fpsptr->cmdset.flags;*/                                                 \
+        CLIcmddata.cmdsettings->RT_priority = data.fpsptr->cmdset.RT_priority;                                         \
+        CLIcmddata.cmdsettings->procinfo_loopcntMax = data.fpsptr->cmdset.procinfo_loopcntMax;                         \
+        CLIcmddata.cmdsettings->triggermode = data.fpsptr->cmdset.triggermode;                                         \
+        strcpy(CLIcmddata.cmdsettings->triggerstreamname, data.fpsptr->cmdset.triggerstreamname);                      \
+        CLIcmddata.cmdsettings->semindexrequested = data.fpsptr->cmdset.semindexrequested;                             \
+        CLIcmddata.cmdsettings->triggerdelay.tv_sec = data.fpsptr->cmdset.triggerdelay.tv_sec;                         \
+        CLIcmddata.cmdsettings->triggerdelay.tv_nsec = data.fpsptr->cmdset.triggerdelay.tv_nsec;                       \
+        CLIcmddata.cmdsettings->triggertimeout.tv_sec = data.fpsptr->cmdset.triggertimeout.tv_sec;                     \
+        CLIcmddata.cmdsettings->triggertimeout.tv_nsec = data.fpsptr->cmdset.triggertimeout.tv_nsec;                   \
+    }                                                                                                                  \
+    if (CLIcmddata.cmdsettings->flags & CLICMDFLAG_PROCINFO)                                                           \
+    {                                                                                                                  \
+        char pinfodescr[200];                                                                                          \
+        int slen = snprintf(pinfodescr, 200, "function %.10s", CLIcmddata.key);                                        \
+        if (slen < 1)                                                                                                  \
+        {                                                                                                              \
+            PRINT_ERROR("snprintf wrote <1 char");                                                                     \
+            abort();                                                                                                   \
+        }                                                                                                              \
+        if (slen >= 200)                                                                                               \
+        {                                                                                                              \
+            PRINT_ERROR("snprintf string truncation");                                                                 \
+            abort();                                                                                                   \
+        }                                                                                                              \
+        if (data.fpsptr != NULL)                                                                                       \
+        {                                                                                                              \
+            processinfo = processinfo_setup(data.FPS_name, pinfodescr, "startup", __FUNCTION__, __FILE__, __LINE__);   \
+            fps_to_processinfo(data.fpsptr, processinfo);                                                              \
+        }                                                                                                              \
+        else                                                                                                           \
+        {                                                                                                              \
+            processinfo = processinfo_setup(CLIcmddata.key, pinfodescr, "startup", __FUNCTION__, __FILE__, __LINE__);  \
+        }                                                                                                              \
+        DEBUG_TRACEPOINT("setting processinfo parameters");                                                            \
+        processinfo->loopcntMax = CLIcmddata.cmdsettings->procinfo_loopcntMax;                                         \
+        processinfo->triggerstreamID = -2;                                                                             \
+        processinfo->triggermode = CLIcmddata.cmdsettings->triggermode;                                                \
+        strcpy(processinfo->triggerstreamname, CLIcmddata.cmdsettings->triggerstreamname);                             \
+        processinfo->triggerdelay = CLIcmddata.cmdsettings->triggerdelay;                                              \
+        processinfo->triggertimeout = CLIcmddata.cmdsettings->triggertimeout;                                          \
+        processinfo->triggerstreamID = image_ID(processinfo->triggerstreamname);                                       \
+        DEBUG_TRACEPOINT("triggerstreamID = %ld", processinfo->triggerstreamID);                                       \
+        FUNC_CHECK_RETURN(processinfo_waitoninputstream_init(processinfo, processinfo->triggerstreamID,                \
+                                                             CLIcmddata.cmdsettings->triggermode,                      \
+                                                             CLIcmddata.cmdsettings->semindexrequested));              \
+        DEBUG_TRACEPOINT("setting RT priority to %d", CLIcmddata.cmdsettings->RT_priority);                            \
+        processinfo->RT_priority = CLIcmddata.cmdsettings->RT_priority;                                                \
+        processinfo->CPUmask = CLIcmddata.cmdsettings->CPUmask;                                                        \
+        processinfo->MeasureTiming = CLIcmddata.cmdsettings->procinfo_MeasureTiming;                                   \
+        DEBUG_TRACEPOINT("loopstart");                                                                                 \
+        processinfo_loopstart(processinfo);                                                                            \
     }
 
-
-#define INSERT_STD_PROCINFO_COMPUTEFUNC_LOOPSTART                                                       \
-    while (processloopOK == 1)                                                                          \
-    {                                                                                                   \
-        if (CLIcmddata.cmdsettings->flags & CLICMDFLAG_PROCINFO)                                        \
-        {                                                                                               \
-            DEBUG_TRACEPOINT("loopstep");                                                               \
-            processloopOK = processinfo_loopstep(processinfo);                                          \
-            DEBUG_TRACEPOINT("waitoninputstream");                                                      \
-            processinfo_waitoninputstream(processinfo);                                                 \
-            DEBUG_TRACEPOINT("exec_start");                                                             \
-            processinfo_exec_start(processinfo);                                                        \
-        }                                                                                               \
-        else                                                                                            \
-        {                                                                                               \
-            processloopOK = 0;                                                                          \
-        }                                                                                               \
-        int processcompstatus = 1;                                                                      \
-        if (CLIcmddata.cmdsettings->flags & CLICMDFLAG_PROCINFO)                                        \
-        {                                                                                               \
-            processcompstatus = processinfo_compute_status(processinfo);                                \
-        }                                                                                               \
-        if (processcompstatus == 1)                                                                     \
+#define INSERT_STD_PROCINFO_COMPUTEFUNC_LOOPSTART                                                                      \
+    while (processloopOK == 1)                                                                                         \
+    {                                                                                                                  \
+        if (CLIcmddata.cmdsettings->flags & CLICMDFLAG_PROCINFO)                                                       \
+        {                                                                                                              \
+            DEBUG_TRACEPOINT("loopstep");                                                                              \
+            processloopOK = processinfo_loopstep(processinfo);                                                         \
+            DEBUG_TRACEPOINT("waitoninputstream");                                                                     \
+            processinfo_waitoninputstream(processinfo);                                                                \
+            DEBUG_TRACEPOINT("exec_start");                                                                            \
+            processinfo_exec_start(processinfo);                                                                       \
+        }                                                                                                              \
+        else                                                                                                           \
+        {                                                                                                              \
+            processloopOK = 0;                                                                                         \
+        }                                                                                                              \
+        int processcompstatus = 1;                                                                                     \
+        if (CLIcmddata.cmdsettings->flags & CLICMDFLAG_PROCINFO)                                                       \
+        {                                                                                                              \
+            processcompstatus = processinfo_compute_status(processinfo);                                               \
+        }                                                                                                              \
+        if (processcompstatus == 1)                                                                                    \
         {
 
-
-
-
-
-
-#define INSERT_STD_PROCINFO_COMPUTEFUNC_START       \
-    INSERT_STD_PROCINFO_COMPUTEFUNC_INIT            \
+#define INSERT_STD_PROCINFO_COMPUTEFUNC_START                                                                          \
+    INSERT_STD_PROCINFO_COMPUTEFUNC_INIT                                                                               \
     INSERT_STD_PROCINFO_COMPUTEFUNC_LOOPSTART
 
-
-
-
-#define INSERT_STD_PROCINFO_COMPUTEFUNC_END                  \
-    }                                                        \
-    if (CLIcmddata.cmdsettings->flags & CLICMDFLAG_PROCINFO) \
-    {                                                        \
-        processinfo_exec_end(processinfo);                   \
-    }                                                        \
-    }                                                        \
-    if (CLIcmddata.cmdsettings->flags & CLICMDFLAG_PROCINFO) \
-    {                                                        \
-        processinfo_cleanExit(processinfo);                  \
+#define INSERT_STD_PROCINFO_COMPUTEFUNC_END                                                                            \
+    }                                                                                                                  \
+    if (CLIcmddata.cmdsettings->flags & CLICMDFLAG_PROCINFO)                                                           \
+    {                                                                                                                  \
+        processinfo_exec_end(processinfo);                                                                             \
+    }                                                                                                                  \
+    }                                                                                                                  \
+    if (CLIcmddata.cmdsettings->flags & CLICMDFLAG_PROCINFO)                                                           \
+    {                                                                                                                  \
+        processinfo_cleanExit(processinfo);                                                                            \
     }
 
 /** @brief FPS run function
@@ -340,16 +302,15 @@ typedef struct
  * strncpy(_IDin_name,  functionparameter_GetParamPtr_STRING(&fps, ".in_name"), FUNCTION_PARAMETER_STRMAXLEN);
  * long _delayus = functionparameter_GetParamValue_INT64(&fps, ".delayus");
  */
-#define INSERT_STD_FPSRUNfunction                   \
-    static errno_t FPSRUNfunction()                 \
-    {                                               \
-        FPS_CONNECT(data.FPS_name, FPSCONNECT_RUN); \
-        data.fpsptr = &fps;                         \
-        STD_FARG_LINKfunction                       \
-            errno_t fret = compute_function();      \
-        data.fpsptr = NULL;                         \
-        function_parameter_RUNexit(&fps);           \
-        return fret;                                \
+#define INSERT_STD_FPSRUNfunction                                                                                      \
+    static errno_t FPSRUNfunction()                                                                                    \
+    {                                                                                                                  \
+        FPS_CONNECT(data.FPS_name, FPSCONNECT_RUN);                                                                    \
+        data.fpsptr = &fps;                                                                                            \
+        STD_FARG_LINKfunction errno_t fret = compute_function();                                                       \
+        data.fpsptr = NULL;                                                                                            \
+        function_parameter_RUNexit(&fps);                                                                              \
+        return fret;                                                                                                   \
     }
 
 /** @brief FPSCLI function
@@ -361,54 +322,51 @@ typedef struct
  * Default FPS name will be used if CLI process has NOT been named.
  * See code in function_parameter.h for detailed rules.
  */
-#define INSERT_STD_FPSCLIfunction                                       \
-    static errno_t CLIfunction(void)                                    \
-    {                                                                   \
-        if (CLIcmddata.cmdsettings->flags & CLICMDFLAG_FPS)             \
-        {                                                               \
-            function_parameter_getFPSargs_from_CLIfunc(CLIcmddata.key); \
-            if (data.FPS_CMDCODE != 0)                                  \
-            {                                                           \
-                data.FPS_CONFfunc = FPSCONFfunction;                    \
-                data.FPS_RUNfunc = FPSRUNfunction;                      \
-                function_parameter_execFPScmd();                        \
-                return RETURN_SUCCESS;                                  \
-            }                                                           \
-        }                                                               \
-                                                                        \
-        errno_t retval = CLI_checkarg_array(farg, CLIcmddata.nbarg);    \
-        if (retval == RETURN_CLICHECKARGARRAY_SUCCESS)                  \
-        {                                                               \
-            data.fpsptr = NULL;                                         \
-            STD_FARG_LINKfunction return compute_function();            \
-        }                                                               \
-        if (retval == RETURN_CLICHECKARGARRAY_HELP)                     \
-        {                                                               \
-            help_function();                                            \
-            printf("\n");                                               \
-            return RETURN_SUCCESS;                                      \
-        }                                                               \
-        if (retval == RETURN_CLICHECKARGARRAY_FUNCPARAMSET)             \
-        {                                                               \
-            return RETURN_SUCCESS;                                      \
-        }                                                               \
-                                                                        \
-        return retval;                                                  \
+#define INSERT_STD_FPSCLIfunction                                                                                      \
+    static errno_t CLIfunction(void)                                                                                   \
+    {                                                                                                                  \
+        if (CLIcmddata.cmdsettings->flags & CLICMDFLAG_FPS)                                                            \
+        {                                                                                                              \
+            function_parameter_getFPSargs_from_CLIfunc(CLIcmddata.key);                                                \
+            if (data.FPS_CMDCODE != 0)                                                                                 \
+            {                                                                                                          \
+                data.FPS_CONFfunc = FPSCONFfunction;                                                                   \
+                data.FPS_RUNfunc = FPSRUNfunction;                                                                     \
+                function_parameter_execFPScmd();                                                                       \
+                return RETURN_SUCCESS;                                                                                 \
+            }                                                                                                          \
+        }                                                                                                              \
+                                                                                                                       \
+        errno_t retval = CLI_checkarg_array(farg, CLIcmddata.nbarg);                                                   \
+        if (retval == RETURN_CLICHECKARGARRAY_SUCCESS)                                                                 \
+        {                                                                                                              \
+            data.fpsptr = NULL;                                                                                        \
+            STD_FARG_LINKfunction return compute_function();                                                           \
+        }                                                                                                              \
+        if (retval == RETURN_CLICHECKARGARRAY_HELP)                                                                    \
+        {                                                                                                              \
+            help_function();                                                                                           \
+            printf("\n");                                                                                              \
+            return RETURN_SUCCESS;                                                                                     \
+        }                                                                                                              \
+        if (retval == RETURN_CLICHECKARGARRAY_FUNCPARAMSET)                                                            \
+        {                                                                                                              \
+            return RETURN_SUCCESS;                                                                                     \
+        }                                                                                                              \
+                                                                                                                       \
+        return retval;                                                                                                 \
     }
 
-#define INSERT_STD_FPSCLIfunctions \
-    INSERT_STD_FPSCONFfunction     \
-        INSERT_STD_FPSRUNfunction  \
-            INSERT_STD_FPSCLIfunction
-
-#define INSERT_STD_CLIREGISTERFUNC                            \
-    {                                                         \
-        if(getenv("MILK_FPSPROCINFO"))                        \
-        {                                                     \
-            CLIcmddata.flags |= CLICMDFLAG_PROCINFO;          \
-        }                                                     \
-        int cmdi = RegisterCLIcmd(CLIcmddata, CLIfunction);   \
-        CLIcmddata.cmdsettings = &data.cmd[cmdi].cmdsettings; \
+#define INSERT_STD_FPSCLIfunctions INSERT_STD_FPSCONFfunction INSERT_STD_FPSRUNfunction INSERT_STD_FPSCLIfunction
+
+#define INSERT_STD_CLIREGISTERFUNC                                                                                     \
+    {                                                                                                                  \
+        if (getenv("MILK_FPSPROCINFO"))                                                                                \
+        {                                                                                                              \
+            CLIcmddata.flags |= CLICMDFLAG_PROCINFO;                                                                   \
+        }                                                                                                              \
+        int cmdi = RegisterCLIcmd(CLIcmddata, CLIfunction);                                                            \
+        CLIcmddata.cmdsettings = &data.cmd[cmdi].cmdsettings;                                                          \
     }
 
 /** make IMGID from name
@@ -424,8 +382,7 @@ typedef struct
  *      D double precision float (64)
  *      F single precision float (32)
 */
-static inline IMGID makeIMGID(
-    CONST_WORD name)
+static inline IMGID makeIMGID(CONST_WORD name)
 {
     IMGID img;
 
@@ -444,70 +401,70 @@ static inline IMGID makeIMGID(
     char namestring[200];
     strcpy(namestring, name);
     pch = strtok(namestring, ">");
-    while(pch != NULL)
+    while (pch != NULL)
     {
         pch1 = pch;
         //printf("[%2d] %s\n", nbword, pch);
 
-        if(strcmp(pch, "s") == 0)
+        if (strcmp(pch, "s") == 0)
         {
             printf("    shared memory\n");
             img.shared = 1;
         }
 
-        if(strcmp(pch, "tui8") == 0)
+        if (strcmp(pch, "tui8") == 0)
         {
             printf("    data type unsigned 8-bit int\n");
             img.datatype = _DATATYPE_UINT8;
         }
-        if(strcmp(pch, "tsi8") == 0)
+        if (strcmp(pch, "tsi8") == 0)
         {
             printf("    data type signed 8-bit int\n");
             img.datatype = _DATATYPE_INT8;
         }
-        if(strcmp(pch, "tui16") == 0)
+        if (strcmp(pch, "tui16") == 0)
         {
             printf("    data type unsigned 16-bit int\n");
             img.datatype = _DATATYPE_UINT16;
         }
-        if(strcmp(pch, "tsi16") == 0)
+        if (strcmp(pch, "tsi16") == 0)
         {
             printf("    data type signed 16-bit int\n");
             img.datatype = _DATATYPE_INT16;
         }
-        if(strcmp(pch, "tui32") == 0)
+        if (strcmp(pch, "tui32") == 0)
         {
             printf("    data type unsigned 32-bit int\n");
             img.datatype = _DATATYPE_UINT32;
         }
-        if(strcmp(pch, "tsi32") == 0)
+        if (strcmp(pch, "tsi32") == 0)
         {
             printf("    data type signed 32-bit int\n");
             img.datatype = _DATATYPE_INT32;
         }
-        if(strcmp(pch, "tui64") == 0)
+        if (strcmp(pch, "tui64") == 0)
         {
             printf("    data type unsigned 64-bit int\n");
             img.datatype = _DATATYPE_UINT64;
         }
-        if(strcmp(pch, "tsi64") == 0)
+        if (strcmp(pch, "tsi64") == 0)
         {
             printf("    data type signed 64-bit int\n");
             img.datatype = _DATATYPE_INT64;
         }
 
-        if(strcmp(pch, "tf32") == 0)
+        if (strcmp(pch, "tf32") == 0)
         {
             printf("    data type double (32)\n");
             img.datatype = _DATATYPE_FLOAT;
         }
-        if(strcmp(pch, "tf64") == 0)
+        if (strcmp(pch, "tf64") == 0)
         {
             printf("    data type float (64)\n");
             img.datatype = _DATATYPE_DOUBLE;
         }
 
-        if(pch[0] == 'k')
+        if (pch[0] == 'k')
         {
             int nbkw;
             sscanf(pch, "k%d", &nbkw);
@@ -515,7 +472,7 @@ static inline IMGID makeIMGID(
             img.NBkw = nbkw;
         }
 
-        if(pch[0] == 'c')
+        if (pch[0] == 'c')
         {
             int cbsize;
             sscanf(pch, "c%d", &cbsize);
@@ -536,10 +493,7 @@ static inline IMGID makeIMGID(
     return img;
 }
 
-static inline IMGID makeIMGID_2D(
-    CONST_WORD name,
-    uint32_t xsize,
-    uint32_t ysize)
+static inline IMGID makeIMGID_2D(CONST_WORD name, uint32_t xsize, uint32_t ysize)
 {
     IMGID img = makeIMGID(name);
     img.naxis = 2;
@@ -549,11 +503,7 @@ static inline IMGID makeIMGID_2D(
     return img;
 }
 
-static inline IMGID makeIMGID_3D(
-    CONST_WORD name,
-    uint32_t xsize,
-    uint32_t ysize,
-    uint32_t zsize)
+static inline IMGID makeIMGID_3D(CONST_WORD name, uint32_t xsize, uint32_t ysize, uint32_t zsize)
 {
     IMGID img = makeIMGID(name);
     img.naxis = 3;
@@ -566,35 +516,23 @@ static inline IMGID makeIMGID_3D(
 
 /** Create image according to IMGID entries of existing image
  */
-static inline imageID imcreatelikewiseIMGID(
-    IMGID *target_img,
-    IMGID *source_img)
+static inline imageID imcreatelikewiseIMGID(IMGID *target_img, IMGID *source_img)
 {
-    if(target_img->ID == -1)
+    if (target_img->ID == -1)
     {
-        if(target_img != source_img)
+        if (target_img != source_img)
         {
-            printf("Creating image %s from %s, shared = %d, kw = %d\n", target_img->name,
-                   source_img->name,
+            printf("Creating image %s from %s, shared = %d, kw = %d\n", target_img->name, source_img->name,
                    source_img->shared, source_img->NBkw);
         }
         else
         {
-            printf("Creating image %s, shared = %d, kw = %d\n", source_img->name,
-                   source_img->shared,
-                   source_img->NBkw);
+            printf("Creating image %s, shared = %d, kw = %d\n", source_img->name, source_img->shared, source_img->NBkw);
         }
 
         DEBUG_TRACEPOINT("Creating 2D image");
-        create_image_ID(
-            target_img->name,
-            source_img->naxis,
-            source_img->size,
-            source_img->datatype,
-            source_img->shared,
-            source_img->NBkw,
-            source_img->CBsize,
-            &target_img->ID);
+        create_image_ID(target_img->name, source_img->naxis, source_img->size, source_img->datatype, source_img->shared,
+                        source_img->NBkw, source_img->CBsize, &target_img->ID);
         DEBUG_TRACEPOINT(" ");
         target_img->im = &data.image[target_img->ID];
         target_img->md = &data.image[target_img->ID].md[0];
@@ -606,18 +544,13 @@ static inline imageID imcreatelikewiseIMGID(
 /** Create image according to IMGID entries
  *  See cloning creation function imcreatelikewiseIMGID()
  */
-static inline imageID imcreateIMGID(
-    IMGID *img)
-{
-    return imcreatelikewiseIMGID(img, img);
-}
+static inline imageID imcreateIMGID(IMGID *img) { return imcreatelikewiseIMGID(img, img); }
 
-static inline errno_t updateIMGIDcreationparams(
-    IMGID *img)
+static inline errno_t updateIMGIDcreationparams(IMGID *img)
 {
     img->datatype = img->md->datatype;
     img->naxis = img->md->naxis;
-    for(int ii = 0; ii < 3; ++ii)
+    for (int ii = 0; ii < 3; ++ii)
     {
         img->size[ii] = img->md->size[ii];
     }
@@ -628,9 +561,7 @@ static inline errno_t updateIMGIDcreationparams(
     return RETURN_SUCCESS;
 }
 
-static inline IMGID makesetIMGID(
-    CONST_WORD name,
-    imageID ID)
+static inline IMGID makesetIMGID(CONST_WORD name, imageID ID)
 {
     IMGID img;
 
@@ -644,21 +575,15 @@ static inline IMGID makesetIMGID(
     return img;
 }
 
-
-
-static inline imageID resolveIMGID(
-    IMGID *img,
-    int ERRMODE)
+static inline imageID resolveIMGID(IMGID *img, int ERRMODE)
 {
 
     // IF:
     // Not resolved before OR create counter mismatch OR not used
-    if(img->ID == -1 ||
-            (img->createcnt != data.image[img->ID].createcnt) ||
-            (data.image[img->ID].used != 1))
+    if (img->ID == -1 || (img->createcnt != data.image[img->ID].createcnt) || (data.image[img->ID].used != 1))
     {
         img->ID = image_ID(img->name);
-        if(img->ID > -1)  // Resolve success !
+        if (img->ID > -1) // Resolve success !
         {
             img->im = &data.image[img->ID];
             img->md = &data.image[img->ID].md[0];
@@ -668,18 +593,16 @@ static inline imageID resolveIMGID(
         }
     }
 
-    if(img->ID == -1)
+    if (img->ID == -1)
     {
-        if((ERRMODE == ERRMODE_FAIL) || (ERRMODE == ERRMODE_ABORT))
+        if ((ERRMODE == ERRMODE_FAIL) || (ERRMODE == ERRMODE_ABORT))
         {
-            printf("ERROR: %c[%d;%dm Cannot resolve image %s %c[%d;m\n", (char)27, 1, 31,
-                   img->name, (char)27, 0);
+            printf("ERROR: %c[%d;%dm Cannot resolve image %s %c[%d;m\n", (char)27, 1, 31, img->name, (char)27, 0);
             abort();
         }
-        else if(ERRMODE == ERRMODE_WARN)
+        else if (ERRMODE == ERRMODE_WARN)
         {
-            printf("WARNING: %c[%d;%dm Cannot resolve image %s %c[%d;m\n", (char)27, 1, 35,
-                   img->name, (char)27, 0);
+            printf("WARNING: %c[%d;%dm Cannot resolve image %s %c[%d;m\n", (char)27, 1, 35, img->name, (char)27, 0);
         }
     }
 
diff --git a/src/CommandLineInterface/IMGID.h b/src/CommandLineInterface/IMGID.h
index d85e7227..0e64c02b 100644
--- a/src/CommandLineInterface/IMGID.h
+++ b/src/CommandLineInterface/IMGID.h
@@ -9,36 +9,34 @@
 
 #include "ImageStreamIO/ImageStreamIO.h"
 
-
 // image identifier type avoids name-resolving imageID multiple times
 // provides quick and convenient access to data and metadata pointers
 // Pass this as argument to functions to have both input-by-ID (ID>-1)
 // and input-by-name (ID=-1).
 typedef struct
 {
-    imageID ID;          // -1 if not resolved
-    int64_t createcnt;   // increments when image created, used to check if re-resolving needed
-    char    name[32];    // used to resolve if needed
+    imageID ID;        // -1 if not resolved
+    int64_t createcnt; // increments when image created, used to check if re-resolving needed
+    char name[32];     // used to resolve if needed
     IMAGE *im;
-    IMAGE_METADATA *md;  // pointer to metadata
+    IMAGE_METADATA *md; // pointer to metadata
 
     // Requested image params
     // Used to create image or test if existing image matches
 
-    uint8_t  datatype;
+    uint8_t datatype;
 
-    int      naxis;
+    int naxis;
     uint32_t size[3];
 
-    int      shared;
+    int shared;
 
     // number of keywords
-    int      NBkw;
+    int NBkw;
 
     // fast circular buffer size
-    int      CBsize;
+    int CBsize;
 
 } IMGID;
 
-
 #endif
diff --git a/src/CommandLineInterface/README.md b/src/CommandLineInterface/README.md
index 79240de8..3dc1abb8 100644
--- a/src/CommandLineInterface/README.md
+++ b/src/CommandLineInterface/README.md
@@ -10,7 +10,3 @@ Uses GNU Bison (parser generator) and Flex (lexical analysis) to process input.
 Module inclues key frameworks :
 - **processinfo** : process management and control
 - **function parameter structure (FPS)** : reading/writing function parameters
-
-
-
-
diff --git a/src/CommandLineInterface/TUItools.c b/src/CommandLineInterface/TUItools.c
index b319addb..e877581b 100644
--- a/src/CommandLineInterface/TUItools.c
+++ b/src/CommandLineInterface/TUItools.c
@@ -3,16 +3,13 @@
  * @brief   Text User Interface tools
  */
 
-
-#include <termios.h>
 #include <sys/ioctl.h> // for terminal size
+#include <termios.h>
 
 #include <ncurses.h>
 
-#include <CommandLineInterface/CLIcore.h>
 #include "TUItools.h"
-
-
+#include <CommandLineInterface/CLIcore.h>
 
 static struct winsize w;
 static short unsigned int wrow, wcol;
@@ -31,12 +28,6 @@ static int screenprintmode = SCREENPRINT_STDIO;
 struct termios orig_termios;
 struct termios new_termios;
 
-
-
-
-
-
-
 static int printAEC = 0;
 
 // Foreground color
@@ -45,25 +36,9 @@ static int printAECfgcolor = AEC_FGCOLOR_WHITE;
 // Background color
 static int printAECbgcolor = AEC_BGCOLOR_BLACK;
 
+void TUI_set_screenprintmode(int mode) { screenprintmode = mode; }
 
-
-
-
-void TUI_set_screenprintmode(
-    int mode
-)
-{
-    screenprintmode = mode;
-}
-
-
-
-int TUI_get_screenprintmode()
-{
-    return screenprintmode;
-}
-
-
+int TUI_get_screenprintmode() { return screenprintmode; }
 
 /**
  * @brief print to stdout or through ncurses
@@ -81,20 +56,20 @@ void TUI_printfw(const char *fmt, ...)
 
     va_start(args, fmt);
 
-    if(screenprintmode == SCREENPRINT_STDIO)
+    if (screenprintmode == SCREENPRINT_STDIO)
     {
         vfprintf(stdout, fmt, args);
     }
 
-    if(screenprintmode == SCREENPRINT_NCURSES)
+    if (screenprintmode == SCREENPRINT_NCURSES)
     {
         int x, y;
         int MAXLINELEN = 512;
         char prtstring[MAXLINELEN];
 
         getyx(stdscr, y, x);
-        (void) x;
-        (void) y;
+        (void)x;
+        (void)y;
 
         vsnprintf(prtstring, MAXLINELEN, fmt, args);
         printw("%s", prtstring);
@@ -103,89 +78,86 @@ void TUI_printfw(const char *fmt, ...)
     va_end(args);
 }
 
-
 void TUI_newline()
 {
-    if(screenprintmode == SCREENPRINT_STDIO)
+    if (screenprintmode == SCREENPRINT_STDIO)
     {
         printf("\n");
     }
-    if(screenprintmode == SCREENPRINT_NCURSES)
+    if (screenprintmode == SCREENPRINT_NCURSES)
     {
         printw("\n");
     }
 }
 
-
 void screenprint_setcolor(int colorcode)
 {
-    if(screenprintmode == SCREENPRINT_NCURSES)
+    if (screenprintmode == SCREENPRINT_NCURSES)
     {
         attron(COLOR_PAIR(colorcode));
     }
     else
     {
-        switch(colorcode)
+        switch (colorcode)
         {
-            case 1:
-                printAECfgcolor = AEC_FGCOLOR_WHITE;
-                printAECbgcolor = AEC_BGCOLOR_BLACK;
-                break;
-
-            case 2:
-                printAECfgcolor = AEC_FGCOLOR_BLACK;
-                printAECbgcolor = AEC_BGCOLOR_GREEN;
-                break;
-
-            case 3:
-                printAECfgcolor = AEC_FGCOLOR_BLACK;
-                printAECbgcolor = AEC_BGCOLOR_YELLOW;
-                break;
-
-            case 4:
-                printAECfgcolor = AEC_FGCOLOR_WHITE;
-                printAECbgcolor = AEC_BGCOLOR_RED;
-                break;
-
-            case 5:
-                printAECfgcolor = AEC_FGCOLOR_WHITE;
-                printAECbgcolor = AEC_BGCOLOR_BLUE;
-                break;
-
-            case 6:
-                printAECfgcolor = AEC_FGCOLOR_BLACK;
-                printAECbgcolor = AEC_BGCOLOR_GREEN;
-                break;
-
-            case 7:
-                printAECfgcolor = AEC_FGCOLOR_WHITE;
-                printAECbgcolor = AEC_BGCOLOR_YELLOW;
-                break;
-
-            case 8:
-                printAECfgcolor = AEC_FGCOLOR_BLACK;
-                printAECbgcolor = AEC_BGCOLOR_RED;
-                break;
-
-            case 9:
-                printAECfgcolor = AEC_FGCOLOR_RED;
-                printAECbgcolor = AEC_BGCOLOR_BLACK;
-                break;
-
-            case 10:
-                printAECfgcolor = AEC_FGCOLOR_BLACK;
-                printAECbgcolor = AEC_BGCOLOR_BLUE + 60;
-                break;
+        case 1:
+            printAECfgcolor = AEC_FGCOLOR_WHITE;
+            printAECbgcolor = AEC_BGCOLOR_BLACK;
+            break;
+
+        case 2:
+            printAECfgcolor = AEC_FGCOLOR_BLACK;
+            printAECbgcolor = AEC_BGCOLOR_GREEN;
+            break;
+
+        case 3:
+            printAECfgcolor = AEC_FGCOLOR_BLACK;
+            printAECbgcolor = AEC_BGCOLOR_YELLOW;
+            break;
+
+        case 4:
+            printAECfgcolor = AEC_FGCOLOR_WHITE;
+            printAECbgcolor = AEC_BGCOLOR_RED;
+            break;
+
+        case 5:
+            printAECfgcolor = AEC_FGCOLOR_WHITE;
+            printAECbgcolor = AEC_BGCOLOR_BLUE;
+            break;
+
+        case 6:
+            printAECfgcolor = AEC_FGCOLOR_BLACK;
+            printAECbgcolor = AEC_BGCOLOR_GREEN;
+            break;
+
+        case 7:
+            printAECfgcolor = AEC_FGCOLOR_WHITE;
+            printAECbgcolor = AEC_BGCOLOR_YELLOW;
+            break;
+
+        case 8:
+            printAECfgcolor = AEC_FGCOLOR_BLACK;
+            printAECbgcolor = AEC_BGCOLOR_RED;
+            break;
+
+        case 9:
+            printAECfgcolor = AEC_FGCOLOR_RED;
+            printAECbgcolor = AEC_BGCOLOR_BLACK;
+            break;
+
+        case 10:
+            printAECfgcolor = AEC_FGCOLOR_BLACK;
+            printAECbgcolor = AEC_BGCOLOR_BLUE + 60;
+            break;
         }
 
-        printf("\033[%d;%dm",  printAECfgcolor, printAECbgcolor);
+        printf("\033[%d;%dm", printAECfgcolor, printAECbgcolor);
     }
 }
 
-
 void screenprint_unsetcolor(int colorcode)
 {
-    if(screenprintmode == SCREENPRINT_NCURSES)
+    if (screenprintmode == SCREENPRINT_NCURSES)
     {
         attroff(COLOR_PAIR(colorcode));
     }
@@ -198,52 +170,48 @@ void screenprint_unsetcolor(int colorcode)
     }
 }
 
-
 void screenprint_setbold()
 {
-    if(screenprintmode == SCREENPRINT_NCURSES)
+    if (screenprintmode == SCREENPRINT_NCURSES)
     {
         attron(A_BOLD);
     }
     else
     {
         printAEC = AEC_BOLD;
-        printf("\033[%dm",  printAEC);
+        printf("\033[%dm", printAEC);
     }
 }
 
-
 void screenprint_unsetbold()
 {
-    if(screenprintmode == SCREENPRINT_NCURSES)
+    if (screenprintmode == SCREENPRINT_NCURSES)
     {
         attroff(A_BOLD);
     }
     else
     {
         printAEC = AEC_NORMAL; //AEC_BOLDOFF;
-        printf("\033[%dm",  printAEC);
+        printf("\033[%dm", printAEC);
     }
 }
 
-
 void screenprint_setblink()
 {
-    if(screenprintmode == SCREENPRINT_NCURSES)
+    if (screenprintmode == SCREENPRINT_NCURSES)
     {
         attron(A_BLINK);
     }
     else
     {
         printAEC = AEC_FASTBLINK;
-        printf("\033[%dm",  printAEC);
+        printf("\033[%dm", printAEC);
     }
 }
 
-
 void screenprint_unsetblink()
 {
-    if(screenprintmode == SCREENPRINT_NCURSES)
+    if (screenprintmode == SCREENPRINT_NCURSES)
     {
         attroff(A_BLINK);
     }
@@ -254,66 +222,61 @@ void screenprint_unsetblink()
     }
 }
 
-
 void screenprint_setdim()
 {
-    if(screenprintmode == SCREENPRINT_NCURSES)
+    if (screenprintmode == SCREENPRINT_NCURSES)
     {
         attron(A_DIM);
     }
     else
     {
         printAEC = AEC_FAINT;
-        printf("\033[%dm",  printAEC);
+        printf("\033[%dm", printAEC);
     }
 }
 
-
 void screenprint_unsetdim()
 {
-    if(screenprintmode == SCREENPRINT_NCURSES)
+    if (screenprintmode == SCREENPRINT_NCURSES)
     {
         attroff(A_DIM);
     }
     else
     {
         printAEC = AEC_NORMAL; //AEC_FAINTOFF;
-        printf("\033[%dm",  printAEC);
+        printf("\033[%dm", printAEC);
     }
 }
 
-
 void screenprint_setreverse()
 {
-    if(screenprintmode == SCREENPRINT_NCURSES)
+    if (screenprintmode == SCREENPRINT_NCURSES)
     {
         attron(A_REVERSE);
     }
     else
     {
         printAEC = AEC_REVERSE;
-        printf("\033[%dm",  printAEC);
+        printf("\033[%dm", printAEC);
     }
 }
 
-
 void screenprint_unsetreverse()
 {
-    if(screenprintmode == SCREENPRINT_NCURSES)
+    if (screenprintmode == SCREENPRINT_NCURSES)
     {
         attroff(A_REVERSE);
     }
     else
     {
         printAEC = AEC_NORMAL; //AEC_REVERSEOFF;
-        printf("\033[%dm",  printAEC);
+        printf("\033[%dm", printAEC);
     }
 }
 
-
 void screenprint_setnormal()
 {
-    if(screenprintmode == SCREENPRINT_NCURSES)
+    if (screenprintmode == SCREENPRINT_NCURSES)
     {
         //attron(A_REVERSE);
     }
@@ -326,7 +289,6 @@ void screenprint_setnormal()
     }
 }
 
-
 /**
  * @brief Print header line
  *
@@ -334,38 +296,33 @@ void screenprint_setnormal()
  * @param c       filler character to be printed on either side of content
  * @return errno_t
  */
-errno_t TUI_print_header(
-    const char *str,
-    char c
-)
+errno_t TUI_print_header(const char *str, char c)
 {
     long n = strlen(str);
 
     screenprint_setbold();
 
     int strl = wcol - 1;
-    if(n > wcol)
+    if (n > wcol)
     {
         strl = n + 1;
     }
     char linestring[strl];
     int spos = 0;
 
-
-    for(long i = 0; i < (wcol - n) / 2; i++)
+    for (long i = 0; i < (wcol - n) / 2; i++)
     {
         linestring[spos] = c;
         spos++;
     }
 
-
-    for(size_t i = 0; i < strlen(str); i++)
+    for (size_t i = 0; i < strlen(str); i++)
     {
         linestring[spos] = str[i];
         spos++;
     }
 
-    for(long i = 0; i < (wcol - n) / 2 - 1; i++)
+    for (long i = 0; i < (wcol - n) / 2 - 1; i++)
     {
         linestring[spos] = c;
         spos++;
@@ -380,13 +337,6 @@ errno_t TUI_print_header(
     return RETURN_SUCCESS;
 }
 
-
-
-
-
-
-
-
 /** @brief restore terminal settings
  */
 void TUI_reset_terminal_mode()
@@ -395,11 +345,7 @@ void TUI_reset_terminal_mode()
     tcsetattr(0, TCSANOW, &new_termios);
 }
 
-
-errno_t TUI_inittermios(
-    short unsigned int *wrowptr,
-    short unsigned int *wcolptr
-)
+errno_t TUI_inittermios(short unsigned int *wrowptr, short unsigned int *wcolptr)
 {
     tcgetattr(0, &orig_termios);
 
@@ -426,16 +372,9 @@ errno_t TUI_inittermios(
     return RETURN_SUCCESS;
 }
 
-
-
-
-
-void TUI_clearscreen(
-    short unsigned int *wrowptr,
-    short unsigned int *wcolptr
-)
+void TUI_clearscreen(short unsigned int *wrowptr, short unsigned int *wcolptr)
 {
-    if(screenprintmode == SCREENPRINT_STDIO) // stdio mode
+    if (screenprintmode == SCREENPRINT_STDIO) // stdio mode
     {
         printf("\e[1;1H\e[2J");
         //printf("[%12lld  %d %d %d ]  ", loopcnt, buffd[0], buffd[1], buffd[2]);
@@ -448,20 +387,16 @@ void TUI_clearscreen(
     }
     else
     {
-        (void) *wrowptr;
-        (void) *wcolptr;
+        (void)*wrowptr;
+        (void)*wcolptr;
     }
-
 }
 
-
-
-
 void TUI_handle_winch(int sig)
 {
     wresizecnt++;
     DEBUG_TRACEPOINT("wresizecnt = %d", wresizecnt);
-    (void) sig;
+    (void)sig;
 
     endwin();
 
@@ -478,30 +413,24 @@ void TUI_handle_winch(int sig)
     refresh();
 }
 
-
-
 /** @brief INITIALIZE ncurses
  *
  */
-errno_t TUI_initncurses(
-    short unsigned int *wrowptr,
-    short unsigned int *wcolptr
-)
+errno_t TUI_initncurses(short unsigned int *wrowptr, short unsigned int *wcolptr)
 {
     DEBUG_TRACEPOINT(" ");
-    if(screenprintmode == SCREENPRINT_NCURSES)
+    if (screenprintmode == SCREENPRINT_NCURSES)
     {
         DEBUG_TRACEPOINT("Initializing TUI ncurses ");
 
-
-        if(initscr() == NULL)
+        if (initscr() == NULL)
         {
             fprintf(stderr, "Error initialising ncurses.\n");
             exit(EXIT_FAILURE);
         }
         DEBUG_TRACEPOINT("Initializing TUI ncurses ");
 
-        getmaxyx(stdscr, wrow, wcol);		/* get the number of rows and columns */
+        getmaxyx(stdscr, wrow, wcol); /* get the number of rows and columns */
         *wrowptr = wrow;
         *wcolptr = wcol;
         DEBUG_TRACEPOINT("wrow wcol = %d %d", wrow, wcol);
@@ -534,17 +463,17 @@ errno_t TUI_initncurses(
         DEBUG_TRACEPOINT(" ");
 
         //  colored background
-        init_pair(1, COLOR_BLACK,  COLOR_WHITE);
-        init_pair(2, COLOR_BLACK,  COLOR_GREEN);      // all good
-        init_pair(3, COLOR_BLACK,  COLOR_YELLOW);    // parameter out of sync
-        init_pair(4, COLOR_WHITE,  COLOR_RED);
-        init_pair(5, COLOR_WHITE,  COLOR_BLUE);      // DIRECTORY
-        init_pair(6, COLOR_GREEN,  COLOR_BLACK);
+        init_pair(1, COLOR_BLACK, COLOR_WHITE);
+        init_pair(2, COLOR_BLACK, COLOR_GREEN);  // all good
+        init_pair(3, COLOR_BLACK, COLOR_YELLOW); // parameter out of sync
+        init_pair(4, COLOR_WHITE, COLOR_RED);
+        init_pair(5, COLOR_WHITE, COLOR_BLUE); // DIRECTORY
+        init_pair(6, COLOR_GREEN, COLOR_BLACK);
         init_pair(7, COLOR_YELLOW, COLOR_BLACK);
-        init_pair(8, COLOR_RED,    COLOR_BLACK);
-        init_pair(9, COLOR_BLACK,  COLOR_RED);
-        init_pair(10, COLOR_BLACK,  COLOR_CYAN);
-        init_pair(12, COLOR_GREEN,  COLOR_WHITE);    // highlighted version of #2
+        init_pair(8, COLOR_RED, COLOR_BLACK);
+        init_pair(9, COLOR_BLACK, COLOR_RED);
+        init_pair(10, COLOR_BLACK, COLOR_CYAN);
+        init_pair(12, COLOR_GREEN, COLOR_WHITE); // highlighted version of #2
 
         // handle window resize
         struct sigaction sa;
@@ -558,15 +487,9 @@ errno_t TUI_initncurses(
     return RETURN_SUCCESS;
 }
 
-
-
-
-errno_t TUI_init_terminal(
-    short unsigned int *wrowptr,
-    short unsigned int *wcolptr
-)
+errno_t TUI_init_terminal(short unsigned int *wrowptr, short unsigned int *wcolptr)
 {
-    if(screenprintmode == SCREENPRINT_NCURSES)  // ncurses mode
+    if (screenprintmode == SCREENPRINT_NCURSES) // ncurses mode
     {
         TUI_initncurses(wrowptr, wcolptr);
         DEBUG_TRACEPOINT("init terminal ncurses mode %d %d", *wrowptr, *wcolptr);
@@ -582,11 +505,7 @@ errno_t TUI_init_terminal(
     return RETURN_SUCCESS;
 }
 
-
-errno_t TUI_get_terminal_size(
-    short unsigned int *wrowptr,
-    short unsigned int *wcolptr
-)
+errno_t TUI_get_terminal_size(short unsigned int *wrowptr, short unsigned int *wcolptr)
 {
     *wrowptr = wrow;
     *wcolptr = wcol;
@@ -594,11 +513,9 @@ errno_t TUI_get_terminal_size(
     return RETURN_SUCCESS;
 }
 
-
-
 errno_t TUI_exit()
 {
-    if(screenprintmode == SCREENPRINT_NCURSES)
+    if (screenprintmode == SCREENPRINT_NCURSES)
     {
         endwin();
     }
@@ -606,8 +523,6 @@ errno_t TUI_exit()
     return RETURN_SUCCESS;
 }
 
-
-
 void TUI_atexit()
 {
     //printf("exiting CTRLscreen\n");
@@ -615,13 +530,9 @@ void TUI_atexit()
     // endwin();
 }
 
-
-
-
-
 errno_t TUI_ncurses_refresh()
 {
-    if(screenprintmode == SCREENPRINT_NCURSES)
+    if (screenprintmode == SCREENPRINT_NCURSES)
     {
         refresh();
     }
@@ -629,10 +540,9 @@ errno_t TUI_ncurses_refresh()
     return RETURN_SUCCESS;
 }
 
-
 errno_t TUI_ncurses_erase()
 {
-    if(screenprintmode == SCREENPRINT_NCURSES)
+    if (screenprintmode == SCREENPRINT_NCURSES)
     {
         erase();
     }
@@ -640,10 +550,9 @@ errno_t TUI_ncurses_erase()
     return RETURN_SUCCESS;
 }
 
-
 errno_t TUI_stdio_clear()
 {
-    if(screenprintmode == SCREENPRINT_STDIO)
+    if (screenprintmode == SCREENPRINT_STDIO)
     {
         printf("\e[1;1H\e[2J");
     }
@@ -651,25 +560,13 @@ errno_t TUI_stdio_clear()
     return RETURN_SUCCESS;
 }
 
-
-
-
-
-
-
-
-
-
-
-
-
 int get_singlechar_nonblock()
 {
     int ch = -1;
 
-    if(screenprintmode == SCREENPRINT_NCURSES)
+    if (screenprintmode == SCREENPRINT_NCURSES)
     {
-        ch = getch();  // ncurses function, non-blocking
+        ch = getch(); // ncurses function, non-blocking
     }
     else
     {
@@ -677,71 +574,65 @@ int get_singlechar_nonblock()
 
         int l = read(STDIN_FILENO, buff, 3);
 
-        if(l > 0)
+        if (l > 0)
         {
             ch = buff[0];
 
-            if(buff[0] == 13)  // enter
+            if (buff[0] == 13) // enter
             {
                 ch = 10; // new line
             }
 
-
-            if(buff[0] == 27)    // if the first value is esc
+            if (buff[0] == 27) // if the first value is esc
             {
 
-
-                if(buff[1] == 91)
+                if (buff[1] == 91)
                 {
-                    switch(buff[2])
+                    switch (buff[2])
                     {
-                        // the real value
-                        case 'A':
-                            ch = KEY_UP; // code for arrow up
-                            break;
-                        case 'B':
-                            ch = KEY_DOWN; // code for arrow down
-                            break;
-                        case 'C':
-                            ch = KEY_RIGHT; // code for arrow right
-                            break;
-                        case 'D':
-                            ch = KEY_LEFT; // code for arrow left
-                            break;
+                    // the real value
+                    case 'A':
+                        ch = KEY_UP; // code for arrow up
+                        break;
+                    case 'B':
+                        ch = KEY_DOWN; // code for arrow down
+                        break;
+                    case 'C':
+                        ch = KEY_RIGHT; // code for arrow right
+                        break;
+                    case 'D':
+                        ch = KEY_LEFT; // code for arrow left
+                        break;
                     }
                 }
 
-
-                if(buff[1] == 79)
+                if (buff[1] == 79)
                 {
-                    switch(buff[2])
+                    switch (buff[2])
                     {
-                        case 80:
-                            ch = KEY_F(1);
-                            break;
-                        case 81:
-                            ch = KEY_F(2);
-                            break;
-                        case 82:
-                            ch = KEY_F(3);
-                            break;
+                    case 80:
+                        ch = KEY_F(1);
+                        break;
+                    case 81:
+                        ch = KEY_F(2);
+                        break;
+                    case 82:
+                        ch = KEY_F(3);
+                        break;
                     }
                 }
             }
-
         }
     }
 
     return ch;
 }
 
-
-
 int get_singlechar_block()
 {
     int ch;
 
-    if(screenprintmode == SCREENPRINT_NCURSES)
+    if (screenprintmode == SCREENPRINT_NCURSES)
     {
         ch = getchar();
     }
@@ -750,7 +641,7 @@ int get_singlechar_block()
         int getchardt_us = 100000;
 
         ch = -1;
-        while(ch == -1)
+        while (ch == -1)
         {
             usleep(getchardt_us); // kHz
             ch = get_singlechar_nonblock();
@@ -758,7 +649,3 @@ int get_singlechar_block()
     }
     return ch;
 }
-
-
-
-
diff --git a/src/CommandLineInterface/TUItools.h b/src/CommandLineInterface/TUItools.h
index 2e04aae6..32c2ad3a 100644
--- a/src/CommandLineInterface/TUItools.h
+++ b/src/CommandLineInterface/TUItools.h
@@ -6,8 +6,6 @@
 #ifndef TUITOOLS_H
 #define TUITOOLS_H
 
-
-
 /** @brief print to screen, or not
  *
  * mode=0 : printf (stdout)
@@ -15,91 +13,81 @@
  * mode=3 : don't print (silent)
  */
 
-#define SCREENPRINT_STDIO   0
+#define SCREENPRINT_STDIO 0
 #define SCREENPRINT_NCURSES 1
-#define SCREENPRINT_NONE    2
-
-
+#define SCREENPRINT_NONE 2
 
 // ANSI ESCAPE CODES
 
 //static int printAEC = 0;
 
-#define AEC_NORMAL    0
-#define AEC_BOLD      1
-#define AEC_FAINT     2
-#define AEC_ITALIC    3
+#define AEC_NORMAL 0
+#define AEC_BOLD 1
+#define AEC_FAINT 2
+#define AEC_ITALIC 3
 #define AEC_UNDERLINE 4
 #define AEC_SLOWBLINK 5
 #define AEC_FASTBLINK 6
-#define AEC_REVERSE   7
+#define AEC_REVERSE 7
 
-#define AEC_BOLDOFF      22
-#define AEC_FAINTOFF     22
-#define AEC_ITALICOFF     3
+#define AEC_BOLDOFF 22
+#define AEC_FAINTOFF 22
+#define AEC_ITALICOFF 3
 #define AEC_UNDERLINEOFF 24
-#define AEC_BLINKOFF     25
-#define AEC_REVERSEOFF   27
+#define AEC_BLINKOFF 25
+#define AEC_REVERSEOFF 27
 
 // Foreground color
 
 //static int printAECfgcolor = AEC_FGCOLOR_WHITE;
 
-#define AEC_FGCOLOR_BLACK   30
-#define AEC_FGCOLOR_RED     31
-#define AEC_FGCOLOR_GREEN   32
-#define AEC_FGCOLOR_YELLOW  33
-#define AEC_FGCOLOR_BLUE    34
+#define AEC_FGCOLOR_BLACK 30
+#define AEC_FGCOLOR_RED 31
+#define AEC_FGCOLOR_GREEN 32
+#define AEC_FGCOLOR_YELLOW 33
+#define AEC_FGCOLOR_BLUE 34
 #define AEC_FGCOLOR_MAGENTA 35
-#define AEC_FGCOLOR_CYAN    36
-#define AEC_FGCOLOR_WHITE   37
+#define AEC_FGCOLOR_CYAN 36
+#define AEC_FGCOLOR_WHITE 37
 // note : +60 for high intensity
 
-
 // Background color
 
 //static int printAECbgcolor = AEC_BGCOLOR_BLACK;
 
-#define AEC_BGCOLOR_BLACK   40
-#define AEC_BGCOLOR_RED     41
-#define AEC_BGCOLOR_GREEN   42
-#define AEC_BGCOLOR_YELLOW  43
-#define AEC_BGCOLOR_BLUE    44
+#define AEC_BGCOLOR_BLACK 40
+#define AEC_BGCOLOR_RED 41
+#define AEC_BGCOLOR_GREEN 42
+#define AEC_BGCOLOR_YELLOW 43
+#define AEC_BGCOLOR_BLUE 44
 #define AEC_BGCOLOR_MAGENTA 45
-#define AEC_BGCOLOR_CYAN    46
-#define AEC_BGCOLOR_WHITE   47
+#define AEC_BGCOLOR_CYAN 46
+#define AEC_BGCOLOR_WHITE 47
 // note : +60 for high intensity
 
-
 #define AECBOLDHIGREEN "\033[1;92;40m"
 #define AECBOLDHIRED "\033[1;91;40m"
 #define AECNORMAL "\033[37;40;0m"
 
-
-#define COLOR_NONE    1
-#define COLOR_OK      2
+#define COLOR_NONE 1
+#define COLOR_OK 2
 #define COLOR_WARNING 3
-#define COLOR_ERROR   4
-
-
+#define COLOR_ERROR 4
 
 void TUI_set_screenprintmode(int mode);
 int TUI_get_screenprintmode();
 
-
-
 void TUI_printfw(const char *fmt, ...);
 void TUI_newline();
 
-void screenprint_setcolor( int colorcode );
+void screenprint_setcolor(int colorcode);
 
-void screenprint_unsetcolor( int colorcode );
+void screenprint_unsetcolor(int colorcode);
 
 void screenprint_setbold();
 
 void screenprint_unsetbold();
 
-
 void screenprint_setblink();
 
 void screenprint_unsetblink();
@@ -110,7 +98,6 @@ void screenprint_unsetdim();
 
 void screenprint_setreverse();
 
-
 void screenprint_unsetreverse();
 
 void screenprint_setnormal();
@@ -140,11 +127,8 @@ errno_t TUI_ncurses_erase();
 
 errno_t TUI_stdio_clear();
 
-
-
 int get_singlechar_nonblock();
 
 int get_singlechar_block();
 
-
-#endif
\ No newline at end of file
+#endif
diff --git a/src/CommandLineInterface/calc.h b/src/CommandLineInterface/calc.h
index 0c525f60..f640565b 100644
--- a/src/CommandLineInterface/calc.h
+++ b/src/CommandLineInterface/calc.h
@@ -3,13 +3,14 @@
 /* Data type for links in the chain of symbols.      */
 struct symrec
 {
-  char *name;  /* name of symbol                     */
-  int type;    /* type of symbol: either VAR or FNCT */
-  union {
-    double var;           /* value of a VAR          */
-    double (*fnctptr)();  /* value of a FNCT         */
-  } value;
-  struct symrec *next;    /* link field              */
+    char *name; /* name of symbol                     */
+    int type;   /* type of symbol: either VAR or FNCT */
+    union
+    {
+        double var;          /* value of a VAR          */
+        double (*fnctptr)(); /* value of a FNCT         */
+    } value;
+    struct symrec *next; /* link field              */
 };
 
 typedef struct symrec symrec;
@@ -17,6 +18,5 @@ typedef struct symrec symrec;
 /* The symbol table: a chain of `struct symrec'.     */
 extern symrec *sym_table;
 
-symrec *putsym ();
-symrec *getsym ();
-
+symrec *putsym();
+symrec *getsym();
diff --git a/src/CommandLineInterface/calc_flex.l b/src/CommandLineInterface/calc_flex.l
index eada9b8f..49638766 100644
--- a/src/CommandLineInterface/calc_flex.l
+++ b/src/CommandLineInterface/calc_flex.l
@@ -26,120 +26,120 @@ numberd	[0-9]*\.?[0-9]+([eE][-+]?[0-9]+)?
 
 %%
 
-{numberl}	 { 
-yylval.val_l = atol(yytext); 
-if(data.Debug>0){printf("Found long number %s -> %ld\n", yytext, yylval.val_l);} 
-return TKNUMl; 
+{numberl}	 {
+yylval.val_l = atol(yytext);
+if(data.Debug>0){printf("Found long number %s -> %ld\n", yytext, yylval.val_l);}
+return TKNUMl;
 }
 
-{numberd}	 { 
-yylval.val_d = atof(yytext); 
-if(data.Debug>0){printf("Found float number %s -> %f\n", yytext, yylval.val_d);} 
-return TKNUMd; 
+{numberd}	 {
+yylval.val_d = atof(yytext);
+if(data.Debug>0){printf("Found float number %s -> %f\n", yytext, yylval.val_d);}
+return TKNUMd;
 }
 
 
 
 
 "sin("	{
-if(data.Debug>0){printf("Found function %s\n", yytext);} 
+if(data.Debug>0){printf("Found function %s\n", yytext);}
 yylval.fnctptr = sin;
-return TKFUNC_d_d; 
+return TKFUNC_d_d;
 }
 
 "cos("  {
-if(data.Debug>0){printf("Found function %s\n", yytext);} 
+if(data.Debug>0){printf("Found function %s\n", yytext);}
 yylval.fnctptr = cos;
-return TKFUNC_d_d; 
+return TKFUNC_d_d;
 }
 
 "exp("  {
-if(data.Debug>0){printf("Found function %s\n", yytext);} 
+if(data.Debug>0){printf("Found function %s\n", yytext);}
 yylval.fnctptr = exp;
-return TKFUNC_d_d; 
+return TKFUNC_d_d;
 }
 
 "ln("  {
-if(data.Debug>0){printf("Found function %s\n", yytext);} 
+if(data.Debug>0){printf("Found function %s\n", yytext);}
 yylval.fnctptr = log;
-return TKFUNC_d_d; 
+return TKFUNC_d_d;
 }
 
 "log("  {
-if(data.Debug>0){printf("Found function %s\n", yytext);} 
+if(data.Debug>0){printf("Found function %s\n", yytext);}
 yylval.fnctptr = log10;
-return TKFUNC_d_d; 
+return TKFUNC_d_d;
 }
 
 "tan(" {
-if(data.Debug>0){printf("Found function %s\n", yytext);} 
+if(data.Debug>0){printf("Found function %s\n", yytext);}
 yylval.fnctptr = tan;
-return TKFUNC_d_d; 
+return TKFUNC_d_d;
 }
 
 "atan("  {
-if(data.Debug>0){printf("Found function %s\n", yytext);} 
+if(data.Debug>0){printf("Found function %s\n", yytext);}
 yylval.fnctptr = atan;
-return TKFUNC_d_d; 
+return TKFUNC_d_d;
 }
 
 "sqrt("  {
-if(data.Debug>0){printf("Found function %s\n", yytext);} 
+if(data.Debug>0){printf("Found function %s\n", yytext);}
 yylval.fnctptr = sqrt;
-return TKFUNC_d_d; 
+return TKFUNC_d_d;
 }
 
 "cbrt(" {
-if(data.Debug>0){printf("Found function %s\n", yytext);} 
+if(data.Debug>0){printf("Found function %s\n", yytext);}
 yylval.fnctptr = cbrt;
-return TKFUNC_d_d; 
+return TKFUNC_d_d;
 }
 
 "ceil(" {
-if(data.Debug>0){printf("Found function %s\n", yytext);} 
+if(data.Debug>0){printf("Found function %s\n", yytext);}
 yylval.fnctptr = ceil;
-return TKFUNC_d_d; 
+return TKFUNC_d_d;
 }
 
 "floor(" {
-if(data.Debug>0){printf("Found function %s\n", yytext);} 
+if(data.Debug>0){printf("Found function %s\n", yytext);}
 yylval.fnctptr = floor;
-return TKFUNC_d_d; 
+return TKFUNC_d_d;
 }
 
 "asin(" {
-if(data.Debug>0){printf("Found function %s\n", yytext);} 
+if(data.Debug>0){printf("Found function %s\n", yytext);}
 yylval.fnctptr = asin;
-return TKFUNC_d_d; 
+return TKFUNC_d_d;
 }
 
 "acos(" {
-if(data.Debug>0){printf("Found function %s\n", yytext);} 
+if(data.Debug>0){printf("Found function %s\n", yytext);}
 yylval.fnctptr = acos;
-return TKFUNC_d_d; 
+return TKFUNC_d_d;
 }
 
 
 "posi(" {
-if(data.Debug>0){printf("Found function %s\n", yytext);} 
+if(data.Debug>0){printf("Found function %s\n", yytext);}
 yylval.fnctptr = Ppositive;
-return TKFUNC_d_d; 
+return TKFUNC_d_d;
 }
 
 
 
 
 "atan2(" {
-if(data.Debug>0){printf("Found function %s\n", yytext);} 
+if(data.Debug>0){printf("Found function %s\n", yytext);}
 yylval.fnctptr = atan2;
-return TKFUNC_dd_d; 
+return TKFUNC_dd_d;
 }
 
 
 "trunc(" {
-if(data.Debug>0){printf("Found function %s\n", yytext);} 
+if(data.Debug>0){printf("Found function %s\n", yytext);}
 yylval.fnctptr = Ptrunc;
-return TKFUNC_ddd_d; 
+return TKFUNC_ddd_d;
 }
 
 
@@ -147,27 +147,27 @@ return TKFUNC_ddd_d;
 
 
 "itot(" {
-if(data.Debug>0){printf("Found function %s\n", yytext);} 
+if(data.Debug>0){printf("Found function %s\n", yytext);}
 yylval.fnctptr = arith_image_total;
-return TKFUNC_im_d; 
+return TKFUNC_im_d;
 }
 
 "imin(" {
-if(data.Debug>0){printf("Found function %s\n", yytext);} 
+if(data.Debug>0){printf("Found function %s\n", yytext);}
 yylval.fnctptr = arith_image_min;
-return TKFUNC_im_d; 
+return TKFUNC_im_d;
 }
 
 "imax(" {
-if(data.Debug>0){printf("Found function %s\n", yytext);} 
+if(data.Debug>0){printf("Found function %s\n", yytext);}
 yylval.fnctptr = arith_image_max;
-return TKFUNC_im_d; 
+return TKFUNC_im_d;
 }
 
 "imean(" {
-if(data.Debug>0){printf("Found function %s\n", yytext);} 
+if(data.Debug>0){printf("Found function %s\n", yytext);}
 yylval.fnctptr = arith_image_mean;
-return TKFUNC_im_d; 
+return TKFUNC_im_d;
 }
 
 
@@ -175,9 +175,9 @@ return TKFUNC_im_d;
 
 
 "perc(" {
-if(data.Debug>0){printf("Found function %s\n", yytext);} 
+if(data.Debug>0){printf("Found function %s\n", yytext);}
 yylval.fnctptr = arith_image_percentile;
-return TKFUNC_imd_d; 
+return TKFUNC_imd_d;
 }
 
 
@@ -191,11 +191,11 @@ if(data.cmdNBarg==0)
 {
 data.cmdindex = -1;
  for(i=0;i<(long) data.NBcmd;i++)
-  { 
+  {
    if(!strcmp(yytext, data.cmd[i].key))
     {
      data.cmdindex = i;
-     if(data.Debug>0){printf("THIS IS A COMMAND (%ld)\n",i);}     
+     if(data.Debug>0){printf("THIS IS A COMMAND (%ld)\n",i);}
      return TKCOMMAND;
     }
    }
@@ -205,25 +205,25 @@ data.cmdindex = -1;
 }
 
 
-"+"|"-"|"*"|"/"|"^"	{ 
-if(data.Debug>0){printf("Found operator %s\n", yytext);} 
-return ((int) yytext[0]); 
+"+"|"-"|"*"|"/"|"^"	{
+if(data.Debug>0){printf("Found operator %s\n", yytext);}
+return ((int) yytext[0]);
 }
 
-"("|")"		{ 
-if(data.Debug>0){printf("Found parenthese %s\n", yytext);} 
-return ((int) yytext[0]); 
+"("|")"		{
+if(data.Debug>0){printf("Found parenthese %s\n", yytext);}
+return ((int) yytext[0]);
 }
 
 ","	{
-if(data.Debug>0){printf("Found coma %s\n", yytext);} 
-return ((int) yytext[0]); 
+if(data.Debug>0){printf("Found coma %s\n", yytext);}
+return ((int) yytext[0]);
 }
 
 
-"="	{ 
-if(data.Debug>0){printf("Found equal %s\n", yytext);} 
-return ((int) yytext[0]); 
+"="	{
+if(data.Debug>0){printf("Found equal %s\n", yytext);}
+return ((int) yytext[0]);
 }
 
 
@@ -233,5 +233,3 @@ return ((int) yytext[0]);
 
 .	printf("Unrecognized character: %s\n", yytext);
 %%
-
-
diff --git a/src/CommandLineInterface/cmdsettings.h b/src/CommandLineInterface/cmdsettings.h
index b6c1da41..905b45fa 100644
--- a/src/CommandLineInterface/cmdsettings.h
+++ b/src/CommandLineInterface/cmdsettings.h
@@ -2,15 +2,12 @@
 #ifndef CMDSETTINGS_H
 #define CMDSETTINGS_H
 
-
 // command supports FPS mode
-#define CLICMDFLAG_FPS      0x00000001
+#define CLICMDFLAG_FPS 0x00000001
 
 // processinfo enabled
 #define CLICMDFLAG_PROCINFO 0x00000002
 
-
-
 // Function attributes
 // These values are copied to processinfo upon function startup
 typedef struct
@@ -20,13 +17,13 @@ typedef struct
     long procinfo_loopcntMax;
 
     // triggering
-    int  triggermode;
+    int triggermode;
     char triggerstreamname[STRINGMAXLEN_IMAGE_NAME];
     struct timespec triggerdelay;
     struct timespec triggertimeout;
     int semindexrequested;
 
-    int RT_priority;    // -1 if unused. 0-99 for higher priority
+    int RT_priority; // -1 if unused. 0-99 for higher priority
     cpu_set_t CPUmask;
 
     int procinfo_MeasureTiming;
diff --git a/src/CommandLineInterface/doc/CLI_Overview.md b/src/CommandLineInterface/doc/CLI_Overview.md
index 24136480..f65cc2dd 100644
--- a/src/CommandLineInterface/doc/CLI_Overview.md
+++ b/src/CommandLineInterface/doc/CLI_Overview.md
@@ -7,4 +7,3 @@ The entire C code is compiled into a single executable :
 Running the executable starts a command line interface (CLI) prompt from which all functions can be launched.
 
 The source code is organized in modules. A module included C code and documentation. It may also include data files and extended documentation. Run `m?` in the CLI prompt to list modules.
- 
diff --git a/src/CommandLineInterface/doc/CLIcore.md b/src/CommandLineInterface/doc/CLIcore.md
index 44e804c9..267419c3 100644
--- a/src/CommandLineInterface/doc/CLIcore.md
+++ b/src/CommandLineInterface/doc/CLIcore.md
@@ -1,22 +1,22 @@
-# Command Line Interface Syntax {#page_command_line_interface}  
+# Command Line Interface Syntax {#page_command_line_interface}
 
 Files CLIcore.c and CLIcore.h contain the source code for the command line interpreter (CLI)
 
 ## COMMAND LINE OPTIONS
 
 \verbatim
-  -h, --help 
+  -h, --help
 	print this message and exit
   -i, --info
 	Print version, settings, info and exit
   -j, --journal
-	keeps journal of commands - TO BE IMPLEMENTED 
+	keeps journal of commands - TO BE IMPLEMENTED
 	Write all commands to file "cfits_cmdlog.txt" as they are entered
   --verbose
 	be verbose
   -d, --debug=DEBUGLEVEL
 	Set debug level at startup
-  -o, --overwrite 
+  -o, --overwrite
 	Automatically overwrite files if necessary (USE WITH CAUTION - WILL OVERWRITE EXISTING FITS FILES)
   -l
 	Keeps a list of images in file imlist.txt
@@ -61,7 +61,7 @@ Tab completion is provided and behaves as follows:
 
 GNU readline used to read input. See GNU readline documentation on http://tiswww.case.edu/php/chet/readline/rltop.html. For a quick help on readline input, type:
 \verbatim
-> helprl 
+> helprl
 \endverbatim
 
 The command line interpreter (CLI) will take input from file cmdfile.txt if it exists. If file cmdfile.txt exists commands will be read one by one from top to bottom, and will be removed from the file as they are read, until the file is empty
@@ -71,21 +71,21 @@ The command line interpreter (CLI) will take input from file cmdfile.txt if it e
 
 \verbatim
 > ?
-> help			     
+> help
 	# print this help file
-> helprl		     
+> helprl
 	# print readline quick help
-> lm?                        
+> lm?
 	# list all modules loaded
-> m? <module>               
+> m? <module>
 	# list all commands for a module
-> m?                    
+> m?
 	# perform m? on all modules loaded
-> cmd? <command>              
+> cmd? <command>
 	# command description for <command>
-> cmd?                    
+> cmd?
 	# command description for all commands
-> h? str                    
+> h? str
 	# search for string <str> in all commands and their descriptions
 \endverbatim
 
@@ -95,20 +95,20 @@ The command line interpreter (CLI) will take input from file cmdfile.txt if it e
 \verbatim
 > ci
 	# compilation time and memory usage
-> listim 
+> listim
 	# list all images in memory
-> listimf <filename> 
+> listimf <filename>
 	# list all images in memory and write output to file <filename>
-> !<syscommand>             
+> !<syscommand>
 	# execute system command
-> showhist                  
+> showhist
 	# prints history of all commands
-> quit                      
+> quit
 	# exit Cfits (exit also works)
 
-> setdp <val> 		     
+> setdp <val>
 	# set default precision to float (<val> = 0) or double (<val> = 1)
-> creaim <im> <xs> <ys>     
+> creaim <im> <xs> <ys>
 	# creates a 2D image named <im>, size = <xs> x <ys> pixels
 \endverbatim
 
@@ -119,30 +119,30 @@ FITSIO is used for FITS files I/O, see FITSIO documentation for more detailed in
 ## LOADING FILES
 
 \verbatim
-> loadfits <fname> <imname> 
+> loadfits <fname> <imname>
 	# load FITS file <fname> into image <imname>
-> loadfits im1.fits imf1    
+> loadfits im1.fits imf1
 	# load file im1.fits in memory with name imf1
-> loadfits im1.fits	     
+> loadfits im1.fits
 	# load file im1.fits in memory with name im1 (default name is composed of all chars before first ".")
-> loadfits im1.fits.gz im1  
+> loadfits im1.fits.gz im1
 	# load compressed file
 \endverbatim
 
 ## SAVING FILES
 
 \verbatim
-> save_fl  <imname> <fname> 
+> save_fl  <imname> <fname>
 	# save image <imname> into FITS file <fname> (float)
-> save_fl im1 imf1.fits      
+> save_fl im1 imf1.fits
 	# write image im1 to disk file imf1.fits
 > save_fl im1
 	# write image im1 to disk file im1.fits (default file name = image name + ".fits")
-> save_fl im1 "!im1.fits"   
+> save_fl im1 "!im1.fits"
 	# overwrite file im1.fits if it exists
 > save_fl im1 "../dir2/im1.fits"
 	# specify full path
-> save_fl im1 im1.fits.gz   
+> save_fl im1 im1.fits.gz
 	# save compressed image
 \endverbatim
 
@@ -172,15 +172,6 @@ If you start Cfits with the "-l" option,  the file "imlist.txt" contains the lis
 # ARITHMETIC OPERATIONS
 
 \verbatim
-> im1=sqrt(im+2.0)          
+> im1=sqrt(im+2.0)
 	# will perform an arithmetic operation on image im and store the result in image im1
 \endverbatim
-
-
-
-
-
-
-
-
-
diff --git a/src/CommandLineInterface/doc/DocumentingCode.md b/src/CommandLineInterface/doc/DocumentingCode.md
index 1faf3469..3ab3bb6d 100644
--- a/src/CommandLineInterface/doc/DocumentingCode.md
+++ b/src/CommandLineInterface/doc/DocumentingCode.md
@@ -31,7 +31,7 @@ Documentation is built by doxygen and written in the ./dochtml/html directory.
 
 
  To set it up on you local repo, follow these steps AFTER having cloned the repo.
-	
+
 @verbatim
 mkdir dochtml
 mkdir dochtml/html
@@ -60,11 +60,11 @@ git checkout -b gh-pages
 # remove other branch(es)
 git branch -d master
 # remove files to start from clean state. Change file list as needed
-git rm -r src doc config configure.ac LICENSE Makefile.am 
+git rm -r src doc config configure.ac LICENSE Makefile.am
 cd ../..
 @endverbatim
 
---- 
+---
 
 
 ## 1.2. Updating documentation {#documentation_updating}
@@ -215,8 +215,6 @@ Tags **defgroup** and **ingroup** are used to group functions in modules.
 See for example, in function_parameters.c :
 
 @verbatim
- * @defgroup FPSconf Configuration function for Function Parameter Structure (FPS) 
+ * @defgroup FPSconf Configuration function for Function Parameter Structure (FPS)
  * @defgroup FPSrun  Run function using Function Parameter Structure (FPS)
 @endverbatim
-
-
diff --git a/src/CommandLineInterface/doc/DownloadCompile.md b/src/CommandLineInterface/doc/DownloadCompile.md
index d73dc76d..d710e93a 100644
--- a/src/CommandLineInterface/doc/DownloadCompile.md
+++ b/src/CommandLineInterface/doc/DownloadCompile.md
@@ -83,12 +83,12 @@ Install above libraries (Ubuntu):
 For reading and writing FITS image files
 
 - Visit https://heasarc.gsfc.nasa.gov/fitsio/fitsio.html and download the file Unix .tar file cfitsio3410.tar.gz
-- Extract it , README , install it 
+- Extract it , README , install it
 There is the fitsio.h in it. Move it to usr :
 
 		./configure --prefix=/usr
-		make 
-		sudo make install 
+		make
+		sudo make install
 
 
 ## 2.3. GPU acceleration (optional, but highly recommended) {#page_installation_details_gpuacceleration}
@@ -160,6 +160,3 @@ Additionally, each version may have its own independent shared memory space for
 @verbatim
 MILK_SHM_DIR=/milk-2/shm LD_LIBRARY_PATH=/usr/local/milk-2/lib PATH=/usr/local/milk-2/bin milk
 @endverbatim
-
-
-
diff --git a/src/CommandLineInterface/doc/FunctionParameterStructure.md b/src/CommandLineInterface/doc/FunctionParameterStructure.md
index 5e3d4c92..bd6311ef 100644
--- a/src/CommandLineInterface/doc/FunctionParameterStructure.md
+++ b/src/CommandLineInterface/doc/FunctionParameterStructure.md
@@ -48,7 +48,7 @@ Examples:
 	myfps                        # simple name, no optional integers
 	myfps-000000                 # optional integer 000000
 	myfps-000043-000020-000002   # 3 optional integers
-	
+
 @warning The FPS name does not need to match the process or function name. FPS name is specified in the CLI function as described in @ref page_FunctionParameterStructure_WritingCLIfunc.
 
 
@@ -57,7 +57,7 @@ Examples:
 
 name                                  | Type           | Description        | Origin
 --------------------------------------|----------------|--------------------|---------------------------------
-/tmp/<fpsname>.fps.shm                | shared memory  | FP structure       | Created by FPS init function 
+/tmp/<fpsname>.fps.shm                | shared memory  | FP structure       | Created by FPS init function
 ./fpscmd/<fpsnameroot>-confinit       | script         | Initialize FPS     | Built by fpsmkcmd, can be user-edited
 ./fpscmd/<fpsnameroot>-confstart      | script         | Start CONF process | Built by fpsmkcmd, can be user-edited
 ./fpscmd/<fpsnameroot>-runstart       | script         | Start RUN process  | Built by fpsmkcmd, can be user-edited
@@ -71,7 +71,7 @@ name                                  | Type           | Description        | Or
 
 
 
-	
+
 
 
 
@@ -81,7 +81,7 @@ name                                  | Type           | Description        | Or
 Main steps to enable FPS-enabled function for fpsCTRL:
 
 - Add entry in ./fpslist.txt
-- Run milk-fpsmkcmd 
+- Run milk-fpsmkcmd
 - Run ./fpscmd/<fpsname>-confinit
 
 These steps should ideally performed by a setup script.
@@ -104,10 +104,10 @@ fpsrootname1	CLIcommand1		optarg00	optarg01
 FPS command scripts are built by
 
 	$ fpsmkcmd
-	
+
 The command will create the FPS command scripts in directory `./fpscmd/`, which are then called by the @ref page_FunctionParameterStructure_fpsCTRL to control the CONF and RUN processes.
 
-	
+
 
 ## 2.2. fpsCTRL tool {#page_FunctionParameterStructure_fpsCTRL}
 
@@ -125,7 +125,7 @@ The FPS control tool is started from the command line :
 
 A single CLI function, named <functionname>_cli, will take the following arguments:
 - arg1: A command code
-- arg2+: Optional arguments 
+- arg2+: Optional arguments
 
 The command code is a string, and will determine the action to be executed:
 - `_FPSINIT_`  : Initialize FPS for the function
@@ -133,12 +133,12 @@ The command code is a string, and will determine the action to be executed:
 - `_CONFSTOP_`  : Stop the FPS configuration process
 - `_RUNSTART_`  : Start the run process
 - `_RUNSTOP_`   : Stop the run process
- 
- 
- 
+
+
+
 @note Why Optional arguments to CLI function ?
 @note Multiple instances of a C function may need to be running, each with its own FPS. Optional arguments provides a mechanism to differentiate the FPSs. They are appended to the FPS name following a dash. Optional arguments can be a number (usually integer) or a string.
- 
+
 
 Example source code below.
 
@@ -151,8 +151,8 @@ errno_t ExampleFunction_cli()
     // default FPS name will be used if CLI process has NOT been named
     // see code in function_parameter.c for detailed rules
     function_parameter_getFPSname_from_CLIfunc("measlinRM");
-	
-	if(data.FPS_CMDCODE != 0) {	// use FPS implementation	
+
+	if(data.FPS_CMDCODE != 0) {	// use FPS implementation
 		// set pointers to CONF and RUN functions
 		data.FPS_CONFfunc = ExampleFunction_FPCONF;
 		data.FPS_RUNfunc  = ExampleFunction_RUN;
@@ -164,7 +164,7 @@ errno_t ExampleFunction_cli()
     // call non FPS implementation - all parameters specified at function launch
     if(
         CLI_checkarg(1, 1) +
-        CLI_checkarg(2, 2) 
+        CLI_checkarg(2, 2)
         == 0) {
         ExampleFunction(
             data.cmdargtoken[1].val.numf,
@@ -191,7 +191,7 @@ errno_t ExampleFunction_cli()
 errno_t ExampleFunction_FPCONF();
 errno_t ExampleFunction_RUN();
 errno_t ExampleFunction(long arg0num, long arg1num, long arg2num, long arg3num);
-~~~~ 
+~~~~
 
 
 
@@ -201,7 +201,7 @@ errno_t ExampleFunction(long arg0num, long arg1num, long arg2num, long arg3num);
 
 Check function_parameters.h for full list of flags.
 
-~~~~{.c} 
+~~~~{.c}
 
 
 //
@@ -336,7 +336,7 @@ errno_t ExampleFunction_FPCONF(
 
 
 
-~~~~	
+~~~~
 
 
 
@@ -349,7 +349,7 @@ errno_t ExampleFunction_FPCONF(
 # 6. Writing RUN function (in source .c file) {#page_FunctionParameterStructure_WritingRUNfunc}
 
 
-The RUN function will connect to the FPS and execute the run loop. 
+The RUN function will connect to the FPS and execute the run loop.
 
 ## 6.1. A simple _RUN example {#page_FunctionParameterStructure_WritingRUNfunc_simple}
 
@@ -366,14 +366,14 @@ errno_t ExampleFunction_RUN(
 	// ===========================
 	FPS_CONNECT(data.FPS_name, FPSCONNECT_RUN );
 
-	
-	
+
+
 	// ===============================
 	// GET FUNCTION PARAMETER VALUES
 	// ===============================
 
 	// parameters are addressed by their tag name
-		
+
 	// These parameters are read once, before running the loop
 	//
 	int param01 = functionparameter_GetParamValue_INT64(&fps, ".param01");
@@ -390,12 +390,12 @@ errno_t ExampleFunction_RUN(
 
 	char imsname[FUNCTION_PARAMETER_STRMAXLEN];
 	strncpy(imsname, functionparameter_GetParamPtr_STRING(&fps, ".option.imname"), FUNCTION_PARAMETER_STRMAXLEN);
-	
+
 
 	// connect to WFS image
     	long IDim = read_sharedmem_image(imsname);
-	
-	
+
+
 	// ===============================
 	// RUN LOOP
 	// ===============================
@@ -405,12 +405,12 @@ errno_t ExampleFunction_RUN(
 	{
 		// here we compute what we need...
 		//
-		
-		
+
+
 		// Note that some mechanism is required to set loopOK to 0 when MyFunction_Stop() is called
 		// This can use a separate shared memory path
 	}
-	
+
 	function_parameter_RUNexit( &fps );
 	return RETURN_SUCCESS;
 }
@@ -421,16 +421,16 @@ errno_t ExampleFunction_RUN(
 
 ~~~{.c}
 errno_t ExampleFunction(
-    long arg0num, 
-    long arg1num, 
-    long arg2num, 
+    long arg0num,
+    long arg1num,
+    long arg2num,
     long arg3num
 ) {
     char fpsname[200];
-    
+
     long pindex = (long) getpid();  // index used to differentiate multiple calls to function
     // if we don't have anything more informative, we use PID
-    
+
     FUNCTION_PARAMETER_STRUCT fps;
 
     // create FPS
@@ -479,7 +479,7 @@ The example also shows using FPS to set the process realtime priority.
  *
  *
  * All function parameters are held inside the function parameter structure (FPS).\n
- * 
+ *
  *
  * ## Details
  *
@@ -489,16 +489,16 @@ errno_t MyFunction_RUN(
 )
 {
 	// ===========================
-	// ### Connect to FPS 
+	// ### Connect to FPS
 	// ===========================
 	FPS_CONNECT( data.FPS_name, FPSCONNECT_RUN );
-	
-	
-	// ===================================	
+
+
+	// ===================================
 	// ### GET FUNCTION PARAMETER VALUES
 	// ===================================
 	// parameters are addressed by their tag name
-	
+
 	// These parameters are read once, before running the loop
 	//
 	int param01 = functionparameter_GetParamValue_INT64(&fps, ".param01");
@@ -517,7 +517,7 @@ errno_t MyFunction_RUN(
 
 
 	// ===========================
-	// ### processinfo support 
+	// ### processinfo support
 	// ===========================
 
     PROCESSINFO *processinfo;
@@ -530,7 +530,7 @@ errno_t MyFunction_RUN(
         );
 
 	// OPTIONAL SETTINGS
-    processinfo->MeasureTiming = 1; // Measure timing 
+    processinfo->MeasureTiming = 1; // Measure timing
     processinfo->RT_priority = 20;  // RT_priority, 0-99. Larger number = higher priority. If <0, ignore
     processinfo->loopcntMax = 1000; // max number of iterations. -1 if infinite
 
@@ -557,38 +557,38 @@ errno_t MyFunction_RUN(
 	// ### Start loop
 	// ===========================
 
-    
+
     processinfo_loopstart(processinfo); // Notify processinfo that we are entering loop
 
     while(loopOK==1)
     {
 	    loopOK = processinfo_loopstep(processinfo);
-     
-     
+
+
         //
-        // Semaphore wait goes here  
+        // Semaphore wait goes here
         // computation starts here
-       
-        
-        
-        processinfo_exec_start(processinfo);    
+
+
+
+        processinfo_exec_start(processinfo);
         if(processinfo_compute_status(processinfo)==1)
         {
             //
 		    // computation ....
 		    //
         }
-  
-  
-        // Post semaphore(s) and counter(s) 
+
+
+        // Post semaphore(s) and counter(s)
         // computation done
-        
+
         // process signals, increment loop counter
         processinfo_exec_end(processinfo);
-    
-    
+
+
         // OPTIONAL: MESSAGE WHILE LOOP RUNNING
-        processinfo_WriteMessage(processinfo, "loop running fine");		
+        processinfo_WriteMessage(processinfo, "loop running fine");
 	}
 
 
@@ -598,7 +598,7 @@ errno_t MyFunction_RUN(
 
      processinfo_cleanExit(processinfo);
 	function_parameter_RUNexit( &fps  );
-    
+
 	return RETURN_SUCCESS;
 }
 ~~~~
@@ -606,8 +606,3 @@ errno_t MyFunction_RUN(
 
 
 ----
-
-
-
-
-
diff --git a/src/CommandLineInterface/doc/LoadingModules.md b/src/CommandLineInterface/doc/LoadingModules.md
index a2cad65c..6611c5ad 100644
--- a/src/CommandLineInterface/doc/LoadingModules.md
+++ b/src/CommandLineInterface/doc/LoadingModules.md
@@ -19,7 +19,7 @@ Users can create additional modules, and following a few milk-specific conventio
 # 1. Overview {#page_LoadingModules_overview}
 
 
-milk is oganized in modules, each compiled as a shared object and loaded at runtime. 
+milk is oganized in modules, each compiled as a shared object and loaded at runtime.
 
 ## 1.1. Compiling {#page_LoadingModules_overview_compiling}
 
@@ -28,16 +28,16 @@ While milk comes with its own set of modules, others can be added at runtime. Mo
 	# execute these commands from the source root directory (for example ~./milk/)
 	# move to source subdir, where module directories are located
 	$ cd ./src
-	
+
 	# Download a new module
 	$ git clone https://github.com/milk-org/NewModuleName
-	
+
 	# move to build directory
 	$ cd ../_build
-	
+
 	# Add new module to compile script
 	$ cmake .. -DEXTRAMODULES="NewModuleName"
-	
+
 	# compile and install
 	$ sudo make install
 
@@ -48,10 +48,10 @@ Note that the commands above will compile the module into a shared object, but i
 
 	# start milk
 	$ milk
-	
+
 	# load module from command line interface
-	milk> mload NewModuleName 
-	
+	milk> mload NewModuleName
+
 	# check list of modules. NewModuleName should appear
 	milk> m?
 
@@ -80,17 +80,17 @@ Lets run it :
 
 	# start milk
 	$ milk
-	
+
 	# load module as "mex" (short for module example)
 	milk> mloadas milk_module_example mex
-	
+
 	# check we have it
 	milk> m?
-	
+
 	# run the test function, which creates an image
 	# note you can tab complete after typying "mex." to list functions
 	milk> mex.func1 im1 1.2
-	
+
 	# check the image is in memory
 	milk> listim
 
@@ -122,16 +122,16 @@ Provided that the module follows milk conventions, linking the module will add t
 
 	milk> m?                # lists linked modules
 	milk> m? <modulename>   # lists CLI commands in the module
-	
 
-	
+
+
 ## 2.3. Linking module from within CLI with mload {#page_LoadingModules_linking_mload}
 
 By default, modules shared objects are installed in `/usr/local/lib`, and are named `lib<ModuleName>.so`. With these assumptions satisfied, modules can be linked from within the CLI with the `mload` command:
 
 	milk> mload <modulename>
 
-Alternatively, a short name can be specified 
+Alternatively, a short name can be specified
 
 	milk> mloadas <modulename> <shortname>
 
@@ -146,7 +146,7 @@ Module functions are called from the command line interface prompt:
 Upon startup, milk will read the CLI_ADD_LIBS environment variable to link shared objects. For example:
 
 	CLI_ADD_LIBS="/usr/local/libs/libMyFirstModule.so /usr/local/libs/libMySecondModule.so" milk
-	
+
 will link modules `MyFirstModule` and `MySecondModule`.
 
 @note Shared object names can be separated by space, semicolumn, or comma.
@@ -166,7 +166,7 @@ will link modules `MyFirstModule` and `MySecondModule`.
 
 Modules that are always loaded upon startup are explicitely listed in CLImain.c. Additional modules may be loaded using the C dlopen() command. The library should include a function `initlib_<modulename>` to be executed when the module is loaded. This function should register functions to the command line interface, as done for all other modules that are part of the distribution.
 
-\see http://www.linux-mag.com/id/1028/ for instructions to create shared libraries that can be loaded as modules. 
+\see http://www.linux-mag.com/id/1028/ for instructions to create shared libraries that can be loaded as modules.
 \see https://www.gnu.org/software/automake/manual/html_node/Libtool-Convenience-Libraries.html
 
 
@@ -196,7 +196,7 @@ will compile modules `WFpropagate` and `OpticsMaterials` in addition to default
 
 Several options are available to have the additional module(s) automatically loaded every time:
 
-- Copy or link the shared object to the `./lib/` directory (see @ref page_LoadingModules_linking_libdir). 
+- Copy or link the shared object to the `./lib/` directory (see @ref page_LoadingModules_linking_libdir).
 
 For example:
 
@@ -213,7 +213,7 @@ For example:
 
 ## 3.4. Adding new module to github {#page_LoadingModules_compiling_addingmodulegithub}
 
-We assume here that you have created a module and you would like to push it to the main github package org (we assume here milk-org). 
+We assume here that you have created a module and you would like to push it to the main github package org (we assume here milk-org).
 
 	# First, create the repo in github, then run the following commands:
 	cd ./MyModuleName/
@@ -242,7 +242,7 @@ To compile a custom module :
 	gcc -c -I.. -fPIC exampleModule.c
 	gcc -c -fPIC compute_pi.c -Ofast
 	gcc -shared -I.. -fPIC exampleModule.o compute_pi.o -o libexamplemodule.so -lc
-	
+
 To load the new modules automatically on milk startup, create a sym link in the milk's lib directory:
 
 	cd ~/src/milk/lib
@@ -251,9 +251,7 @@ To load the new modules automatically on milk startup, create a sym link in the
 Alternatively, you can load it from the CLI at anytime:
 
 	milk > soload "<pathtomilk>/src/exampleModule/libexamplemodule.so"
-	
-
 
----
 
 
+---
diff --git a/src/CommandLineInterface/doc/ModuleFiles.md b/src/CommandLineInterface/doc/ModuleFiles.md
index 00fa8990..fedff417 100644
--- a/src/CommandLineInterface/doc/ModuleFiles.md
+++ b/src/CommandLineInterface/doc/ModuleFiles.md
@@ -20,5 +20,3 @@ The code is arranged in modules. Source code, documentation and additional files
 
 
 Modules are compiled to object files, stored in ./libs/ (static and shared objects).
-
-
diff --git a/src/CommandLineInterface/doc/ProcessInfoStructure.md b/src/CommandLineInterface/doc/ProcessInfoStructure.md
index 1d562079..74048d35 100644
--- a/src/CommandLineInterface/doc/ProcessInfoStructure.md
+++ b/src/CommandLineInterface/doc/ProcessInfoStructure.md
@@ -22,7 +22,7 @@
 The PiS is stored in shared memory as
 
 	proc.<shortname>.<PID>.shm
-	
+
 
 
 ---
@@ -55,7 +55,7 @@ int functiontemplate_usingprocessinfo() {
         );
 
 	// OPTIONAL SETTINGS
-    processinfo->MeasureTiming = 1; // Measure timing 
+    processinfo->MeasureTiming = 1; // Measure timing
     processinfo->RT_priority = 20;  // RT_priority, 0-99. Larger number = higher priority. If <0, ignore
     processinfo->loopcntMax = 100;  // -1 if infinite loop
 
@@ -81,40 +81,40 @@ int functiontemplate_usingprocessinfo() {
     // ==================================
     // STARTING LOOP
     // ==================================
-    
+
     processinfo_loopstart(processinfo); // Notify processinfo that we are entering loop
 
-    
+
     while(loopOK==1)
     {
 	    loopOK = processinfo_loopstep(processinfo);
-     
-     
+
+
         //
-        // Semaphore wait goes here  
+        // Semaphore wait goes here
         // computation starts here
-       
-        
-        
-        processinfo_exec_start(processinfo);    
+
+
+
+        processinfo_exec_start(processinfo);
         if(processinfo_compute_status(processinfo)==1)
         {
             //
 		    // computation ....
 		    //
         }
-  
-  
-        // Post semaphore(s) and counter(s) 
+
+
+        // Post semaphore(s) and counter(s)
         // computation done
-        
+
         // process signals, increment loop counter
         processinfo_exec_end(processinfo);
-    
-    
+
+
         // OPTIONAL: MESSAGE WHILE LOOP RUNNING
         processinfo_WriteMessage(processinfo, "loop running fine");
-    }   
+    }
 
 
 
@@ -130,7 +130,3 @@ int functiontemplate_usingprocessinfo() {
 
 
 ----
-
-
-
-
diff --git a/src/CommandLineInterface/doc/TemplateSourceCode.md b/src/CommandLineInterface/doc/TemplateSourceCode.md
index 46dba62e..8c08a001 100644
--- a/src/CommandLineInterface/doc/TemplateSourceCode.md
+++ b/src/CommandLineInterface/doc/TemplateSourceCode.md
@@ -5,15 +5,13 @@ Documentation should appear before each function in the .c and .h files, followi
 
 ## .h file
 
-<a href="../src/CommandLineInterface/doc/templatemodule/templatemodule.h">Download templatemodule.h</a> 
+<a href="../src/CommandLineInterface/doc/templatemodule/templatemodule.h">Download templatemodule.h</a>
 
 See corresponding doxygen documentation : templatemodule/templatemodule.h
 
 
 ## .c file
 
-<a href="../src/CommandLineInterface/doc/templatemodule/templatemodule.c">Download templatemodule.c</a> 
+<a href="../src/CommandLineInterface/doc/templatemodule/templatemodule.c">Download templatemodule.c</a>
 
 See corresponding doxygen documentation : templatemodule/templatemodule.c
-
-
diff --git a/src/CommandLineInterface/doc/UserInput.md b/src/CommandLineInterface/doc/UserInput.md
index 0d61edf9..ab4d71ba 100644
--- a/src/CommandLineInterface/doc/UserInput.md
+++ b/src/CommandLineInterface/doc/UserInput.md
@@ -5,8 +5,3 @@
 @subpage page_readlinekeys
 
 @subpage page_command_line_interface
-
-
-
-
-
diff --git a/src/CommandLineInterface/doc/WorkingWithGit.md b/src/CommandLineInterface/doc/WorkingWithGit.md
index 0d1d1ef3..76869f64 100644
--- a/src/CommandLineInterface/doc/WorkingWithGit.md
+++ b/src/CommandLineInterface/doc/WorkingWithGit.md
@@ -39,12 +39,12 @@ When developing, work in dev branch and set branch to dev in all submodules and
 	$ git checkout dev
 	$ git pull
 	$ git push
-	
+
 
 ## 1.3. Updating master branches {#page_WorkingWithGit_SourceCodeAndModules_UpdatingMaster}
 
 To synchronize master to latest dev:
-	
+
 	$ git submodule foreach "(git checkout master; git merge dev)"
 	$ git checkout master
 	$ git merge dev
@@ -84,7 +84,7 @@ Documentation tree can be locally built on dev branch with doxygen from main dir
 	$ git checkout dev
 	$ doxygen
 
-To push it on the origin :	
+To push it on the origin :
 
 	$ cd dochtml/html
 	$ git add *
@@ -93,5 +93,3 @@ To push it on the origin :
 
 
 @note When switching branches, you may get an error message "The following untracked working tree files would be overwritten by checkout" preventing branch switch. If the error only lists files in the html directory, you can safely use the -f option to force branch change.
-
-
diff --git a/src/CommandLineInterface/doc/coding_standards.md b/src/CommandLineInterface/doc/coding_standards.md
index feebc9af..c9eaa037 100644
--- a/src/CommandLineInterface/doc/coding_standards.md
+++ b/src/CommandLineInterface/doc/coding_standards.md
@@ -12,4 +12,3 @@
 - @subpage page_ProcessInfoStructure
 - @subpage page_FunctionParameterStructure
 - @subpage page_exampleBASHscript
-
diff --git a/src/CommandLineInterface/doc/help.txt b/src/CommandLineInterface/doc/help.txt
index 556c3933..9af2797d 100644
--- a/src/CommandLineInterface/doc/help.txt
+++ b/src/CommandLineInterface/doc/help.txt
@@ -3,7 +3,7 @@
 -----------------------------------------------------------------------------------
 COMMAND LINE OPTIONS
 
-  -h, --help 
+  -h, --help
 	print this message and exit
   -i, --info
 	Print version, settings, info and exit
@@ -11,12 +11,12 @@ COMMAND LINE OPTIONS
 	be verbose
   -d, --debug=DEBUGLEVEL
 	Set debug level at startup
-  -o, --overwrite         
+  -o, --overwrite
 	Automatically overwrite files if necessary (USE WITH CAUTION - WILL OVERWRITE EXISTING FITS FILES)
   -e, --idle
 	Only run process when X is idle (WARNING: PREVENTS INTERACTIVE USER INPUT)
 	Requires script runidle
-  --listimfile	  
+  --listimfile
 	Keeps a list of images in file imlist.txt
   -m, --mmon=TTYDEVICE
 	open memory monitor on tty device
@@ -41,7 +41,7 @@ COMMAND LINE OPTIONS
 
 -----------------------------------------------------------------------------------
 ENVIRONMENT VARIABLES
-  
+
   MILKCLI_APPNAME   Application name, displayed in prompt
   MILKCLI_ADD_LIBS  Shared libraries to be loaded upon startup
   MILK_QUIET        Quiet mode (non-verbose) if set
@@ -66,7 +66,7 @@ Tab completion is provided and behaves as follows:
 INPUT
 
 GNU readline used to read input. See GNU readline documentation on http://tiswww.case.edu/php/chet/readline/rltop.html. For a quick help on readline input, type:
-> helprl 
+> helprl
 
 The command line interpreter (CLI) will take input from file cmdfile.txt if it exists. If file cmdfile.txt exists commands will be read one by one from top to bottom, and will be removed from the file as they are read, until the file is empty
 
@@ -74,21 +74,21 @@ The command line interpreter (CLI) will take input from file cmdfile.txt if it e
 HELP COMMANDS
 
 > ?
-> help			     
+> help
 	# print this help file
-> helprl		     
+> helprl
 	# print readline quick help
-> lm?                        
+> lm?
 	# list all modules loaded
-> m? <module>               
+> m? <module>
 	# list all commands for a module
-> m?                    
+> m?
 	# perform m? on all modules loaded
-> cmd? <command>              
+> cmd? <command>
 	# command description for <command>
-> cmd?                    
+> cmd?
 	# command description for all commands
-> h? str                    
+> h? str
 	# search for string <str> in all commands and their descriptions
 
 -----------------------------------------------------------------------------------
@@ -96,17 +96,17 @@ IMPORTANT COMMANDS
 
 > ci
 	# compilation time and memory usage
-> listim                    
+> listim
 	# list all images in memory
-> listimf <filename>        
+> listimf <filename>
 	# list all images in memory and write output to file <filename>
-> !<syscommand>             
+> !<syscommand>
 	# execute system command
-> showhist                  
+> showhist
 	# prints history of all commands
-> quit                      
+> quit
 	# exit Cfits (exit also works)
-> creaim <im> <xs> <ys>     
+> creaim <im> <xs> <ys>
 	# creates a 2D image named <im>, size = <xs> x <ys> pixels
 
 -----------------------------------------------------------------------------------
@@ -116,28 +116,28 @@ FITSIO is used for FITS files I/O, see FITSIO documentation for more detailed in
 
 LOADING FILES
 
-> loadfits <fname> <imname> 
+> loadfits <fname> <imname>
 	# load FITS file <fname> into image <imname>
-> loadfits im1.fits imf1    
+> loadfits im1.fits imf1
 	# load file im1.fits in memory with name imf1
-> loadfits im1.fits	     
+> loadfits im1.fits
 	# load file im1.fits in memory with name im1 (default name is composed of all chars before first ".")
-> loadfits im1.fits.gz im1  
+> loadfits im1.fits.gz im1
 	# load compressed file
 
 SAVING FILES
 
-> savefits  <imname> <fname> 
-	# save image <imname> into FITS file <fname> 
-> savefits im1 imf1.fits      
+> savefits  <imname> <fname>
+	# save image <imname> into FITS file <fname>
+> savefits im1 imf1.fits
 	# write image im1 to disk file imf1.fits
 > savefits im1
 	# write image im1 to disk file im1.fits (default file name = image name + ".fits")
-> savefits im1 "!im1.fits"   
+> savefits im1 "!im1.fits"
 	# overwrite file im1.fits if it exists
 > savefits im1 "../dir2/im1.fits"
 	# specify full path
-> savefits im1 im1.fits.gz   
+> savefits im1 im1.fits.gz
 	# save compressed image
 
 -----------------------------------------------------------------------------------
@@ -149,11 +149,11 @@ You can control the executable through a named pipe (fifo), which is created by
 
 By default, the fifo is created in the local directory, with the name "clififo", to pipe commands into the command line interface. You can opt out of the fifo feature by adding the option --nofifo to the command line executable, or rename the fifo with the -f option :
 <executable> -f "/tmp/fifo145.txt"
-This will create a fifo named /tmp/fifo145.txt. 
+This will create a fifo named /tmp/fifo145.txt.
 
 Other programs can write to the fifo to issue commands to the executable, such as:
 cat myscript.txt > clififo
-More complex commands can be issued within the executable using the fifo. 
+More complex commands can be issued within the executable using the fifo.
 For example, to load all im*.fits files in memory, you can type within the executable:
 
 > !ls im*.fits | xargs -I {} echo loadfits {} >> clififo
@@ -170,8 +170,7 @@ Note that if you launch several instances of the executable in the same director
 -----------------------------------------------------------------------------------
 ARITHMETIC OPERATIONS
 
-> im1=sqrt(im+2.0)          
+> im1=sqrt(im+2.0)
 	# will perform an arithmetic operation on image im and store the result in image im1
 
 -----------------------------------------------------------------------------------
-
diff --git a/src/CommandLineInterface/doc/helpreadline.md b/src/CommandLineInterface/doc/helpreadline.md
index 67643a02..34ad379f 100644
--- a/src/CommandLineInterface/doc/helpreadline.md
+++ b/src/CommandLineInterface/doc/helpreadline.md
@@ -2,11 +2,11 @@
 
 
 The command line interface (CLI) uses readline to take input command for keyboard. Readline offers convenient bindings, listed in this page.
- 
+
 For more information, consult the readline library documentation.
 
 
-<pre> 
+<pre>
 
 READLINE QUICK HELP
 
@@ -15,34 +15,32 @@ Notations:
 C- is control key
 M- is meta key (if already bound to action, use ESC and then type the folling character)
 
-C-_ or C-x C-u    Undo the last editing command. You can undo all the way back to an empty line. 
+C-_ or C-x C-u    Undo the last editing command. You can undo all the way back to an empty line.
 C-a	    Move to the start of the line
 C-e         Move to the end of the line
-M-f         Move forward a word, where a word is composed of letters and digits. 
-M-b         Move backward a word. 
-C-l         Clear the screen, reprinting the current line at the top. 
+M-f         Move forward a word, where a word is composed of letters and digits.
+M-b         Move backward a word.
+C-l         Clear the screen, reprinting the current line at the top.
 
 C-k         Kill the text from the current cursor position to the end of the line.
-M-d         Kill from the cursor to the end of the current word, or, if between words, to the end of the next word. 
-M-DEL       Kill from the cursor the start of the current word, or, if between words, to the start of the previous 
+M-d         Kill from the cursor to the end of the current word, or, if between words, to the end of the next word.
+M-DEL       Kill from the cursor the start of the current word, or, if between words, to the start of the previous
 C-w         Kill from the cursor to the previous whitespace. This is different than M-DEL because the word boundaries differ.
 
 C-y         Yank the most recently killed text back into the buffer at the cursor.
-M-y         Rotate the kill-ring, and yank the new top. You can only do this if the prior command is C-y or ESC y. 
+M-y         Rotate the kill-ring, and yank the new top. You can only do this if the prior command is C-y or ESC y.
 
 M-<         Move to the first line in the history.
-M->         Move to the end of the input history, i.e., the line currently being entered. 
+M->         Move to the end of the input history, i.e., the line currently being entered.
 
 C-t	    Drag the character before the cursor forward over the character at the cursor, moving the cursor forward as well. If the insertion point is at the end of the line, then this transposes the last two characters of the line. Negative arguments have no effect.
 M-t	    Drag the word before point past the word after point, moving point past that word as well. If the insertion point is at the end of the line, this transposes the last two words on the line.
 M-u	    Uppercase the current (or following) word. With a negative argument, uppercase the previous word, but do not move the cursor.
 M-l	    Lowercase the current (or following) word. With a negative argument, lowercase the previous word, but do not move the cursor.
-M-c	    Capitalize the current (or following) word. With a negative argument, capitalize the previous word, but do not move the cursor. 
+M-c	    Capitalize the current (or following) word. With a negative argument, capitalize the previous word, but do not move the cursor.
 
 TAB         Attempt to perform completion on the text before point. The actual completion performed is application-specific. The default is filename completion.
 M-?         List the possible completions of the text before point.
-M-*         Insert all completions of the text before point that would have been generated by possible-completions. 
+M-*         Insert all completions of the text before point that would have been generated by possible-completions.
 
 </pre>
-
-
diff --git a/src/CommandLineInterface/doc/templatemodule/templatemodule.c b/src/CommandLineInterface/doc/templatemodule/templatemodule.c
index 23fb9cca..e2102e2b 100644
--- a/src/CommandLineInterface/doc/templatemodule/templatemodule.c
+++ b/src/CommandLineInterface/doc/templatemodule/templatemodule.c
@@ -5,12 +5,12 @@
  * Follow this template to write your C code
  * The template includes examples of frequently used coding practices
  * and doxygen-based documentation
- * 
+ *
  * Source code includes notes (comments):
  * - CODING STANDARD NOTE : note about coding practices and standards
  * - DOCUMENTATION NOTE : how to document code
- * 
- * 
+ *
+ *
  * ## Other files of interest
  * Each module should include :
  * - souce code (.c file)
@@ -19,21 +19,15 @@
  * ## Change log
  * - 20180120  Guyon   Added mode documentation
  * - 20170813  Guyon   Added some documentation
- * 
+ *
  * @author  O. Guyon
  *
  * @bug No known bugs.
  *
  */
 
-
 /** @defgroup RTfunctions Functions with high priority scheduler */
 
-
-
-
-
-
 /// CODING STANDARD NOTE: code indented by : bash -c "astyle --indent-classes -Y"
 
 /* =============================================================================================== */
@@ -48,25 +42,20 @@
 
 /// CODING STANDARD NOTE: document any unusual head file include
 
-#include <strangefile.h>     // module strangefile does strange things, which we need in this module
-
+#include <strangefile.h> // module strangefile does strange things, which we need in this module
 
 // frequently included
-#include <fitsio.h>
-#include "CLIcore.h"
 #include "00CORE/00CORE.h"
-#include "COREMOD_memory/COREMOD_memory.h"
+#include "CLIcore.h"
+#include "COREMOD_arith/COREMOD_arith.h"
 #include "COREMOD_iofits/COREMOD_iofits.h"
+#include "COREMOD_memory/COREMOD_memory.h"
 #include "COREMOD_tools/COREMOD_tools.h"
-#include "COREMOD_arith/COREMOD_arith.h"
-
-
+#include <fitsio.h>
 
 // CODING STANDARD NOTE: include function prototypes for this module
 #include "templatemodule/templatemodule.h"
 
-
-
 /* =============================================================================================== */
 /* =============================================================================================== */
 /*                                      DEFINES, MACROS                                            */
@@ -76,31 +65,26 @@
 // CODING STANDARD NOTE: start with defines
 // CODING STANDARD NOTE: #define constants should be in all CAPS
 // CODING STANDARD NOTE: do not use names starting or ending with "_" (reserved for system)
-#define TWOPLUSTWO	4
+#define TWOPLUSTWO 4
 #define NAME_STRING_MAXSIZE 100
 #define FNAME_STRING_MAXSIZE 200
 #define COMMAND_STRING_MAXSIZE 200
 
-
 // CODING STANDARD NOTE: list function macros after defines
 // CODING STANDARD NOTE: function macro start with module name when specific to current module
-#define ABS(x)                         (((x) < 0) ? -(x) : (x))
-#define EXAMPLEMODULE_MAX(a,b)         ((a < b) ?  (b) : (a))
+#define ABS(x) (((x) < 0) ? -(x) : (x))
+#define EXAMPLEMODULE_MAX(a, b) ((a < b) ? (b) : (a))
 
 // CODING STANDARD NOTE: list typedefs after function macros
 
 // CODING STANDARD NOTE: list enums after typedefs
 
-
-
-
 /* =============================================================================================== */
 /* =============================================================================================== */
 /*                                  GLOBAL DATA DECLARATION                                        */
 /* =============================================================================================== */
 /* =============================================================================================== */
 
-
 // CODING STANDARD NOTE: Function, typedef, and variable names, as well as struct, union, and enum tag names should be in lower case
 // CODING STANDARD NOTE:
 
@@ -110,10 +94,6 @@
 
 // static globals
 
-
-
-
-
 /* =============================================================================================== */
 /* =============================================================================================== */
 /*                           FUNCTIONS TIED TO COMMAND LINE INTERFACE (CLI)                        */
@@ -131,30 +111,32 @@
 // 2: long
 // 3: string, not existing image
 // 4: existing image
-// 5: string 
+// 5: string
 //
 
-
 // CODING STANDARD NOTE: CLI function name should be function name + "_cli", with no argument
-int_fast8_t templatemodule_examplefunction00_cli() {
-    if(CLI_checkarg(1,2)==0) {
+int_fast8_t templatemodule_examplefunction00_cli()
+{
+    if (CLI_checkarg(1, 2) == 0)
+    {
         templatemodule_examplefunction00(data.cmdargtoken[1].val.numl);
         return 0;
     }
-    else return 1;
+    else
+        return 1;
 }
 
-int_fast8_t templatemodule_examplefunction01_cli() {
-    if(CLI_checkarg(1,1)+CLI_checkarg(2,2)==0) {
+int_fast8_t templatemodule_examplefunction01_cli()
+{
+    if (CLI_checkarg(1, 1) + CLI_checkarg(2, 2) == 0)
+    {
         templatemodule_examplefunction01(data.cmdargtoken[1].val.numl, data.cmdargtoken[2].val.numf, NULL);
         return 0;
     }
-    else return 1;
+    else
+        return 1;
 }
 
-
-
-
 /* =============================================================================================== */
 /* =============================================================================================== */
 /*                                    MODULE INITIALIZATION                                        */
@@ -170,40 +152,24 @@ int_fast8_t init_templatemodule()
     strcpy(data.module[data.NBmodule].info, "AO loop control");
     data.NBmodule++;
 
+    // CODING STANDARD NOTE: follow this template to link function calls to the command line interface
+    // CODING STANDARD NOTE: arg1 : function name in command line
+    // CODING STANDARD NOTE: arg2 : module name (= __FILE__)
+    // CODING STANDARD NOTE: arg3 : C call
+    // CODING STANDARD NOTE: arg4 : one-line description
+    // CODING STANDARD NOTE: arg5 : arguments. <arg1 [type]> <arg2 [type]> ...
+    // CODING STANDARD NOTE: arg6 : example call from CLI
+    // CODING STANDARD NOTE: arg7 : C call syntax
 
-	// CODING STANDARD NOTE: follow this template to link function calls to the command line interface
-	// CODING STANDARD NOTE: arg1 : function name in command line
-	// CODING STANDARD NOTE: arg2 : module name (= __FILE__)
-	// CODING STANDARD NOTE: arg3 : C call
-	// CODING STANDARD NOTE: arg4 : one-line description
-	// CODING STANDARD NOTE: arg5 : arguments. <arg1 [type]> <arg2 [type]> ...
-	// CODING STANDARD NOTE: arg6 : example call from CLI
-	// CODING STANDARD NOTE: arg7 : C call syntax
-
-    RegisterCLIcommand("clicmdname", 
-                       __FILE__,
-                       templatemodule_examplefunction_cli,
-                       "function purpose",
-                       "<mode [int]>",
-                       "clicmdname 3",
-                       "int templatemodule_examplefunc(int mode)");
+    RegisterCLIcommand("clicmdname", __FILE__, templatemodule_examplefunction_cli, "function purpose", "<mode [int]>",
+                       "clicmdname 3", "int templatemodule_examplefunc(int mode)");
 
-	// CODING STANDARD NOTE: Link as many functions as desired
+    // CODING STANDARD NOTE: Link as many functions as desired
 
     // CODING STANDARD NOTE: Add atexit function(s) here (OPTIONAL)
     // atexit((void*) templatemodule_clearmem());
 }
 
-
-
-
-
-
-
-
-
-
-
 /* =============================================================================================== */
 /* =============================================================================================== */
 /*                                    FUNCTION(S) SOURCE CODE                                      */
@@ -211,47 +177,35 @@ int_fast8_t init_templatemodule()
 /* =============================================================================================== */
 /** @name TEMPLATEMODULE functions */
 
-
-
-
-
-
-
-
-
 /* =============================================================================================== */
 /* =============================================================================================== */
 /** @name TEMPLATEMODULE - 1. FIRST GROUP OF FUNCTIONS                                             */
 /* =============================================================================================== */
 /* =============================================================================================== */
 
-
-
-
-
 // CODING STANDARD NOTE: minimal required documentation for doxygen
 /**
  *  ## Purpose
- * 
+ *
  * This function does absolutely nothing useful
- * 
- * 
+ *
+ *
  * ## Arguments
- * 
+ *
  * @param[in]	mode
  * 		mode sets up what function does
  * -	does nothing
  * -	also does nothing
- * 
+ *
  */
 // CODING STANDARD NOTE: function name start with module name
-int templatemodule_examplefunc00(int mode) 
+int templatemodule_examplefunc00(int mode)
 {
     // CODING STANDARD NOTE: pointer qualifier '*' with variable rather than with the type
     float *farray;
-	
-	int return_value;
-	
+
+    int return_value;
+
     // CODING STANDARD NOTE: choose human-readable variable names
     // CODING STANDARD NOTE: unrelated declarations should be on separate lines
     long iipix, jjpix; // pixel coordinates
@@ -259,28 +213,26 @@ int templatemodule_examplefunc00(int mode)
     long NBiteration;
     long n2;
 
-	FILE *fp_test;
-	
+    FILE *fp_test;
+
+    farray = (float *)malloc(sizeof(float) * 10);
+    if (farray == NULL)
+        printERROR(__FILE__, __func__, __LINE__, "malloc returns zero value");
 
-	farray = (float*) malloc(sizeof(float)*10);
-	if(farray == NULL)
-		printERROR(__FILE__, __func__, __LINE__, "malloc returns zero value");
-	
-	
     // CODING STANDARD NOTE: how to write an infinite loop
     // CODING STANDARD NOTE: Do not write infinite loop with while statement
-    for(;;)
+    for (;;)
     {
         // infinite loop
     }
-	free(farray);
+    free(farray);
 
-	fp_test = fopen("testfile.log", "w");
-	if(fp_test == NULL)
-		printERROR(__FILE__, __func__, __LINE__, "Cannot open file testfile.log");
-	fclose(fp_test);
+    fp_test = fopen("testfile.log", "w");
+    if (fp_test == NULL)
+        printERROR(__FILE__, __func__, __LINE__, "Cannot open file testfile.log");
+    fclose(fp_test);
 
-    if(mode == 2)
+    if (mode == 2)
     {
         // CODING STANDARD NOTE: reduce variable scope as much as possible
         // CODING STANDARD NOTE: variables used inside code block declared at beginning of code block
@@ -292,33 +244,30 @@ int templatemodule_examplefunc00(int mode)
         // CODING STANDARD NOTE: 		printERROR(const char *file, const char *func, int line, char *errmessage)
         // CODING STANDARD NOTE: 		printWARNING(const char *file, const char *func, int line, char *warnmessage)
         // CODING STANDARD NOTE:  printERROR will exit code, printWARNING will issue warning and continue
-        if(sprintf(name, "image1", loop)<1)
+        if (sprintf(name, "image1", loop) < 1)
             printERROR(__FILE__, __func__, __LINE__, "sprintf wrote <1 char");
-        if(sprintf(command, "ls %s.fits", name) < 1)
+        if (sprintf(command, "ls %s.fits", name) < 1)
             printERROR(__FILE__, __func__, __LINE__, "sprintf wrote <1 char");
-        if(system(command) != 0)
-            printERROR(__FILE__,__func__,__LINE__, "system() returns non-zero value");
+        if (system(command) != 0)
+            printERROR(__FILE__, __func__, __LINE__, "system() returns non-zero value");
     }
 
-	fp_test = fopen("testfile.log", "r");
-	if(fp_test == NULL)
-		printERROR(__FILE__, __func__, __LINE__, "Cannot Read file testfile.log");
+    fp_test = fopen("testfile.log", "r");
+    if (fp_test == NULL)
+        printERROR(__FILE__, __func__, __LINE__, "Cannot Read file testfile.log");
 
-	// CODING STANDARD NOTE: include field width limits in fscanf and sscanf calls
-    if(fscanf(fp_test, "%8ld", &n2) != 1)
-		printERROR(__FILE__,__func__,__LINE__, "fscanf returns value != 1");
-	fclose(fp_test);
-
-	// CODING STANDARD NOTE: Other test prototypes:
-	// CODING STANDARD NOTE: if(fread(...) < 1) printERROR(__FILE__,__func__,__LINE__, "fread() returns <1 value");
+    // CODING STANDARD NOTE: include field width limits in fscanf and sscanf calls
+    if (fscanf(fp_test, "%8ld", &n2) != 1)
+        printERROR(__FILE__, __func__, __LINE__, "fscanf returns value != 1");
+    fclose(fp_test);
 
+    // CODING STANDARD NOTE: Other test prototypes:
+    // CODING STANDARD NOTE: if(fread(...) < 1) printERROR(__FILE__,__func__,__LINE__, "fread() returns <1 value");
 
     free(farray);
-    
-    return(0);
-}
-
 
+    return (0);
+}
 
 /* =============================================================================================== */
 /* =============================================================================================== */
@@ -326,99 +275,83 @@ int templatemodule_examplefunc00(int mode)
 /* =============================================================================================== */
 /* =============================================================================================== */
 
-
-
-
-
 /* =============================================================================================== */
 /** @name TEMPLATEMODULE - 2.1. SECOND GROUP OF FUNCTIONS - SUBGROUP1                              */
 /* =============================================================================================== */
 
-
-
 // DOCUMENTATION NOTE: put @brief statement in .h
 // DOCUMENTATION NOTE: put short argument description in .h
 // DOCUMENTATION NOTE: put detailed function documentation in .c
 
-
 /**
  * ## Purpose
- * 
+ *
  * This function demonstrates use of seteuid, sched_setscheduler \n
  * Note that fields "Use", "return", "not" and "warning" are optional
- * 
+ *
  * ## Arguments
- * 
+ *
  * Brief description of arguments is in .h file \n
  * A more detailed description of arguments in provided here \n
- * 
- * 
- * 
+ *
+ *
+ *
  * ## Use
- * 
+ *
  * Use section is optional
  * to use this function, call it as
  * @code
  * templatemodule_examplefunc01(v1, n1, farray)
  * @endcode
- * 
+ *
  * ---
- * 
- * 
+ *
+ *
  * @return number of iteration [int]
  * @note sched_setscheduler and seteuid not supported under OS-X
- * @warning This function does nothing useful 
- * 
+ * @warning This function does nothing useful
+ *
  * \ingroup RTfunctions
- * 
- * 
+ *
+ *
  * ## Details
- * 
+ *
  */
-int templatemodule_examplefunc01(
-		const char*           namein, 
-		      float           val1, 
-		      int             n1, 
-		      float* restrict farray
-		)
+int templatemodule_examplefunc01(const char *namein, float val1, int n1, float *restrict farray)
 {
-	/// ---
-	/// # Code Description
-	///
-	int Niteration;
-	
-	int RT_priority = 95; // any number from 0-99. Higher number = higher priority
-	struct sched_param schedpar;
-	
-	int retval;
-	
-	schedpar.sched_priority = RT_priority;
-
-	/// ## Set up priviledges
-
-    #ifndef __MACH__ // Do not run code below if OS-X 
+    /// ---
+    /// # Code Description
+    ///
+    int Niteration;
+
+    int RT_priority = 95; // any number from 0-99. Higher number = higher priority
+    struct sched_param schedpar;
+
+    int retval;
+
+    schedpar.sched_priority = RT_priority;
+
+    /// ## Set up priviledges
+
+#ifndef __MACH__                    // Do not run code below if OS-X
     iretval = seteuid(euid_called); //This goes up to maximum privileges
-	if(retval != 0)
-		printERROR(__FILE__, __func__, __LINE__, "seteuid() returns non-zero value");
-		
-    sched_setscheduler(0, SCHED_FIFO, &schedpar); //other option is SCHED_RR, might be faster    
+    if (retval != 0)
+        printERROR(__FILE__, __func__, __LINE__, "seteuid() returns non-zero value");
 
-    retval = seteuid(euid_real); //Go back to normal privileges
-	if(retval != 0)
-		printERROR(__FILE__, __func__, __LINE__, "seteuid() returns non-zero value");
-	#endif
-	
-	/// ## Execute loop
-	
-	// code here
-	for(;;) // preferred way to write infinite loop
-	{
-	}
-	
-	/// ---	
-	return(Niteration);
-}
+    sched_setscheduler(0, SCHED_FIFO, &schedpar); //other option is SCHED_RR, might be faster
 
+    retval = seteuid(euid_real); //Go back to normal privileges
+    if (retval != 0)
+        printERROR(__FILE__, __func__, __LINE__, "seteuid() returns non-zero value");
+#endif
 
+    /// ## Execute loop
 
+    // code here
+    for (;;) // preferred way to write infinite loop
+    {
+    }
 
+    /// ---
+    return (Niteration);
+}
diff --git a/src/CommandLineInterface/doc/templatemodule/templatemodule.h b/src/CommandLineInterface/doc/templatemodule/templatemodule.h
index e4c65ded..ba24847b 100644
--- a/src/CommandLineInterface/doc/templatemodule/templatemodule.h
+++ b/src/CommandLineInterface/doc/templatemodule/templatemodule.h
@@ -1,31 +1,23 @@
 /**
  * @file    templatemodule.h
  * @brief   Function prototypes for templatemodule
- * 
- *  
+ *
+ *
  * @author  O. Guyon
  * @date    Aug 2 2017
  *
- * 
+ *
  * @bug No known bugs.
- * 
+ *
  */
 
-
 // CODING STANDARD NOTE: Ensure this code is only read once
 #ifndef _TEMPLATEMODULE_H
 #define _TEMPLATEMODULE_H
 
-
-
-
-
 /** @name INITIALIZATION
  * Module initialization functions
  */
- 
- 
- 
 
 /** @brief Initialize module */
 int_fast8_t init_templatemodule();
@@ -36,31 +28,24 @@ int_fast8_t init_templatemodule();
 /* =============================================================================================== */
 /* =============================================================================================== */
 
-/** @brief one-line description of function 
+/** @brief one-line description of function
  * More can be included here if needed */
 int templatemodule_examplefunc00(int mode);
 
-
 /* =============================================================================================== */
 /* =============================================================================================== */
 /** @name TEMPLATEMODULE - 2. SECOND GROUP OF FUNCTIONS                                            */
 /* =============================================================================================== */
 /* =============================================================================================== */
 
-
 /* =============================================================================================== */
 /** @name TEMPLATEMODULE - 2.1. SECOND GROUP OF FUNCTIONS - SUBGROUP1                              */
 /* =============================================================================================== */
 
 /** @brief one-line description of function */
-int templatemodule_examplefunc01(
-								float val1,      ///< [in]   This parameter does this and that
-								int n1,          ///< [in]   Number of that
-								float *farray    ///< [out]  Output array
-								);
-
-
-
+int templatemodule_examplefunc01(float val1,   ///< [in]   This parameter does this and that
+                                 int n1,       ///< [in]   Number of that
+                                 float *farray ///< [out]  Output array
+);
 
 #endif
- 
diff --git a/src/CommandLineInterface/fpsCTRL_TUI.c b/src/CommandLineInterface/fpsCTRL_TUI.c
index 36600fd1..cad93d39 100644
--- a/src/CommandLineInterface/fpsCTRL_TUI.c
+++ b/src/CommandLineInterface/fpsCTRL_TUI.c
@@ -3,39 +3,29 @@
  * @brief   FPS control TUI
  */
 
-
-#include <time.h>
-#include <math.h>
 #include <fcntl.h>
 #include <limits.h>
+#include <math.h>
+#include <time.h>
 
-#include "CommandLineInterface/CLIcore.h"
 #include "COREMOD_tools/COREMOD_tools.h"
+#include "CommandLineInterface/CLIcore.h"
 
 #include "CommandLineInterface/timeutils.h"
 
-#include "fps_disconnect.h"
+#include "fpsCTRL_TUI_process_user_key.h"
 #include "fps_GetTypeString.h"
+#include "fps_disconnect.h"
 #include "fps_outlog.h"
 #include "fps_process_fpsCMDarray.h"
-#include "fpsCTRL_TUI_process_user_key.h"
 #include "fps_read_fpsCMD_fifo.h"
 #include "fps_scan.h"
 
 #include "TUItools.h"
 
-
-
-
-
 static short unsigned int wrow, wcol;
 
-
-
-inline static void print_help_entry(
-    char *key,
-    char *descr
-)
+inline static void print_help_entry(char *key, char *descr)
 {
     screenprint_setbold();
     TUI_printfw("    %4s", key);
@@ -44,23 +34,17 @@ inline static void print_help_entry(
     TUI_newline();
 }
 
-
-
-
-
-
-inline static void fpsCTRLscreen_print_DisplayMode_status(
-    int fpsCTRL_DisplayMode, int NBfps)
+inline static void fpsCTRLscreen_print_DisplayMode_status(int fpsCTRL_DisplayMode, int NBfps)
 {
 
     int stringmaxlen = 500;
-    char  monstring[stringmaxlen];
+    char monstring[stringmaxlen];
 
     screenprint_setbold();
 
-    if(snprintf(monstring, stringmaxlen,
-                "[%d x %d] [PID %d] FUNCTION PARAMETER MONITOR: PRESS (x) TO STOP, (h) FOR HELP [%d FPS]",
-                wrow, wcol, (int) getpid(), NBfps) < 0)
+    if (snprintf(monstring, stringmaxlen,
+                 "[%d x %d] [PID %d] FUNCTION PARAMETER MONITOR: PRESS (x) TO STOP, (h) FOR HELP [%d FPS]", wrow, wcol,
+                 (int)getpid(), NBfps) < 0)
     {
         PRINT_ERROR("snprintf error");
     }
@@ -68,7 +52,7 @@ inline static void fpsCTRLscreen_print_DisplayMode_status(
     screenprint_unsetbold();
     TUI_newline();
 
-    if(fpsCTRL_DisplayMode == 1)
+    if (fpsCTRL_DisplayMode == 1)
     {
         screenprint_setreverse();
         TUI_printfw("[h] Help");
@@ -80,7 +64,7 @@ inline static void fpsCTRLscreen_print_DisplayMode_status(
     }
     TUI_printfw("   ");
 
-    if(fpsCTRL_DisplayMode == 2)
+    if (fpsCTRL_DisplayMode == 2)
     {
         screenprint_setreverse();
         TUI_printfw("[F2] FPS CTRL");
@@ -92,7 +76,7 @@ inline static void fpsCTRLscreen_print_DisplayMode_status(
     }
     TUI_printfw("   ");
 
-    if(fpsCTRL_DisplayMode == 3)
+    if (fpsCTRL_DisplayMode == 3)
     {
         screenprint_setreverse();
         TUI_printfw("[F3] Sequencer");
@@ -105,8 +89,6 @@ inline static void fpsCTRLscreen_print_DisplayMode_status(
     TUI_newline();
 }
 
-
-
 inline static void fpsCTRLscreen_print_help()
 {
     // int attrval = A_BOLD;
@@ -122,129 +104,97 @@ inline static void fpsCTRLscreen_print_help()
     TUI_newline();
     TUI_printfw("============ OTHER");
     TUI_newline();
-    print_help_entry("s",     "rescan");
-    print_help_entry("T/t",   "initialize (T)mux session / kill (t)mux session");
-    print_help_entry("E/e",   "(E)rase FPS and tmux sessions / (e)rase FPS only");
+    print_help_entry("s", "rescan");
+    print_help_entry("T/t", "initialize (T)mux session / kill (t)mux session");
+    print_help_entry("E/e", "(E)rase FPS and tmux sessions / (e)rase FPS only");
     print_help_entry("C/c/u", "start/stop/update CONF process");
-    print_help_entry("R/r",   "start/stop RUN process");
-    print_help_entry("l",     "list all entries");
-    print_help_entry(">",     "export fpsdatadir values fpsconfdir");
-    print_help_entry("<",     "import/load values from fpsconfdir");
-    print_help_entry("P",     "(P)rocess input file \"confscript\"");
+    print_help_entry("R/r", "start/stop RUN process");
+    print_help_entry("l", "list all entries");
+    print_help_entry(">", "export fpsdatadir values fpsconfdir");
+    print_help_entry("<", "import/load values from fpsconfdir");
+    print_help_entry("P", "(P)rocess input file \"confscript\"");
     TUI_printfw("        format: setval <paramfulname> <value>");
     TUI_newline();
 }
 
-
-
-
-
-inline static void fpsCTRLscreen_print_nodeinfo(
-    FUNCTION_PARAMETER_STRUCT *fps,
-    KEYWORD_TREE_NODE *keywnode,
-    int nodeSelected,
-    int fpsindexSelected,
-    int pindexSelected)
+inline static void fpsCTRLscreen_print_nodeinfo(FUNCTION_PARAMETER_STRUCT *fps, KEYWORD_TREE_NODE *keywnode,
+                                                int nodeSelected, int fpsindexSelected, int pindexSelected)
 {
 
-    DEBUG_TRACEPOINT("Selected node %d in fps %d",
-                     nodeSelected,
-                     keywnode[nodeSelected].fpsindex);
+    DEBUG_TRACEPOINT("Selected node %d in fps %d", nodeSelected, keywnode[nodeSelected].fpsindex);
 
-    TUI_printfw("======== FPS info ( # %5d)",
-                keywnode[nodeSelected].fpsindex);
+    TUI_printfw("======== FPS info ( # %5d)", keywnode[nodeSelected].fpsindex);
     TUI_newline();
 
     char teststring[200];
     sprintf(teststring, "%s", fps[keywnode[nodeSelected].fpsindex].md->sourcefname);
     DEBUG_TRACEPOINT("TEST STRING : %s", teststring);
 
+    DEBUG_TRACEPOINT("TEST LINE : %d", fps[keywnode[nodeSelected].fpsindex].md->sourceline);
 
-    DEBUG_TRACEPOINT("TEST LINE : %d",
-                     fps[keywnode[nodeSelected].fpsindex].md->sourceline);
-
-    TUI_printfw("    FPS call              : %s -> %s [",
-                fps[keywnode[nodeSelected].fpsindex].md->callprogname,
+    TUI_printfw("    FPS call              : %s -> %s [", fps[keywnode[nodeSelected].fpsindex].md->callprogname,
                 fps[keywnode[nodeSelected].fpsindex].md->callfuncname);
 
-    for(int i = 0; i < fps[keywnode[nodeSelected].fpsindex].md->NBnameindex; i++)
+    for (int i = 0; i < fps[keywnode[nodeSelected].fpsindex].md->NBnameindex; i++)
     {
         TUI_printfw(" %s", fps[keywnode[nodeSelected].fpsindex].md->nameindexW[i]);
     }
     TUI_printfw(" ]");
     TUI_newline();
 
-    TUI_printfw("    FPS source            : %s %d",
-                fps[keywnode[nodeSelected].fpsindex].md->sourcefname,
+    TUI_printfw("    FPS source            : %s %d", fps[keywnode[nodeSelected].fpsindex].md->sourcefname,
                 fps[keywnode[nodeSelected].fpsindex].md->sourceline);
     TUI_newline();
 
-
     TUI_printfw("   %d libs : ", fps[keywnode[nodeSelected].fpsindex].md->NBmodule);
-    for(int m = 0; m < fps[keywnode[nodeSelected].fpsindex].md->NBmodule; m++)
+    for (int m = 0; m < fps[keywnode[nodeSelected].fpsindex].md->NBmodule; m++)
     {
         TUI_printfw(" [%s]", fps[keywnode[nodeSelected].fpsindex].md->modulename[m]);
     }
     TUI_newline();
 
-
     DEBUG_TRACEPOINT(" ");
-    TUI_printfw("    FPS work     directory    : %s",
-                fps[keywnode[nodeSelected].fpsindex].md->workdir);
+    TUI_printfw("    FPS work     directory    : %s", fps[keywnode[nodeSelected].fpsindex].md->workdir);
     TUI_newline();
 
     TUI_printfw("    ( FPS output data directory : %s )  ( FPS input conf directory : %s)",
-                fps[keywnode[nodeSelected].fpsindex].md->datadir,
-                fps[keywnode[nodeSelected].fpsindex].md->confdir);
+                fps[keywnode[nodeSelected].fpsindex].md->datadir, fps[keywnode[nodeSelected].fpsindex].md->confdir);
     TUI_newline();
 
     DEBUG_TRACEPOINT(" ");
     TUI_printfw("    FPS tmux sessions     :  ");
 
-
-    EXECUTE_SYSTEM_COMMAND("tmux has-session -t %s:ctrl 2> /dev/null",
-                           fps[keywnode[nodeSelected].fpsindex].md->name);
-    if(data.retvalue == 0)
+    EXECUTE_SYSTEM_COMMAND("tmux has-session -t %s:ctrl 2> /dev/null", fps[keywnode[nodeSelected].fpsindex].md->name);
+    if (data.retvalue == 0)
     {
-        fps[keywnode[nodeSelected].fpsindex].md->status |=
-            FUNCTION_PARAMETER_STRUCT_STATUS_TMUXCTRL;
+        fps[keywnode[nodeSelected].fpsindex].md->status |= FUNCTION_PARAMETER_STRUCT_STATUS_TMUXCTRL;
     }
     else
     {
-        fps[keywnode[nodeSelected].fpsindex].md->status &=
-            ~FUNCTION_PARAMETER_STRUCT_STATUS_TMUXCTRL;
+        fps[keywnode[nodeSelected].fpsindex].md->status &= ~FUNCTION_PARAMETER_STRUCT_STATUS_TMUXCTRL;
     }
 
-
-    EXECUTE_SYSTEM_COMMAND("tmux has-session -t %s:conf 2> /dev/null",
-                           fps[keywnode[nodeSelected].fpsindex].md->name);
-    if(data.retvalue == 0)
+    EXECUTE_SYSTEM_COMMAND("tmux has-session -t %s:conf 2> /dev/null", fps[keywnode[nodeSelected].fpsindex].md->name);
+    if (data.retvalue == 0)
     {
-        fps[keywnode[nodeSelected].fpsindex].md->status |=
-            FUNCTION_PARAMETER_STRUCT_STATUS_TMUXCONF;
+        fps[keywnode[nodeSelected].fpsindex].md->status |= FUNCTION_PARAMETER_STRUCT_STATUS_TMUXCONF;
     }
     else
     {
-        fps[keywnode[nodeSelected].fpsindex].md->status &=
-            ~FUNCTION_PARAMETER_STRUCT_STATUS_TMUXCONF;
+        fps[keywnode[nodeSelected].fpsindex].md->status &= ~FUNCTION_PARAMETER_STRUCT_STATUS_TMUXCONF;
     }
 
-    EXECUTE_SYSTEM_COMMAND("tmux has-session -t %s:run 2> /dev/null",
-                           fps[keywnode[nodeSelected].fpsindex].md->name);
-    if(data.retvalue == 0)
+    EXECUTE_SYSTEM_COMMAND("tmux has-session -t %s:run 2> /dev/null", fps[keywnode[nodeSelected].fpsindex].md->name);
+    if (data.retvalue == 0)
     {
-        fps[keywnode[nodeSelected].fpsindex].md->status |=
-            FUNCTION_PARAMETER_STRUCT_STATUS_TMUXRUN;
+        fps[keywnode[nodeSelected].fpsindex].md->status |= FUNCTION_PARAMETER_STRUCT_STATUS_TMUXRUN;
     }
     else
     {
-        fps[keywnode[nodeSelected].fpsindex].md->status &=
-            ~FUNCTION_PARAMETER_STRUCT_STATUS_TMUXRUN;
+        fps[keywnode[nodeSelected].fpsindex].md->status &= ~FUNCTION_PARAMETER_STRUCT_STATUS_TMUXRUN;
     }
 
-
-    if(fps[keywnode[nodeSelected].fpsindex].md->status &
-            FUNCTION_PARAMETER_STRUCT_STATUS_TMUXCTRL)
+    if (fps[keywnode[nodeSelected].fpsindex].md->status & FUNCTION_PARAMETER_STRUCT_STATUS_TMUXCTRL)
     {
         screenprint_setcolor(COLOR_OK);
         TUI_printfw("%s:ctrl", fps[keywnode[nodeSelected].fpsindex].md->name);
@@ -257,8 +207,7 @@ inline static void fpsCTRLscreen_print_nodeinfo(
         screenprint_unsetcolor(COLOR_ERROR);
     }
     TUI_printfw(" ");
-    if(fps[keywnode[nodeSelected].fpsindex].md->status &
-            FUNCTION_PARAMETER_STRUCT_STATUS_TMUXCONF)
+    if (fps[keywnode[nodeSelected].fpsindex].md->status & FUNCTION_PARAMETER_STRUCT_STATUS_TMUXCONF)
     {
         screenprint_setcolor(COLOR_OK);
         TUI_printfw("%s:conf", fps[keywnode[nodeSelected].fpsindex].md->name);
@@ -271,8 +220,7 @@ inline static void fpsCTRLscreen_print_nodeinfo(
         screenprint_unsetcolor(COLOR_ERROR);
     }
     TUI_printfw(" ");
-    if(fps[keywnode[nodeSelected].fpsindex].md->status &
-            FUNCTION_PARAMETER_STRUCT_STATUS_TMUXRUN)
+    if (fps[keywnode[nodeSelected].fpsindex].md->status & FUNCTION_PARAMETER_STRUCT_STATUS_TMUXRUN)
     {
         screenprint_setcolor(COLOR_OK);
         TUI_printfw("%s:run", fps[keywnode[nodeSelected].fpsindex].md->name);
@@ -286,29 +234,25 @@ inline static void fpsCTRLscreen_print_nodeinfo(
     }
     TUI_newline();
 
-
-
     DEBUG_TRACEPOINT(" ");
     TUI_printfw("======== NODE info ( # %5ld)", nodeSelected);
     TUI_newline();
     TUI_printfw("%-30s ", keywnode[nodeSelected].keywordfull);
 
-    if(keywnode[nodeSelected].leaf > 0)   // If this is not a directory
+    if (keywnode[nodeSelected].leaf > 0) // If this is not a directory
     {
         char typestring[100];
-        functionparameter_GetTypeString(
-            fps[fpsindexSelected].parray[pindexSelected].type,
-            typestring);
+        functionparameter_GetTypeString(fps[fpsindexSelected].parray[pindexSelected].type, typestring);
         TUI_printfw("type %s", typestring);
         TUI_newline();
 
         // print binary flag
         TUI_printfw("FLAG : ");
-        uint64_t mask = (uint64_t) 1 << (sizeof(uint64_t) * CHAR_BIT - 1);
-        while(mask)
+        uint64_t mask = (uint64_t)1 << (sizeof(uint64_t) * CHAR_BIT - 1);
+        while (mask)
         {
             int digit = fps[fpsindexSelected].parray[pindexSelected].fpflag & mask ? 1 : 0;
-            if(digit == 1)
+            if (digit == 1)
             {
                 screenprint_setcolor(2);
                 TUI_printfw("%d", digit);
@@ -330,54 +274,46 @@ inline static void fpsCTRLscreen_print_nodeinfo(
     TUI_newline();
 }
 
-
-
-
-
-
-inline static void fpsCTRLscreen_level0node_summary(
-    FUNCTION_PARAMETER_STRUCT *fps,
-    int fpsindex)
+inline static void fpsCTRLscreen_level0node_summary(FUNCTION_PARAMETER_STRUCT *fps, int fpsindex)
 {
     pid_t pid;
 
     pid = fps[fpsindex].md->confpid;
-    if((getpgid(pid) >= 0) && (pid > 0))
+    if ((getpgid(pid) >= 0) && (pid > 0))
     {
         screenprint_setcolor(2);
-        TUI_printfw("%07d ", (int) pid);
+        TUI_printfw("%07d ", (int)pid);
         screenprint_unsetcolor(2);
     }
-    else     // PID not active
+    else // PID not active
     {
-        if(fps[fpsindex].md->status & FUNCTION_PARAMETER_STRUCT_STATUS_CMDCONF)
+        if (fps[fpsindex].md->status & FUNCTION_PARAMETER_STRUCT_STATUS_CMDCONF)
         {
             // not clean exit
             screenprint_setcolor(4);
-            TUI_printfw("%07d ", (int) pid);
+            TUI_printfw("%07d ", (int)pid);
             screenprint_unsetcolor(4);
         }
         else
         {
             // All OK
-            TUI_printfw("%07d ", (int) pid);
+            TUI_printfw("%07d ", (int)pid);
         }
     }
 
-
-    if(fps[fpsindex].md->conferrcnt > 99)
+    if (fps[fpsindex].md->conferrcnt > 99)
     {
         screenprint_setcolor(4);
         TUI_printfw("[XX]");
         screenprint_unsetcolor(4);
     }
-    if(fps[fpsindex].md->conferrcnt > 0)
+    if (fps[fpsindex].md->conferrcnt > 0)
     {
         screenprint_setcolor(4);
         TUI_printfw("[%02d]", fps[fpsindex].md->conferrcnt);
         screenprint_unsetcolor(4);
     }
-    if(fps[fpsindex].md->conferrcnt == 0)
+    if (fps[fpsindex].md->conferrcnt == 0)
     {
         screenprint_setcolor(2);
         TUI_printfw("[%02d]", fps[fpsindex].md->conferrcnt);
@@ -385,39 +321,29 @@ inline static void fpsCTRLscreen_level0node_summary(
     }
 
     pid = fps[fpsindex].md->runpid;
-    if((getpgid(pid) >= 0) && (pid > 0))
+    if ((getpgid(pid) >= 0) && (pid > 0))
     {
         screenprint_setcolor(2);
-        TUI_printfw("%07d ", (int) pid);
+        TUI_printfw("%07d ", (int)pid);
         screenprint_unsetcolor(2);
     }
     else
     {
-        if(fps[fpsindex].md->status & FUNCTION_PARAMETER_STRUCT_STATUS_CMDRUN)
+        if (fps[fpsindex].md->status & FUNCTION_PARAMETER_STRUCT_STATUS_CMDRUN)
         {
             // not clean exit
             screenprint_setcolor(4);
-            TUI_printfw("%07d ", (int) pid);
+            TUI_printfw("%07d ", (int)pid);
             screenprint_unsetcolor(4);
         }
         else
         {
             // All OK
-            TUI_printfw("%07d ", (int) pid);
+            TUI_printfw("%07d ", (int)pid);
         }
     }
-
 }
 
-
-
-
-
-
-
-
-
-
 /** @brief runs fpsCTRL GUI
  *
  * ## Purpose
@@ -427,11 +353,7 @@ inline static void fpsCTRLscreen_level0node_summary(
  *
  *
  */
-errno_t functionparameter_CTRLscreen(
-    uint32_t mode,
-    char *fpsnamemask,
-    char *fpsCTRLfifoname
-)
+errno_t functionparameter_CTRLscreen(uint32_t mode, char *fpsnamemask, char *fpsCTRLfifoname)
 {
     int fpsindex;
 
@@ -453,104 +375,85 @@ errno_t functionparameter_CTRLscreen(
 
     int nodechain[MAXNBLEVELS];
 
-
     // What to run ?
     // disable for testing
     int run_display = 1;
     loopOK = 1;
 
-
     struct timespec tnow;
     clock_gettime(CLOCK_REALTIME, &tnow);
     data.FPS_TIMESTAMP = tnow.tv_sec;
     strcpy(data.FPS_PROCESS_TYPE, "ctrl");
 
-
-
     functionparameter_outlog("FPSCTRL", "START\n");
 
     DEBUG_TRACEPOINT("function start");
 
-
-
     // initialize fpsCTRLvar
-    fpsCTRLvar.exitloop              = 0;
-    fpsCTRLvar.mode                  = mode;
-    fpsCTRLvar.nodeSelected          = 1;
-    fpsCTRLvar.run_display           = run_display;
-    fpsCTRLvar.fpsindexSelected      = 0;
-    fpsCTRLvar.pindexSelected        = 0;
+    fpsCTRLvar.exitloop = 0;
+    fpsCTRLvar.mode = mode;
+    fpsCTRLvar.nodeSelected = 1;
+    fpsCTRLvar.run_display = run_display;
+    fpsCTRLvar.fpsindexSelected = 0;
+    fpsCTRLvar.pindexSelected = 0;
     fpsCTRLvar.directorynodeSelected = 0;
-    fpsCTRLvar.currentlevel          = 0;
-    fpsCTRLvar.direction             = 1;
+    fpsCTRLvar.currentlevel = 0;
+    fpsCTRLvar.direction = 1;
     strcpy(fpsCTRLvar.fpsnamemask, fpsnamemask);
     strcpy(fpsCTRLvar.fpsCTRLfifoname, fpsCTRLfifoname);
 
-
     fpsCTRLvar.fpsCTRL_DisplayMode = 2;
     // 1: [h]  help
     // 2: [F2] list of conf and run
     // 3: [F3] fpscmdarray
 
-
-
-
-
     // allocate memory
 
-
     // Array holding fps structures
     //
     //fps = (FUNCTION_PARAMETER_STRUCT *) malloc(sizeof(FUNCTION_PARAMETER_STRUCT) *
     //        NB_FPS_MAX);
 
-
     // Initialize file descriptors to -1
     //
-//    for(fpsindex = 0; fpsindex < NB_FPS_MAX; fpsindex++)
-//    {
-//        data.fps[fpsindex].SMfd = -1;
-//    }
+    //    for(fpsindex = 0; fpsindex < NB_FPS_MAX; fpsindex++)
+    //    {
+    //        data.fps[fpsindex].SMfd = -1;
+    //    }
 
     // All parameters held in this array
     //
-    keywnode = (KEYWORD_TREE_NODE *) malloc(sizeof(KEYWORD_TREE_NODE) *
-                                            NB_KEYWNODE_MAX);
-    if(keywnode == NULL)
+    keywnode = (KEYWORD_TREE_NODE *)malloc(sizeof(KEYWORD_TREE_NODE) * NB_KEYWNODE_MAX);
+    if (keywnode == NULL)
     {
         PRINT_ERROR("malloc error: can't allocate keywnode");
         abort();
     }
-    for(int kn = 0; kn < NB_KEYWNODE_MAX; kn++)
+    for (int kn = 0; kn < NB_KEYWNODE_MAX; kn++)
     {
         strcpy(keywnode[kn].keywordfull, "");
-        for(int ch = 0; ch < MAX_NB_CHILD; ch++)
+        for (int ch = 0; ch < MAX_NB_CHILD; ch++)
         {
             keywnode[kn].child[ch] = 0;
         }
     }
 
-
-
     // initialize nodechain
-    for(int l = 0; l < MAXNBLEVELS; l++)
+    for (int l = 0; l < MAXNBLEVELS; l++)
     {
         nodechain[l] = 0;
     }
 
-
-
     // Set up instruction buffer to sequence commands
     //
     FPSCTRL_TASK_ENTRY *fpsctrltasklist;
-    fpsctrltasklist = (FPSCTRL_TASK_ENTRY *) malloc(sizeof(FPSCTRL_TASK_ENTRY) *
-                      NB_FPSCTRL_TASK_MAX);
-    if(fpsctrltasklist == NULL)
+    fpsctrltasklist = (FPSCTRL_TASK_ENTRY *)malloc(sizeof(FPSCTRL_TASK_ENTRY) * NB_FPSCTRL_TASK_MAX);
+    if (fpsctrltasklist == NULL)
     {
         PRINT_ERROR("malloc error");
         abort();
     }
-    for(int cmdindex = 0; cmdindex < NB_FPSCTRL_TASK_MAX; cmdindex++)
+    for (int cmdindex = 0; cmdindex < NB_FPSCTRL_TASK_MAX; cmdindex++)
     {
         fpsctrltasklist[cmdindex].status = 0;
         fpsctrltasklist[cmdindex].queue = 0;
@@ -559,14 +462,13 @@ errno_t functionparameter_CTRLscreen(
     // Set up task queue list
     //
     FPSCTRL_TASK_QUEUE *fpsctrlqueuelist;
-    fpsctrlqueuelist = (FPSCTRL_TASK_QUEUE *) malloc(sizeof(
-                           FPSCTRL_TASK_QUEUE) * NB_FPSCTRL_TASKQUEUE_MAX);
-    if(fpsctrlqueuelist == NULL)
+    fpsctrlqueuelist = (FPSCTRL_TASK_QUEUE *)malloc(sizeof(FPSCTRL_TASK_QUEUE) * NB_FPSCTRL_TASKQUEUE_MAX);
+    if (fpsctrlqueuelist == NULL)
     {
         PRINT_ERROR("malloc error");
         abort();
     }
-    for(int queueindex = 0; queueindex < NB_FPSCTRL_TASKQUEUE_MAX; queueindex++)
+    for (int queueindex = 0; queueindex < NB_FPSCTRL_TASKQUEUE_MAX; queueindex++)
     {
         fpsctrlqueuelist[queueindex].priority = 1; // 0 = not active
     }
@@ -575,137 +477,101 @@ errno_t functionparameter_CTRLscreen(
     //
     set_signal_catch();
 
-
-
     // fifo
-    fpsCTRLvar.fpsCTRLfifofd = open(fpsCTRLvar.fpsCTRLfifoname,
-                                    O_RDWR | O_NONBLOCK);
+    fpsCTRLvar.fpsCTRLfifofd = open(fpsCTRLvar.fpsCTRLfifoname, O_RDWR | O_NONBLOCK);
     long fifocmdcnt = 0;
 
-
-    for(level = 0; level < MAXNBLEVELS; level++)
+    for (level = 0; level < MAXNBLEVELS; level++)
     {
         fpsCTRLvar.GUIlineSelected[level] = 0;
     }
 
-
-
-
-    functionparameter_scan_fps(
-        fpsCTRLvar.mode,
-        fpsCTRLvar.fpsnamemask,
-        data.fpsarray,
-        keywnode,
-        &fpsCTRLvar.NBkwn,
-        &fpsCTRLvar.NBfps,
-        &NBpindex,
-        0   // quiet
+    functionparameter_scan_fps(fpsCTRLvar.mode, fpsCTRLvar.fpsnamemask, data.fpsarray, keywnode, &fpsCTRLvar.NBkwn,
+                               &fpsCTRLvar.NBfps, &NBpindex,
+                               0 // quiet
     );
 
-    printf("%d function parameter structure(s) imported, %ld parameters\n",
-           fpsCTRLvar.NBfps, NBpindex);
+    printf("%d function parameter structure(s) imported, %ld parameters\n", fpsCTRLvar.NBfps, NBpindex);
     fflush(stdout);
 
-
     DEBUG_TRACEPOINT(" ");
 
-
-
     fpsCTRLvar.nodeSelected = 1;
     fpsindex = 0;
 
-
-
-
-
-
     // default: use ncurses
     TUI_set_screenprintmode(SCREENPRINT_NCURSES);
 
-    if(getenv("MILK_TUIPRINT_STDIO"))
+    if (getenv("MILK_TUIPRINT_STDIO"))
     {
         // use stdio instead of ncurses
         TUI_set_screenprintmode(SCREENPRINT_STDIO);
     }
 
-    if(getenv("MILK_TUIPRINT_NONE"))
+    if (getenv("MILK_TUIPRINT_NONE"))
     {
         TUI_set_screenprintmode(SCREENPRINT_NONE);
     }
 
-
-
-
-
     // INITIALIZE terminal
 
-    if(run_display == 1)
+    if (run_display == 1)
     {
         TUI_init_terminal(&wrow, &wcol);
         DEBUG_TRACEPOINT("returned from TUI init %d %d", wrow, wcol);
     }
 
-
-
-
     fpsCTRLvar.NBindex = 0;
     char shmdname[200];
     function_parameter_struct_shmdirname(shmdname);
 
-
-
-    if(run_display == 0)
+    if (run_display == 0)
     {
         loopOK = 0;
     }
 
-    int getchardt_us_ref = 100000;  // how long between getchar probes
+    int getchardt_us_ref = 100000; // how long between getchar probes
     // refresh every 1 sec without input
     int refreshtimeoutus_ref = 1000000;
 
     int getchardt_us = getchardt_us_ref;
     int refreshtimeoutus = refreshtimeoutus_ref;
 
-
-    if(TUI_get_screenprintmode() == SCREENPRINT_NCURSES)   // ncurses mode
+    if (TUI_get_screenprintmode() == SCREENPRINT_NCURSES) // ncurses mode
     {
         refreshtimeoutus_ref = 100000; // 10 Hz
     }
 
     int refresh_screen = 1; // 1 if screen should be refreshed
 
-    while(loopOK == 1)
+    while (loopOK == 1)
     {
         int NBtaskLaunched = 0;
 
         long icnt = 0;
         int ch = -1;
 
-
         int timeoutuscnt = 0;
 
-
-        while(refresh_screen == 0)    // wait for input
+        while (refresh_screen == 0) // wait for input
         {
             // put input commands from fifo into the task queue
-            int fcnt = functionparameter_read_fpsCMD_fifo(fpsCTRLvar.fpsCTRLfifofd,
-                       fpsctrltasklist, fpsctrlqueuelist);
+            int fcnt = functionparameter_read_fpsCMD_fifo(fpsCTRLvar.fpsCTRLfifofd, fpsctrltasklist, fpsctrlqueuelist);
 
             DEBUG_TRACEPOINT(" ");
 
             // execute next command in the queue
-            int taskflag = function_parameter_process_fpsCMDarray(fpsctrltasklist,
-                           fpsctrlqueuelist,
-                           keywnode, &fpsCTRLvar, data.fpsarray);
+            int taskflag = function_parameter_process_fpsCMDarray(fpsctrltasklist, fpsctrlqueuelist, keywnode,
+                                                                  &fpsCTRLvar, data.fpsarray);
 
-            if(taskflag > 0) // task has been performed
+            if (taskflag > 0) // task has been performed
             {
                 getchardt_us = 1000; // check often
             }
             else
             {
                 getchardt_us = (int)(1.01 * getchardt_us); // gradually slow down
-                if(getchardt_us > getchardt_us_ref)
+                if (getchardt_us > getchardt_us_ref)
                 {
                     getchardt_us = getchardt_us_ref;
                 }
@@ -716,18 +582,14 @@ errno_t functionparameter_CTRLscreen(
 
             fifocmdcnt += fcnt;
 
-
-
-
             usleep(getchardt_us);
 
-
             // ==================
             // = GET USER INPUT =
             // ==================
             ch = get_singlechar_nonblock();
 
-            if(ch == -1)
+            if (ch == -1)
             {
                 refresh_screen = 0;
             }
@@ -738,7 +600,7 @@ errno_t functionparameter_CTRLscreen(
 
             //tcnt ++;
             timeoutuscnt += getchardt_us;
-            if(timeoutuscnt > refreshtimeoutus)
+            if (timeoutuscnt > refreshtimeoutus)
             {
                 refresh_screen = 1;
             }
@@ -746,156 +608,121 @@ errno_t functionparameter_CTRLscreen(
             DEBUG_TRACEPOINT(" ");
         }
 
-        if(refresh_screen > 0)
+        if (refresh_screen > 0)
         {
-            refresh_screen --; // will wait next time we enter the loop
+            refresh_screen--; // will wait next time we enter the loop
         }
 
         TUI_clearscreen(&wrow, &wcol);
 
         DEBUG_TRACEPOINT(" ");
 
-        loopOK = fpsCTRL_TUI_process_user_key(
-                     ch,
-                     data.fpsarray,
-                     keywnode,
-                     fpsctrltasklist,
-                     fpsctrlqueuelist,
-                     &fpsCTRLvar
-                 );
-
+        loopOK =
+            fpsCTRL_TUI_process_user_key(ch, data.fpsarray, keywnode, fpsctrltasklist, fpsctrlqueuelist, &fpsCTRLvar);
 
         DEBUG_TRACEPOINT(" ");
 
-        if(fpsCTRLvar.exitloop == 1)
+        if (fpsCTRLvar.exitloop == 1)
         {
             loopOK = 0;
         }
 
-
-
-        if(fpsCTRLvar.run_display == 1)
+        if (fpsCTRLvar.run_display == 1)
         {
             TUI_ncurses_erase();
 
-            fpsCTRLscreen_print_DisplayMode_status(fpsCTRLvar.fpsCTRL_DisplayMode,
-                                                   fpsCTRLvar.NBfps);
-
-
+            fpsCTRLscreen_print_DisplayMode_status(fpsCTRLvar.fpsCTRL_DisplayMode, fpsCTRLvar.NBfps);
 
             DEBUG_TRACEPOINT(" ");
 
-            TUI_printfw("======== FPSCTRL info  ( screen refresh cnt %7ld  scan interval %7ld us)",
-                        loopcnt, getchardt_us);
+            TUI_printfw("======== FPSCTRL info  ( screen refresh cnt %7ld  scan interval %7ld us)", loopcnt,
+                        getchardt_us);
             TUI_newline();
-            TUI_printfw("    INPUT FIFO       :  %s (fd=%d)    fifocmdcnt = %ld   NBtaskLaunched = %d -> %d   [NB FPS = %d]",
-                        fpsCTRLvar.fpsCTRLfifoname, fpsCTRLvar.fpsCTRLfifofd, fifocmdcnt,
-                        NBtaskLaunched, NBtaskLaunchedcnt,
-                        fpsCTRLvar.NBfps);
+            TUI_printfw(
+                "    INPUT FIFO       :  %s (fd=%d)    fifocmdcnt = %ld   NBtaskLaunched = %d -> %d   [NB FPS = %d]",
+                fpsCTRLvar.fpsCTRLfifoname, fpsCTRLvar.fpsCTRLfifofd, fifocmdcnt, NBtaskLaunched, NBtaskLaunchedcnt,
+                fpsCTRLvar.NBfps);
             TUI_newline();
 
-
             DEBUG_TRACEPOINT(" ");
             char logfname[STRINGMAXLEN_FULLFILENAME];
             getFPSlogfname(logfname);
             TUI_printfw("    OUTPUT LOG       :  %s", logfname);
             TUI_newline();
 
-
             DEBUG_TRACEPOINT(" ");
 
-
-            if(fpsCTRLvar.fpsCTRL_DisplayMode == 1)   // help
+            if (fpsCTRLvar.fpsCTRL_DisplayMode == 1) // help
             {
                 fpsCTRLscreen_print_help();
             }
 
-
-            if(fpsCTRLvar.fpsCTRL_DisplayMode == 2)   // FPS content
+            if (fpsCTRLvar.fpsCTRL_DisplayMode == 2) // FPS content
             {
 
+                DEBUG_TRACEPOINT("Check that selected node is OK : %d", fpsCTRLvar.nodeSelected);
 
-                DEBUG_TRACEPOINT("Check that selected node is OK : %d",
-                                 fpsCTRLvar.nodeSelected);
-
-                if(fpsCTRLvar.NBfps > 0)
+                if (fpsCTRLvar.NBfps > 0)
                 {
                     /*TUI_printfw("node selected : %d", fpsCTRLvar.nodeSelected);
                     TUI_newline();
                      TUI_printfw("full keyword :  %s", keywnode[fpsCTRLvar.nodeSelected].keywordfull);
                      TUI_newline();*/
-                    if(strlen(keywnode[fpsCTRLvar.nodeSelected].keywordfull) <
-                            1)   // if not OK, set to last valid entry
+                    if (strlen(keywnode[fpsCTRLvar.nodeSelected].keywordfull) < 1) // if not OK, set to last valid entry
                     {
                         fpsCTRLvar.nodeSelected = 1;
-                        while((strlen(keywnode[fpsCTRLvar.nodeSelected].keywordfull) < 1)
-                                && (fpsCTRLvar.nodeSelected < NB_KEYWNODE_MAX))
+                        while ((strlen(keywnode[fpsCTRLvar.nodeSelected].keywordfull) < 1) &&
+                               (fpsCTRLvar.nodeSelected < NB_KEYWNODE_MAX))
                         {
-                            fpsCTRLvar.nodeSelected ++;
+                            fpsCTRLvar.nodeSelected++;
                         }
                     }
 
                     DEBUG_TRACEPOINT("Get info from selected node");
                     fpsCTRLvar.fpsindexSelected = keywnode[fpsCTRLvar.nodeSelected].fpsindex;
                     fpsCTRLvar.pindexSelected = keywnode[fpsCTRLvar.nodeSelected].pindex;
-                    fpsCTRLscreen_print_nodeinfo(
-                        data.fpsarray,
-                        keywnode,
-                        fpsCTRLvar.nodeSelected,
-                        fpsCTRLvar.fpsindexSelected,
-                        fpsCTRLvar.pindexSelected);
-
-
+                    fpsCTRLscreen_print_nodeinfo(data.fpsarray, keywnode, fpsCTRLvar.nodeSelected,
+                                                 fpsCTRLvar.fpsindexSelected, fpsCTRLvar.pindexSelected);
 
                     DEBUG_TRACEPOINT("trace back node chain");
                     nodechain[fpsCTRLvar.currentlevel] = fpsCTRLvar.directorynodeSelected;
 
-                    TUI_printfw("[level %d %d] ", fpsCTRLvar.currentlevel + 1,
-                                nodechain[fpsCTRLvar.currentlevel + 1]);
+                    TUI_printfw("[level %d %d] ", fpsCTRLvar.currentlevel + 1, nodechain[fpsCTRLvar.currentlevel + 1]);
 
-                    if(fpsCTRLvar.currentlevel > 0)
+                    if (fpsCTRLvar.currentlevel > 0)
                     {
-                        TUI_printfw("[level %d %d] ", fpsCTRLvar.currentlevel,
-                                    nodechain[fpsCTRLvar.currentlevel]);
+                        TUI_printfw("[level %d %d] ", fpsCTRLvar.currentlevel, nodechain[fpsCTRLvar.currentlevel]);
                     }
                     level = fpsCTRLvar.currentlevel - 1;
-                    while(level > 0)
+                    while (level > 0)
                     {
                         nodechain[level] = keywnode[nodechain[level + 1]].parent_index;
                         TUI_printfw("[level %d %d] ", level, nodechain[level]);
-                        level --;
+                        level--;
                     }
                     TUI_printfw("[level 0 0]");
                     TUI_newline();
                     nodechain[0] = 0; // root
 
                     DEBUG_TRACEPOINT("Get number of lines to be displayed");
-                    fpsCTRLvar.currentlevel =
-                        keywnode[fpsCTRLvar.directorynodeSelected].keywordlevel;
+                    fpsCTRLvar.currentlevel = keywnode[fpsCTRLvar.directorynodeSelected].keywordlevel;
                     int GUIlineMax = keywnode[fpsCTRLvar.directorynodeSelected].NBchild;
-                    for(level = 0; level < fpsCTRLvar.currentlevel; level ++)
+                    for (level = 0; level < fpsCTRLvar.currentlevel; level++)
                     {
                         DEBUG_TRACEPOINT("update GUIlineMax, the maximum number of lines");
-                        if(keywnode[nodechain[level]].NBchild > GUIlineMax)
+                        if (keywnode[nodechain[level]].NBchild > GUIlineMax)
                         {
                             GUIlineMax = keywnode[nodechain[level]].NBchild;
                         }
                     }
 
-                    TUI_printfw("[node %d] level = %d   [%d] NB child = %d",
-                                fpsCTRLvar.nodeSelected,
-                                fpsCTRLvar.currentlevel,
-                                fpsCTRLvar.directorynodeSelected,
-                                keywnode[fpsCTRLvar.directorynodeSelected].NBchild
-                               );
+                    TUI_printfw("[node %d] level = %d   [%d] NB child = %d", fpsCTRLvar.nodeSelected,
+                                fpsCTRLvar.currentlevel, fpsCTRLvar.directorynodeSelected,
+                                keywnode[fpsCTRLvar.directorynodeSelected].NBchild);
 
-                    TUI_printfw("   fps %d",
-                                fpsCTRLvar.fpsindexSelected
-                               );
+                    TUI_printfw("   fps %d", fpsCTRLvar.fpsindexSelected);
 
-                    TUI_printfw("   pindex %d ",
-                                keywnode[fpsCTRLvar.nodeSelected].pindex
-                               );
+                    TUI_printfw("   pindex %d ", keywnode[fpsCTRLvar.nodeSelected].pindex);
 
                     TUI_newline();
 
@@ -912,70 +739,55 @@ errno_t functionparameter_CTRLscreen(
                                  TUI_newline();
                     	*/
 
-
                     //while(!(fps[fpsindexSelected].parray[pindexSelected].fpflag & FPFLAG_VISIBLE)) { // if invisible
                     //		fpsCTRLvar.GUIlineSelected[fpsCTRLvar.currentlevel]++;
                     //}
 
                     //if(!(fps[fpsindex].parray[pindex].fpflag & FPFLAG_VISIBLE)) { // if invisible
 
-
                     //              if( !(  fps[keywnode[fpsCTRLvar.nodeSelected].fpsindex].parray[keywnode[fpsCTRLvar.nodeSelected].pindex].fpflag & FPFLAG_VISIBLE)) { // if invisible
                     //				if( !(  fps[fpsCTRLvar.fpsindexSelected].parray[fpsCTRLvar.pindexSelected].fpflag & FPFLAG_VISIBLE)) { // if invisible
-                    if(!(data.fpsarray[fpsCTRLvar.fpsindexSelected].parray[0].fpflag &
-                            FPFLAG_VISIBLE))      // if invisible
+                    if (!(data.fpsarray[fpsCTRLvar.fpsindexSelected].parray[0].fpflag & FPFLAG_VISIBLE)) // if invisible
                     {
-                        if(fpsCTRLvar.direction > 0)
+                        if (fpsCTRLvar.direction > 0)
                         {
-                            fpsCTRLvar.GUIlineSelected[fpsCTRLvar.currentlevel] ++;
+                            fpsCTRLvar.GUIlineSelected[fpsCTRLvar.currentlevel]++;
                         }
                         else
                         {
-                            fpsCTRLvar.GUIlineSelected[fpsCTRLvar.currentlevel] --;
+                            fpsCTRLvar.GUIlineSelected[fpsCTRLvar.currentlevel]--;
                         }
                     }
 
-
-
-                    while(fpsCTRLvar.GUIlineSelected[fpsCTRLvar.currentlevel] >
-                            keywnode[fpsCTRLvar.directorynodeSelected].NBchild - 1)
+                    while (fpsCTRLvar.GUIlineSelected[fpsCTRLvar.currentlevel] >
+                           keywnode[fpsCTRLvar.directorynodeSelected].NBchild - 1)
                     {
                         fpsCTRLvar.GUIlineSelected[fpsCTRLvar.currentlevel]--;
                     }
 
-
-
                     int child_index[MAXNBLEVELS];
-                    for(level = 0; level < MAXNBLEVELS ; level ++)
+                    for (level = 0; level < MAXNBLEVELS; level++)
                     {
                         child_index[level] = 0;
                     }
 
-
-
-
-                    for(int GUIline = 0;
-                            GUIline < GUIlineMax;
-                            GUIline++)   // GUIline is the line number on GUI display
+                    for (int GUIline = 0; GUIline < GUIlineMax; GUIline++) // GUIline is the line number on GUI display
                     {
 
-
-                        for(level = 0; level < fpsCTRLvar.currentlevel; level ++)
+                        for (level = 0; level < fpsCTRLvar.currentlevel; level++)
                         {
 
-                            if(GUIline < keywnode[nodechain[level]].NBchild)
+                            if (GUIline < keywnode[nodechain[level]].NBchild)
                             {
                                 int snode = 0; // selected node
                                 int knodeindex;
 
                                 knodeindex = keywnode[nodechain[level]].child[GUIline];
 
-
                                 //TODO: adjust len to string
                                 char pword[100];
 
-
-                                if(level == 0)
+                                if (level == 0)
                                 {
                                     DEBUG_TRACEPOINT("provide a fps status summary if at root");
                                     fpsindex = keywnode[knodeindex].fpsindex;
@@ -985,33 +797,33 @@ errno_t functionparameter_CTRLscreen(
                                 // toggle highlight if node is in the chain
                                 int v1 = keywnode[nodechain[level]].child[GUIline];
                                 int v2 = nodechain[level + 1];
-                                if(v1 == v2)
+                                if (v1 == v2)
                                 {
                                     snode = 1;
                                     screenprint_setreverse();
                                 }
 
                                 // color node if directory
-                                if(keywnode[knodeindex].leaf == 0)
+                                if (keywnode[knodeindex].leaf == 0)
                                 {
                                     screenprint_setcolor(5);
                                 }
 
                                 // print keyword
-                                if(snprintf(pword, 10, "%s",
-                                            keywnode[keywnode[nodechain[level]].child[GUIline]].keyword[level]) < 0)
+                                if (snprintf(pword, 10, "%s",
+                                             keywnode[keywnode[nodechain[level]].child[GUIline]].keyword[level]) < 0)
                                 {
                                     PRINT_ERROR("snprintf error");
                                 }
                                 TUI_printfw("%-10s ", pword);
 
-                                if(keywnode[knodeindex].leaf == 0)   // directory
+                                if (keywnode[knodeindex].leaf == 0) // directory
                                 {
                                     screenprint_unsetcolor(5);
                                 }
 
                                 screenprint_setreverse();
-                                if(snode == 1)
+                                if (snode == 1)
                                 {
                                     TUI_printfw(">");
                                 }
@@ -1021,11 +833,10 @@ errno_t functionparameter_CTRLscreen(
                                 }
                                 screenprint_unsetreverse();
                                 screenprint_setnormal();
-
                             }
-                            else     // blank space
+                            else // blank space
                             {
-                                if(level == 0)
+                                if (level == 0)
                                 {
                                     TUI_printfw("                    ");
                                 }
@@ -1033,20 +844,14 @@ errno_t functionparameter_CTRLscreen(
                             }
                         }
 
-
-
-
-
-
                         int knodeindex;
-                        knodeindex =
-                            keywnode[fpsCTRLvar.directorynodeSelected].child[child_index[level]];
-                        if(knodeindex < fpsCTRLvar.NBkwn)
+                        knodeindex = keywnode[fpsCTRLvar.directorynodeSelected].child[child_index[level]];
+                        if (knodeindex < fpsCTRLvar.NBkwn)
                         {
                             fpsindex = keywnode[knodeindex].fpsindex;
                             pindex = keywnode[knodeindex].pindex;
 
-                            if(child_index[level] > keywnode[fpsCTRLvar.directorynodeSelected].NBchild - 1)
+                            if (child_index[level] > keywnode[fpsCTRLvar.directorynodeSelected].NBchild - 1)
                             {
                                 child_index[level] = keywnode[fpsCTRLvar.directorynodeSelected].NBchild - 1;
                             }
@@ -1069,10 +874,10 @@ errno_t functionparameter_CTRLscreen(
 
                             DEBUG_TRACEPOINT(" ");
 
-                            if(child_index[level] < keywnode[fpsCTRLvar.directorynodeSelected].NBchild)
+                            if (child_index[level] < keywnode[fpsCTRLvar.directorynodeSelected].NBchild)
                             {
 
-                                if(fpsCTRLvar.currentlevel > 0)
+                                if (fpsCTRLvar.currentlevel > 0)
                                 {
                                     screenprint_setreverse();
                                     TUI_printfw(" ");
@@ -1081,10 +886,10 @@ errno_t functionparameter_CTRLscreen(
 
                                 DEBUG_TRACEPOINT(" ");
 
-                                if(keywnode[knodeindex].leaf == 0)   // If this is a directory
+                                if (keywnode[knodeindex].leaf == 0) // If this is a directory
                                 {
                                     DEBUG_TRACEPOINT(" ");
-                                    if(fpsCTRLvar.currentlevel == 0)   // provide a status summary if at root
+                                    if (fpsCTRLvar.currentlevel == 0) // provide a status summary if at root
                                     {
                                         DEBUG_TRACEPOINT(" ");
 
@@ -1092,42 +897,42 @@ errno_t functionparameter_CTRLscreen(
                                         pid_t pid;
 
                                         pid = data.fpsarray[fpsindex].md->confpid;
-                                        if((getpgid(pid) >= 0) && (pid > 0))
+                                        if ((getpgid(pid) >= 0) && (pid > 0))
                                         {
                                             screenprint_setcolor(2);
-                                            TUI_printfw("%07d ", (int) pid);
+                                            TUI_printfw("%07d ", (int)pid);
                                             screenprint_unsetcolor(2);
                                         }
-                                        else     // PID not active
+                                        else // PID not active
                                         {
-                                            if(data.fpsarray[fpsindex].md->status &
-                                                    FUNCTION_PARAMETER_STRUCT_STATUS_CMDCONF)
+                                            if (data.fpsarray[fpsindex].md->status &
+                                                FUNCTION_PARAMETER_STRUCT_STATUS_CMDCONF)
                                             {
                                                 // not clean exit
                                                 screenprint_setcolor(4);
-                                                TUI_printfw("%07d ", (int) pid);
+                                                TUI_printfw("%07d ", (int)pid);
                                                 screenprint_unsetcolor(4);
                                             }
                                             else
                                             {
                                                 // All OK
-                                                TUI_printfw("%07d ", (int) pid);
+                                                TUI_printfw("%07d ", (int)pid);
                                             }
                                         }
 
-                                        if(data.fpsarray[fpsindex].md->conferrcnt > 99)
+                                        if (data.fpsarray[fpsindex].md->conferrcnt > 99)
                                         {
                                             screenprint_setcolor(4);
                                             TUI_printfw("[XX]");
                                             screenprint_unsetcolor(4);
                                         }
-                                        if(data.fpsarray[fpsindex].md->conferrcnt > 0)
+                                        if (data.fpsarray[fpsindex].md->conferrcnt > 0)
                                         {
                                             screenprint_setcolor(4);
                                             TUI_printfw("[%02d]", data.fpsarray[fpsindex].md->conferrcnt);
                                             screenprint_unsetcolor(4);
                                         }
-                                        if(data.fpsarray[fpsindex].md->conferrcnt == 0)
+                                        if (data.fpsarray[fpsindex].md->conferrcnt == 0)
                                         {
                                             screenprint_setcolor(2);
                                             TUI_printfw("[%02d]", data.fpsarray[fpsindex].md->conferrcnt);
@@ -1135,49 +940,45 @@ errno_t functionparameter_CTRLscreen(
                                         }
 
                                         pid = data.fpsarray[fpsindex].md->runpid;
-                                        if((getpgid(pid) >= 0) && (pid > 0))
+                                        if ((getpgid(pid) >= 0) && (pid > 0))
                                         {
                                             screenprint_setcolor(2);
-                                            TUI_printfw("%07d ", (int) pid);
+                                            TUI_printfw("%07d ", (int)pid);
                                             screenprint_unsetcolor(2);
                                         }
                                         else
                                         {
-                                            if(data.fpsarray[fpsindex].md->status & FUNCTION_PARAMETER_STRUCT_STATUS_CMDRUN)
+                                            if (data.fpsarray[fpsindex].md->status &
+                                                FUNCTION_PARAMETER_STRUCT_STATUS_CMDRUN)
                                             {
                                                 // not clean exit
                                                 screenprint_setcolor(4);
-                                                TUI_printfw("%07d ", (int) pid);
+                                                TUI_printfw("%07d ", (int)pid);
                                                 screenprint_unsetcolor(4);
                                             }
                                             else
                                             {
                                                 // All OK
-                                                TUI_printfw("%07d ", (int) pid);
+                                                TUI_printfw("%07d ", (int)pid);
                                             }
                                         }
                                     }
 
-
-
-
-
-                                    if(GUIline == fpsCTRLvar.GUIlineSelected[fpsCTRLvar.currentlevel])
+                                    if (GUIline == fpsCTRLvar.GUIlineSelected[fpsCTRLvar.currentlevel])
                                     {
                                         screenprint_setreverse();
                                         fpsCTRLvar.nodeSelected = knodeindex;
                                         fpsCTRLvar.fpsindexSelected = keywnode[knodeindex].fpsindex;
                                     }
 
-
-                                    if(child_index[level + 1] < keywnode[fpsCTRLvar.directorynodeSelected].NBchild)
+                                    if (child_index[level + 1] < keywnode[fpsCTRLvar.directorynodeSelected].NBchild)
                                     {
                                         screenprint_setcolor(5);
                                         level = keywnode[knodeindex].keywordlevel;
                                         TUI_printfw("%-16s", keywnode[knodeindex].keyword[level - 1]);
                                         screenprint_unsetcolor(5);
 
-                                        if(GUIline == fpsCTRLvar.GUIlineSelected[fpsCTRLvar.currentlevel])
+                                        if (GUIline == fpsCTRLvar.GUIlineSelected[fpsCTRLvar.currentlevel])
                                         {
                                             screenprint_unsetreverse();
                                         }
@@ -1187,39 +988,33 @@ errno_t functionparameter_CTRLscreen(
                                         TUI_printfw("%-16s", " ");
                                     }
 
-
                                     DEBUG_TRACEPOINT(" ");
-
                                 }
-                                else   // If this is a parameter
+                                else // If this is a parameter
                                 {
                                     DEBUG_TRACEPOINT(" ");
                                     fpsindex = keywnode[knodeindex].fpsindex;
                                     pindex = keywnode[knodeindex].pindex;
 
-
-
-
                                     DEBUG_TRACEPOINT(" ");
                                     int isVISIBLE = 1;
-                                    if(!(data.fpsarray[fpsindex].parray[pindex].fpflag &
-                                            FPFLAG_VISIBLE))   // if invisible
+                                    if (!(data.fpsarray[fpsindex].parray[pindex].fpflag &
+                                          FPFLAG_VISIBLE)) // if invisible
                                     {
                                         isVISIBLE = 0;
                                         screenprint_setdim();
                                         screenprint_setblink();
                                     }
 
-
                                     //int kl;
 
-                                    if(GUIline == fpsCTRLvar.GUIlineSelected[fpsCTRLvar.currentlevel])
+                                    if (GUIline == fpsCTRLvar.GUIlineSelected[fpsCTRLvar.currentlevel])
                                     {
                                         fpsCTRLvar.pindexSelected = keywnode[knodeindex].pindex;
                                         fpsCTRLvar.fpsindexSelected = keywnode[knodeindex].fpsindex;
                                         fpsCTRLvar.nodeSelected = knodeindex;
 
-                                        if(isVISIBLE == 1)
+                                        if (isVISIBLE == 1)
                                         {
                                             screenprint_setcolor(10);
                                             screenprint_setbold();
@@ -1227,9 +1022,9 @@ errno_t functionparameter_CTRLscreen(
                                     }
                                     DEBUG_TRACEPOINT(" ");
 
-                                    if(isVISIBLE == 1)
+                                    if (isVISIBLE == 1)
                                     {
-                                        if(data.fpsarray[fpsindex].parray[pindex].fpflag & FPFLAG_WRITESTATUS)
+                                        if (data.fpsarray[fpsindex].parray[pindex].fpflag & FPFLAG_WRITESTATUS)
                                         {
                                             screenprint_setcolor(10);
                                             screenprint_setblink();
@@ -1254,15 +1049,14 @@ errno_t functionparameter_CTRLscreen(
                                     DEBUG_TRACEPOINT(" ");
                                     level = keywnode[knodeindex].keywordlevel;
 
-                                    if(GUIline == fpsCTRLvar.GUIlineSelected[fpsCTRLvar.currentlevel])
+                                    if (GUIline == fpsCTRLvar.GUIlineSelected[fpsCTRLvar.currentlevel])
                                     {
                                         screenprint_setreverse();
                                     }
 
-                                    TUI_printfw(" %-20s", data.fpsarray[fpsindex].parray[pindex].keyword[level -
-                                                1]);
+                                    TUI_printfw(" %-20s", data.fpsarray[fpsindex].parray[pindex].keyword[level - 1]);
 
-                                    if(GUIline == fpsCTRLvar.GUIlineSelected[fpsCTRLvar.currentlevel])
+                                    if (GUIline == fpsCTRLvar.GUIlineSelected[fpsCTRLvar.currentlevel])
                                     {
                                         screenprint_unsetcolor(10);
                                         screenprint_unsetreverse();
@@ -1274,77 +1068,76 @@ errno_t functionparameter_CTRLscreen(
 
                                     int paramsync = 1; // parameter is synchronized
 
-                                    if(data.fpsarray[fpsindex].parray[pindex].fpflag &
-                                            FPFLAG_ERROR)   // parameter setting error
+                                    if (data.fpsarray[fpsindex].parray[pindex].fpflag &
+                                        FPFLAG_ERROR) // parameter setting error
                                     {
-                                        if(isVISIBLE == 1)
+                                        if (isVISIBLE == 1)
                                         {
                                             screenprint_setcolor(4);
                                         }
                                     }
 
-                                    if(data.fpsarray[fpsindex].parray[pindex].type == FPTYPE_UNDEF)
+                                    if (data.fpsarray[fpsindex].parray[pindex].type == FPTYPE_UNDEF)
                                     {
                                         TUI_printfw("  %s", "-undef-");
                                     }
 
                                     DEBUG_TRACEPOINT(" ");
 
-
                                     // integer types
                                     {
                                         long val0 = 0;
                                         long val3 = 0;
                                         int intflag = 0; // toggles to 1 if int type
-                                        switch(data.fpsarray[fpsindex].parray[pindex].type)
+                                        switch (data.fpsarray[fpsindex].parray[pindex].type)
                                         {
-                                            case FPTYPE_INT32:
-                                                val0 = data.fpsarray[fpsindex].parray[pindex].val.i32[0];
-                                                val3 = data.fpsarray[fpsindex].parray[pindex].val.i32[3];
-                                                intflag = 1;
-                                                break;
-                                            case FPTYPE_UINT32:
-                                                val0 = data.fpsarray[fpsindex].parray[pindex].val.ui32[0];
-                                                val3 = data.fpsarray[fpsindex].parray[pindex].val.ui32[3];
-                                                intflag = 1;
-                                                break;
-                                            case FPTYPE_INT64:
-                                                val0 = data.fpsarray[fpsindex].parray[pindex].val.i64[0];
-                                                val3 = data.fpsarray[fpsindex].parray[pindex].val.i64[3];
-                                                intflag = 1;
-                                                break;
-                                            case FPTYPE_UINT64:
-                                                val0 = data.fpsarray[fpsindex].parray[pindex].val.ui64[0];
-                                                val3 = data.fpsarray[fpsindex].parray[pindex].val.ui64[3];
-                                                intflag = 1;
-                                                break;
+                                        case FPTYPE_INT32:
+                                            val0 = data.fpsarray[fpsindex].parray[pindex].val.i32[0];
+                                            val3 = data.fpsarray[fpsindex].parray[pindex].val.i32[3];
+                                            intflag = 1;
+                                            break;
+                                        case FPTYPE_UINT32:
+                                            val0 = data.fpsarray[fpsindex].parray[pindex].val.ui32[0];
+                                            val3 = data.fpsarray[fpsindex].parray[pindex].val.ui32[3];
+                                            intflag = 1;
+                                            break;
+                                        case FPTYPE_INT64:
+                                            val0 = data.fpsarray[fpsindex].parray[pindex].val.i64[0];
+                                            val3 = data.fpsarray[fpsindex].parray[pindex].val.i64[3];
+                                            intflag = 1;
+                                            break;
+                                        case FPTYPE_UINT64:
+                                            val0 = data.fpsarray[fpsindex].parray[pindex].val.ui64[0];
+                                            val3 = data.fpsarray[fpsindex].parray[pindex].val.ui64[3];
+                                            intflag = 1;
+                                            break;
                                         }
 
-                                        if(intflag == 1)
+                                        if (intflag == 1)
                                         {
-                                            if(data.fpsarray[fpsindex].parray[pindex].fpflag & FPFLAG_FEEDBACK)
+                                            if (data.fpsarray[fpsindex].parray[pindex].fpflag & FPFLAG_FEEDBACK)
                                             {
                                                 // Check value feedback if available
-                                                if(!(data.fpsarray[fpsindex].parray[pindex].fpflag & FPFLAG_ERROR))
-                                                    if(val0 != val3)
+                                                if (!(data.fpsarray[fpsindex].parray[pindex].fpflag & FPFLAG_ERROR))
+                                                    if (val0 != val3)
                                                     {
                                                         paramsync = 0;
                                                     }
                                             }
 
-                                            if(paramsync == 0)
+                                            if (paramsync == 0)
                                             {
-                                                if(isVISIBLE == 1)
+                                                if (isVISIBLE == 1)
                                                 {
                                                     screenprint_setcolor(3);
                                                 }
                                             }
 
-                                            TUI_printfw("  %10d", (int) val0);
+                                            TUI_printfw("  %10d", (int)val0);
 
-                                            if(paramsync == 0)
+                                            if (paramsync == 0)
                                             {
-                                                if(isVISIBLE == 1)
+                                                if (isVISIBLE == 1)
                                                 {
                                                     screenprint_unsetcolor(3);
                                                 }
@@ -1354,31 +1147,30 @@ errno_t functionparameter_CTRLscreen(
 
                                     DEBUG_TRACEPOINT(" ");
 
-
                                     // float types
                                     {
                                         double val0 = 0.0;
                                         double val3 = 0.0;
                                         int floatflag = 0; // toggles to 1 if int type
-                                        switch(data.fpsarray[fpsindex].parray[pindex].type)
+                                        switch (data.fpsarray[fpsindex].parray[pindex].type)
                                         {
-                                            case FPTYPE_FLOAT32:
-                                                val0 = data.fpsarray[fpsindex].parray[pindex].val.f32[0];
-                                                val3 = data.fpsarray[fpsindex].parray[pindex].val.f32[3];
-                                                floatflag = 1;
-                                                break;
-                                            case FPTYPE_FLOAT64:
-                                                val0 = data.fpsarray[fpsindex].parray[pindex].val.f64[0];
-                                                val3 = data.fpsarray[fpsindex].parray[pindex].val.f64[3];
-                                                floatflag = 1;
-                                                break;
+                                        case FPTYPE_FLOAT32:
+                                            val0 = data.fpsarray[fpsindex].parray[pindex].val.f32[0];
+                                            val3 = data.fpsarray[fpsindex].parray[pindex].val.f32[3];
+                                            floatflag = 1;
+                                            break;
+                                        case FPTYPE_FLOAT64:
+                                            val0 = data.fpsarray[fpsindex].parray[pindex].val.f64[0];
+                                            val3 = data.fpsarray[fpsindex].parray[pindex].val.f64[3];
+                                            floatflag = 1;
+                                            break;
                                         }
 
-                                        if(floatflag == 1)
+                                        if (floatflag == 1)
                                         {
-                                            if(data.fpsarray[fpsindex].parray[pindex].fpflag &
-                                                    FPFLAG_FEEDBACK)   // Check value feedback if available
-                                                if(!(data.fpsarray[fpsindex].parray[pindex].fpflag & FPFLAG_ERROR))
+                                            if (data.fpsarray[fpsindex].parray[pindex].fpflag &
+                                                FPFLAG_FEEDBACK) // Check value feedback if available
+                                                if (!(data.fpsarray[fpsindex].parray[pindex].fpflag & FPFLAG_ERROR))
                                                 {
                                                     double absdiff;
                                                     double abssum;
@@ -1388,7 +1180,7 @@ errno_t functionparameter_CTRLscreen(
                                                     absdiff = fabs(val0 - val3);
                                                     abssum = fabs(val0) + fabs(val3);
 
-                                                    if((absdiff < epsrel * abssum) || (absdiff < epsabs))
+                                                    if ((absdiff < epsrel * abssum) || (absdiff < epsabs))
                                                     {
                                                         paramsync = 1;
                                                     }
@@ -1398,88 +1190,83 @@ errno_t functionparameter_CTRLscreen(
                                                     }
                                                 }
 
-                                            if(paramsync == 0)
+                                            if (paramsync == 0)
                                             {
-                                                if(isVISIBLE == 1)
+                                                if (isVISIBLE == 1)
                                                 {
                                                     screenprint_setcolor(3);
                                                 }
                                             }
 
-                                            TUI_printfw("  %10f", (float) val0);
+                                            TUI_printfw("  %10f", (float)val0);
 
-                                            if(paramsync == 0)
+                                            if (paramsync == 0)
                                             {
-                                                if(isVISIBLE == 1)
+                                                if (isVISIBLE == 1)
                                                 {
                                                     screenprint_unsetcolor(3);
                                                 }
                                             }
                                         }
-
                                     }
 
-
-
                                     DEBUG_TRACEPOINT(" ");
-                                    if(data.fpsarray[fpsindex].parray[pindex].type == FPTYPE_PID)
+                                    if (data.fpsarray[fpsindex].parray[pindex].type == FPTYPE_PID)
                                     {
-                                        if(data.fpsarray[fpsindex].parray[pindex].fpflag &
-                                                FPFLAG_FEEDBACK)   // Check value feedback if available
-                                            if(!(data.fpsarray[fpsindex].parray[pindex].fpflag & FPFLAG_ERROR))
-                                                if(data.fpsarray[fpsindex].parray[pindex].val.pid[0] !=
-                                                        data.fpsarray[fpsindex].parray[pindex].val.pid[1])
+                                        if (data.fpsarray[fpsindex].parray[pindex].fpflag &
+                                            FPFLAG_FEEDBACK) // Check value feedback if available
+                                            if (!(data.fpsarray[fpsindex].parray[pindex].fpflag & FPFLAG_ERROR))
+                                                if (data.fpsarray[fpsindex].parray[pindex].val.pid[0] !=
+                                                    data.fpsarray[fpsindex].parray[pindex].val.pid[1])
                                                 {
                                                     paramsync = 0;
                                                 }
 
-                                        if(paramsync == 0)
+                                        if (paramsync == 0)
                                         {
-                                            if(isVISIBLE == 1)
+                                            if (isVISIBLE == 1)
                                             {
                                                 screenprint_setcolor(3);
                                             }
                                         }
 
-                                        TUI_printfw("  %10d", (float)
-                                                    data.fpsarray[fpsindex].parray[pindex].val.pid[0]);
+                                        TUI_printfw("  %10d", (float)data.fpsarray[fpsindex].parray[pindex].val.pid[0]);
 
-                                        if(paramsync == 0)
+                                        if (paramsync == 0)
                                         {
-                                            if(isVISIBLE == 1)
+                                            if (isVISIBLE == 1)
                                             {
                                                 screenprint_unsetcolor(3);
                                             }
                                         }
 
-                                        TUI_printfw("  %10d", (int) data.fpsarray[fpsindex].parray[pindex].val.pid[0]);
+                                        TUI_printfw("  %10d", (int)data.fpsarray[fpsindex].parray[pindex].val.pid[0]);
                                     }
 
-
                                     DEBUG_TRACEPOINT(" ");
 
-                                    if(data.fpsarray[fpsindex].parray[pindex].type == FPTYPE_TIMESPEC)
+                                    if (data.fpsarray[fpsindex].parray[pindex].type == FPTYPE_TIMESPEC)
                                     {
                                         TUI_printfw("  %10f",
-                                                    1.0 * data.fpsarray[fpsindex].parray[pindex].val.ts[0].tv_sec + 1e-9 *
-                                                    data.fpsarray[fpsindex].parray[pindex].val.ts[0].tv_nsec);
+                                                    1.0 * data.fpsarray[fpsindex].parray[pindex].val.ts[0].tv_sec +
+                                                        1e-9 *
+                                                            data.fpsarray[fpsindex].parray[pindex].val.ts[0].tv_nsec);
                                     }
 
-
-                                    if(data.fpsarray[fpsindex].parray[pindex].type == FPTYPE_FILENAME)
+                                    if (data.fpsarray[fpsindex].parray[pindex].type == FPTYPE_FILENAME)
                                     {
-                                        if(data.fpsarray[fpsindex].parray[pindex].fpflag &
-                                                FPFLAG_FEEDBACK)   // Check value feedback if available
-                                            if(!(data.fpsarray[fpsindex].parray[pindex].fpflag & FPFLAG_ERROR))
-                                                if(strcmp(data.fpsarray[fpsindex].parray[pindex].val.string[0],
-                                                          data.fpsarray[fpsindex].parray[pindex].val.string[1]))
+                                        if (data.fpsarray[fpsindex].parray[pindex].fpflag &
+                                            FPFLAG_FEEDBACK) // Check value feedback if available
+                                            if (!(data.fpsarray[fpsindex].parray[pindex].fpflag & FPFLAG_ERROR))
+                                                if (strcmp(data.fpsarray[fpsindex].parray[pindex].val.string[0],
+                                                           data.fpsarray[fpsindex].parray[pindex].val.string[1]))
                                                 {
                                                     paramsync = 0;
                                                 }
 
-                                        if(paramsync == 0)
+                                        if (paramsync == 0)
                                         {
-                                            if(isVISIBLE == 1)
+                                            if (isVISIBLE == 1)
                                             {
                                                 screenprint_setcolor(3);
                                             }
@@ -1487,9 +1274,9 @@ errno_t functionparameter_CTRLscreen(
 
                                         TUI_printfw("  %10s", data.fpsarray[fpsindex].parray[pindex].val.string[0]);
 
-                                        if(paramsync == 0)
+                                        if (paramsync == 0)
                                         {
-                                            if(isVISIBLE == 1)
+                                            if (isVISIBLE == 1)
                                             {
                                                 screenprint_unsetcolor(3);
                                             }
@@ -1497,20 +1284,20 @@ errno_t functionparameter_CTRLscreen(
                                     }
                                     DEBUG_TRACEPOINT(" ");
 
-                                    if(data.fpsarray[fpsindex].parray[pindex].type == FPTYPE_FITSFILENAME)
+                                    if (data.fpsarray[fpsindex].parray[pindex].type == FPTYPE_FITSFILENAME)
                                     {
-                                        if(data.fpsarray[fpsindex].parray[pindex].fpflag &
-                                                FPFLAG_FEEDBACK)   // Check value feedback if available
-                                            if(!(data.fpsarray[fpsindex].parray[pindex].fpflag & FPFLAG_ERROR))
-                                                if(strcmp(data.fpsarray[fpsindex].parray[pindex].val.string[0],
-                                                          data.fpsarray[fpsindex].parray[pindex].val.string[1]))
+                                        if (data.fpsarray[fpsindex].parray[pindex].fpflag &
+                                            FPFLAG_FEEDBACK) // Check value feedback if available
+                                            if (!(data.fpsarray[fpsindex].parray[pindex].fpflag & FPFLAG_ERROR))
+                                                if (strcmp(data.fpsarray[fpsindex].parray[pindex].val.string[0],
+                                                           data.fpsarray[fpsindex].parray[pindex].val.string[1]))
                                                 {
                                                     paramsync = 0;
                                                 }
 
-                                        if(paramsync == 0)
+                                        if (paramsync == 0)
                                         {
-                                            if(isVISIBLE == 1)
+                                            if (isVISIBLE == 1)
                                             {
                                                 screenprint_setcolor(3);
                                             }
@@ -1518,29 +1305,29 @@ errno_t functionparameter_CTRLscreen(
 
                                         TUI_printfw("  %10s", data.fpsarray[fpsindex].parray[pindex].val.string[0]);
 
-                                        if(paramsync == 0)
+                                        if (paramsync == 0)
                                         {
-                                            if(isVISIBLE == 1)
+                                            if (isVISIBLE == 1)
                                             {
                                                 screenprint_unsetcolor(3);
                                             }
                                         }
                                     }
                                     DEBUG_TRACEPOINT(" ");
-                                    if(data.fpsarray[fpsindex].parray[pindex].type == FPTYPE_EXECFILENAME)
+                                    if (data.fpsarray[fpsindex].parray[pindex].type == FPTYPE_EXECFILENAME)
                                     {
-                                        if(data.fpsarray[fpsindex].parray[pindex].fpflag &
-                                                FPFLAG_FEEDBACK)   // Check value feedback if available
-                                            if(!(data.fpsarray[fpsindex].parray[pindex].fpflag & FPFLAG_ERROR))
-                                                if(strcmp(data.fpsarray[fpsindex].parray[pindex].val.string[0],
-                                                          data.fpsarray[fpsindex].parray[pindex].val.string[1]))
+                                        if (data.fpsarray[fpsindex].parray[pindex].fpflag &
+                                            FPFLAG_FEEDBACK) // Check value feedback if available
+                                            if (!(data.fpsarray[fpsindex].parray[pindex].fpflag & FPFLAG_ERROR))
+                                                if (strcmp(data.fpsarray[fpsindex].parray[pindex].val.string[0],
+                                                           data.fpsarray[fpsindex].parray[pindex].val.string[1]))
                                                 {
                                                     paramsync = 0;
                                                 }
 
-                                        if(paramsync == 0)
+                                        if (paramsync == 0)
                                         {
-                                            if(isVISIBLE == 1)
+                                            if (isVISIBLE == 1)
                                             {
                                                 screenprint_setcolor(3);
                                             }
@@ -1548,29 +1335,29 @@ errno_t functionparameter_CTRLscreen(
 
                                         TUI_printfw("  %10s", data.fpsarray[fpsindex].parray[pindex].val.string[0]);
 
-                                        if(paramsync == 0)
+                                        if (paramsync == 0)
                                         {
-                                            if(isVISIBLE == 1)
+                                            if (isVISIBLE == 1)
                                             {
                                                 screenprint_unsetcolor(3);
                                             }
                                         }
                                     }
                                     DEBUG_TRACEPOINT(" ");
-                                    if(data.fpsarray[fpsindex].parray[pindex].type == FPTYPE_DIRNAME)
+                                    if (data.fpsarray[fpsindex].parray[pindex].type == FPTYPE_DIRNAME)
                                     {
-                                        if(data.fpsarray[fpsindex].parray[pindex].fpflag &
-                                                FPFLAG_FEEDBACK)   // Check value feedback if available
-                                            if(!(data.fpsarray[fpsindex].parray[pindex].fpflag & FPFLAG_ERROR))
-                                                if(strcmp(data.fpsarray[fpsindex].parray[pindex].val.string[0],
-                                                          data.fpsarray[fpsindex].parray[pindex].val.string[1]))
+                                        if (data.fpsarray[fpsindex].parray[pindex].fpflag &
+                                            FPFLAG_FEEDBACK) // Check value feedback if available
+                                            if (!(data.fpsarray[fpsindex].parray[pindex].fpflag & FPFLAG_ERROR))
+                                                if (strcmp(data.fpsarray[fpsindex].parray[pindex].val.string[0],
+                                                           data.fpsarray[fpsindex].parray[pindex].val.string[1]))
                                                 {
                                                     paramsync = 0;
                                                 }
 
-                                        if(paramsync == 0)
+                                        if (paramsync == 0)
                                         {
-                                            if(isVISIBLE == 1)
+                                            if (isVISIBLE == 1)
                                             {
                                                 screenprint_setcolor(3);
                                             }
@@ -1578,9 +1365,9 @@ errno_t functionparameter_CTRLscreen(
 
                                         TUI_printfw("  %10s", data.fpsarray[fpsindex].parray[pindex].val.string[0]);
 
-                                        if(paramsync == 0)
+                                        if (paramsync == 0)
                                         {
-                                            if(isVISIBLE == 1)
+                                            if (isVISIBLE == 1)
                                             {
                                                 screenprint_unsetcolor(3);
                                             }
@@ -1588,67 +1375,70 @@ errno_t functionparameter_CTRLscreen(
                                     }
 
                                     DEBUG_TRACEPOINT(" ");
-                                    if(data.fpsarray[fpsindex].parray[pindex].type == FPTYPE_STREAMNAME)
+                                    if (data.fpsarray[fpsindex].parray[pindex].type == FPTYPE_STREAMNAME)
                                     {
-                                        if(data.fpsarray[fpsindex].parray[pindex].fpflag &
-                                                FPFLAG_FEEDBACK)   // Check value feedback if available
-                                            if(!(data.fpsarray[fpsindex].parray[pindex].fpflag & FPFLAG_ERROR))
+                                        if (data.fpsarray[fpsindex].parray[pindex].fpflag &
+                                            FPFLAG_FEEDBACK) // Check value feedback if available
+                                            if (!(data.fpsarray[fpsindex].parray[pindex].fpflag & FPFLAG_ERROR))
                                                 //  if(strcmp(fps[fpsindex].parray[pindex].val.string[0], fps[fpsindex].parray[pindex].val.string[1])) {
                                                 //      paramsync = 0;
                                                 //  }
 
-                                                if(data.fpsarray[fpsindex].parray[pindex].info.stream.streamID > -1)
+                                                if (data.fpsarray[fpsindex].parray[pindex].info.stream.streamID > -1)
                                                 {
-                                                    if(isVISIBLE == 1)
+                                                    if (isVISIBLE == 1)
                                                     {
                                                         screenprint_setcolor(2);
                                                     }
                                                 }
 
-                                        TUI_printfw("[LOC %d]  %6s",
-                                                    data.fpsarray[fpsindex].parray[pindex].info.stream.stream_sourceLocation,
-                                                    data.fpsarray[fpsindex].parray[pindex].val.string[0]);
+                                        TUI_printfw(
+                                            "[LOC %d]  %6s",
+                                            data.fpsarray[fpsindex].parray[pindex].info.stream.stream_sourceLocation,
+                                            data.fpsarray[fpsindex].parray[pindex].val.string[0]);
 
-                                        if(data.fpsarray[fpsindex].parray[pindex].info.stream.streamID > -1)
+                                        if (data.fpsarray[fpsindex].parray[pindex].info.stream.streamID > -1)
                                         {
 
-                                            TUI_printfw(" [ %d",
-                                                        data.fpsarray[fpsindex].parray[pindex].info.stream.stream_xsize[0]);
-                                            if(data.fpsarray[fpsindex].parray[pindex].info.stream.stream_naxis[0] > 1)
+                                            TUI_printfw(
+                                                " [ %d",
+                                                data.fpsarray[fpsindex].parray[pindex].info.stream.stream_xsize[0]);
+                                            if (data.fpsarray[fpsindex].parray[pindex].info.stream.stream_naxis[0] > 1)
                                             {
-                                                TUI_printfw("x%d",
-                                                            data.fpsarray[fpsindex].parray[pindex].info.stream.stream_ysize[0]);
+                                                TUI_printfw(
+                                                    "x%d",
+                                                    data.fpsarray[fpsindex].parray[pindex].info.stream.stream_ysize[0]);
                                             }
-                                            if(data.fpsarray[fpsindex].parray[pindex].info.stream.stream_naxis[0] > 2)
+                                            if (data.fpsarray[fpsindex].parray[pindex].info.stream.stream_naxis[0] > 2)
                                             {
-                                                TUI_printfw("x%d",
-                                                            data.fpsarray[fpsindex].parray[pindex].info.stream.stream_zsize[0]);
+                                                TUI_printfw(
+                                                    "x%d",
+                                                    data.fpsarray[fpsindex].parray[pindex].info.stream.stream_zsize[0]);
                                             }
 
                                             TUI_printfw(" ]");
-                                            if(isVISIBLE == 1)
+                                            if (isVISIBLE == 1)
                                             {
                                                 screenprint_unsetcolor(2);
                                             }
                                         }
-
                                     }
                                     DEBUG_TRACEPOINT(" ");
 
-                                    if(data.fpsarray[fpsindex].parray[pindex].type == FPTYPE_STRING)
+                                    if (data.fpsarray[fpsindex].parray[pindex].type == FPTYPE_STRING)
                                     {
-                                        if(data.fpsarray[fpsindex].parray[pindex].fpflag &
-                                                FPFLAG_FEEDBACK)   // Check value feedback if available
-                                            if(!(data.fpsarray[fpsindex].parray[pindex].fpflag & FPFLAG_ERROR))
-                                                if(strcmp(data.fpsarray[fpsindex].parray[pindex].val.string[0],
-                                                          data.fpsarray[fpsindex].parray[pindex].val.string[1]))
+                                        if (data.fpsarray[fpsindex].parray[pindex].fpflag &
+                                            FPFLAG_FEEDBACK) // Check value feedback if available
+                                            if (!(data.fpsarray[fpsindex].parray[pindex].fpflag & FPFLAG_ERROR))
+                                                if (strcmp(data.fpsarray[fpsindex].parray[pindex].val.string[0],
+                                                           data.fpsarray[fpsindex].parray[pindex].val.string[1]))
                                                 {
                                                     paramsync = 0;
                                                 }
 
-                                        if(paramsync == 0)
+                                        if (paramsync == 0)
                                         {
-                                            if(isVISIBLE == 1)
+                                            if (isVISIBLE == 1)
                                             {
                                                 screenprint_setcolor(3);
                                             }
@@ -1656,9 +1446,9 @@ errno_t functionparameter_CTRLscreen(
 
                                         TUI_printfw("  %10s", data.fpsarray[fpsindex].parray[pindex].val.string[0]);
 
-                                        if(paramsync == 0)
+                                        if (paramsync == 0)
                                         {
-                                            if(isVISIBLE == 1)
+                                            if (isVISIBLE == 1)
                                             {
                                                 screenprint_unsetcolor(3);
                                             }
@@ -1666,9 +1456,9 @@ errno_t functionparameter_CTRLscreen(
                                     }
                                     DEBUG_TRACEPOINT(" ");
 
-                                    if(data.fpsarray[fpsindex].parray[pindex].type == FPTYPE_ONOFF)
+                                    if (data.fpsarray[fpsindex].parray[pindex].type == FPTYPE_ONOFF)
                                     {
-                                        if(data.fpsarray[fpsindex].parray[pindex].fpflag & FPFLAG_ONOFF)
+                                        if (data.fpsarray[fpsindex].parray[pindex].fpflag & FPFLAG_ONOFF)
                                         {
                                             screenprint_setcolor(2);
                                             TUI_printfw("  ON ");
@@ -1684,28 +1474,27 @@ errno_t functionparameter_CTRLscreen(
                                         }
                                     }
 
-
-                                    if(data.fpsarray[fpsindex].parray[pindex].type == FPTYPE_FPSNAME)
+                                    if (data.fpsarray[fpsindex].parray[pindex].type == FPTYPE_FPSNAME)
                                     {
-                                        if(data.fpsarray[fpsindex].parray[pindex].fpflag &
-                                                FPFLAG_FEEDBACK)   // Check value feedback if available
-                                            if(!(data.fpsarray[fpsindex].parray[pindex].fpflag & FPFLAG_ERROR))
-                                                if(strcmp(data.fpsarray[fpsindex].parray[pindex].val.string[0],
-                                                          data.fpsarray[fpsindex].parray[pindex].val.string[1]))
+                                        if (data.fpsarray[fpsindex].parray[pindex].fpflag &
+                                            FPFLAG_FEEDBACK) // Check value feedback if available
+                                            if (!(data.fpsarray[fpsindex].parray[pindex].fpflag & FPFLAG_ERROR))
+                                                if (strcmp(data.fpsarray[fpsindex].parray[pindex].val.string[0],
+                                                           data.fpsarray[fpsindex].parray[pindex].val.string[1]))
                                                 {
                                                     paramsync = 0;
                                                 }
 
-                                        if(paramsync == 0)
+                                        if (paramsync == 0)
                                         {
-                                            if(isVISIBLE == 1)
+                                            if (isVISIBLE == 1)
                                             {
                                                 screenprint_setcolor(2);
                                             }
                                         }
                                         else
                                         {
-                                            if(isVISIBLE == 1)
+                                            if (isVISIBLE == 1)
                                             {
                                                 screenprint_setcolor(4);
                                             }
@@ -1717,29 +1506,28 @@ errno_t functionparameter_CTRLscreen(
                                                     data.fpsarray[fpsindex].parray[pindex].info.fps.FPSNBparamActive,
                                                     data.fpsarray[fpsindex].parray[pindex].info.fps.FPSNBparamUsed);
 
-                                        if(paramsync == 0)
+                                        if (paramsync == 0)
                                         {
-                                            if(isVISIBLE == 1)
+                                            if (isVISIBLE == 1)
                                             {
                                                 screenprint_unsetcolor(2);
                                             }
                                         }
                                         else
                                         {
-                                            if(isVISIBLE == 1)
+                                            if (isVISIBLE == 1)
                                             {
                                                 screenprint_unsetcolor(4);
                                             }
                                         }
-
                                     }
 
                                     DEBUG_TRACEPOINT(" ");
 
-                                    if(data.fpsarray[fpsindex].parray[pindex].fpflag &
-                                            FPFLAG_ERROR)   // parameter setting error
+                                    if (data.fpsarray[fpsindex].parray[pindex].fpflag &
+                                        FPFLAG_ERROR) // parameter setting error
                                     {
-                                        if(isVISIBLE == 1)
+                                        if (isVISIBLE == 1)
                                         {
                                             screenprint_unsetcolor(4);
                                         }
@@ -1747,35 +1535,28 @@ errno_t functionparameter_CTRLscreen(
 
                                     TUI_printfw("    %s", data.fpsarray[fpsindex].parray[pindex].description);
 
-
-
-                                    if(GUIline == fpsCTRLvar.GUIlineSelected[fpsCTRLvar.currentlevel])
+                                    if (GUIline == fpsCTRLvar.GUIlineSelected[fpsCTRLvar.currentlevel])
                                     {
-                                        if(isVISIBLE == 1)
+                                        if (isVISIBLE == 1)
                                         {
                                             screenprint_unsetbold();
                                         }
                                     }
 
-
-                                    if(isVISIBLE == 0)
+                                    if (isVISIBLE == 0)
                                     {
                                         screenprint_unsetblink();
                                         screenprint_unsetdim();
                                     }
                                     // END LOOP
-
-
                                 }
 
-
                                 DEBUG_TRACEPOINT(" ");
                                 icnt++;
 
-
-                                for(level = 0; level < MAXNBLEVELS ; level ++)
+                                for (level = 0; level < MAXNBLEVELS; level++)
                                 {
-                                    child_index[level] ++;
+                                    child_index[level]++;
                                 }
                             }
                         }
@@ -1787,8 +1568,7 @@ errno_t functionparameter_CTRLscreen(
 
                     fpsCTRLvar.NBindex = icnt;
 
-                    if(fpsCTRLvar.GUIlineSelected[fpsCTRLvar.currentlevel] > fpsCTRLvar.NBindex -
-                            1)
+                    if (fpsCTRLvar.GUIlineSelected[fpsCTRLvar.currentlevel] > fpsCTRLvar.NBindex - 1)
                     {
                         fpsCTRLvar.GUIlineSelected[fpsCTRLvar.currentlevel] = fpsCTRLvar.NBindex - 1;
                     }
@@ -1797,8 +1577,8 @@ errno_t functionparameter_CTRLscreen(
 
                     TUI_newline();
 
-                    if(data.fpsarray[fpsCTRLvar.fpsindexSelected].md->status &
-                            FUNCTION_PARAMETER_STRUCT_STATUS_CHECKOK)
+                    if (data.fpsarray[fpsCTRLvar.fpsindexSelected].md->status &
+                        FUNCTION_PARAMETER_STRUCT_STATUS_CHECKOK)
                     {
                         screenprint_setcolor(2);
                         TUI_printfw("[%ld] PARAMETERS OK - RUN function good to go",
@@ -1819,8 +1599,7 @@ errno_t functionparameter_CTRLscreen(
 
                         screenprint_setbold();
 
-                        for(msgi = 0; msgi < data.fpsarray[fpsCTRLvar.fpsindexSelected].md->msgcnt;
-                                msgi++)
+                        for (msgi = 0; msgi < data.fpsarray[fpsCTRLvar.fpsindexSelected].md->msgcnt; msgi++)
                         {
                             pindex = data.fpsarray[fpsCTRLvar.fpsindexSelected].md->msgpindex[msgi];
                             TUI_printfw("%-40s %s",
@@ -1832,14 +1611,13 @@ errno_t functionparameter_CTRLscreen(
                         screenprint_unsetbold();
                     }
 
-
                     DEBUG_TRACEPOINT(" ");
                 }
             }
 
             DEBUG_TRACEPOINT(" ");
 
-            if(fpsCTRLvar.fpsCTRL_DisplayMode == 3)   // Task scheduler status
+            if (fpsCTRLvar.fpsCTRL_DisplayMode == 3) // Task scheduler status
             {
                 struct timespec tnow;
                 struct timespec tdiff;
@@ -1848,30 +1626,29 @@ errno_t functionparameter_CTRLscreen(
 
                 //int dispcnt = 0;
 
-
                 // Sort entries from most recent to most ancient, using inputindex
                 DEBUG_TRACEPOINT(" ");
 
                 double *sort_evalarray;
-                sort_evalarray = (double *) malloc(sizeof(double) * NB_FPSCTRL_TASK_MAX);
-                if(sort_evalarray == NULL)
+                sort_evalarray = (double *)malloc(sizeof(double) * NB_FPSCTRL_TASK_MAX);
+                if (sort_evalarray == NULL)
                 {
                     PRINT_ERROR("malloc error");
                     abort();
                 }
 
                 long *sort_indexarray;
-                sort_indexarray = (long *) malloc(sizeof(long) * NB_FPSCTRL_TASK_MAX);
-                if(sort_indexarray == NULL)
+                sort_indexarray = (long *)malloc(sizeof(long) * NB_FPSCTRL_TASK_MAX);
+                if (sort_indexarray == NULL)
                 {
                     PRINT_ERROR("malloc error");
                     abort();
                 }
 
                 long sortcnt = 0;
-                for(int fpscmdindex = 0; fpscmdindex < NB_FPSCTRL_TASK_MAX; fpscmdindex++)
+                for (int fpscmdindex = 0; fpscmdindex < NB_FPSCTRL_TASK_MAX; fpscmdindex++)
                 {
-                    if(fpsctrltasklist[fpscmdindex].status & FPSTASK_STATUS_SHOW)
+                    if (fpsctrltasklist[fpscmdindex].status & FPSTASK_STATUS_SHOW)
                     {
                         sort_evalarray[sortcnt] = -1.0 * fpsctrltasklist[fpscmdindex].inputindex;
                         sort_indexarray[sortcnt] = fpscmdindex;
@@ -1879,7 +1656,7 @@ errno_t functionparameter_CTRLscreen(
                     }
                 }
                 DEBUG_TRACEPOINT(" ");
-                if(sortcnt > 0)
+                if (sortcnt > 0)
                 {
                     quick_sort2l(sort_evalarray, sort_indexarray, sortcnt);
                 }
@@ -1887,78 +1664,67 @@ errno_t functionparameter_CTRLscreen(
 
                 DEBUG_TRACEPOINT(" ");
 
-
                 TUI_printfw(" showing   %d / %d  tasks", wrow - 8, sortcnt);
                 TUI_newline();
 
-                for(int sortindex = 0; sortindex < sortcnt; sortindex++)
+                for (int sortindex = 0; sortindex < sortcnt; sortindex++)
                 {
 
-
                     DEBUG_TRACEPOINT("iteration %d / %ld", sortindex, sortcnt);
 
                     int fpscmdindex = sort_indexarray[sortindex];
 
                     DEBUG_TRACEPOINT("fpscmdindex = %d", fpscmdindex);
 
-                    if(sortindex < wrow - 8)   // display
+                    if (sortindex < wrow - 8) // display
                     {
                         int attron2 = 0;
                         int attrbold = 0;
 
-
-                        if(fpsctrltasklist[fpscmdindex].status &
-                                FPSTASK_STATUS_RUNNING)   // task is running
+                        if (fpsctrltasklist[fpscmdindex].status & FPSTASK_STATUS_RUNNING) // task is running
                         {
                             attron2 = 1;
                             screenprint_setcolor(2);
                         }
-                        else if(fpsctrltasklist[fpscmdindex].status &
-                                FPSTASK_STATUS_ACTIVE)      // task is queued to run
+                        else if (fpsctrltasklist[fpscmdindex].status & FPSTASK_STATUS_ACTIVE) // task is queued to run
                         {
                             attrbold = 1;
                             screenprint_setbold();
                         }
 
-
-
                         // measure age since submission
-                        tdiff =  timespec_diff(fpsctrltasklist[fpscmdindex].creationtime, tnow);
+                        tdiff = timespec_diff(fpsctrltasklist[fpscmdindex].creationtime, tnow);
                         double tdiffv = 1.0 * tdiff.tv_sec + 1.0e-9 * tdiff.tv_nsec;
                         TUI_printfw("%6.2f s ", tdiffv);
 
-                        if(fpsctrltasklist[fpscmdindex].status &
-                                FPSTASK_STATUS_RUNNING)   // run time (ongoing)
+                        if (fpsctrltasklist[fpscmdindex].status & FPSTASK_STATUS_RUNNING) // run time (ongoing)
                         {
-                            tdiff =  timespec_diff(fpsctrltasklist[fpscmdindex].activationtime, tnow);
+                            tdiff = timespec_diff(fpsctrltasklist[fpscmdindex].activationtime, tnow);
                             tdiffv = 1.0 * tdiff.tv_sec + 1.0e-9 * tdiff.tv_nsec;
                             TUI_printfw(" %6.2f s ", tdiffv);
                         }
-                        else if(!(fpsctrltasklist[fpscmdindex].status &
-                                  FPSTASK_STATUS_ACTIVE))      // run time (past)
+                        else if (!(fpsctrltasklist[fpscmdindex].status & FPSTASK_STATUS_ACTIVE)) // run time (past)
                         {
-                            tdiff =  timespec_diff(fpsctrltasklist[fpscmdindex].activationtime,
-                                                   fpsctrltasklist[fpscmdindex].completiontime);
+                            tdiff = timespec_diff(fpsctrltasklist[fpscmdindex].activationtime,
+                                                  fpsctrltasklist[fpscmdindex].completiontime);
                             tdiffv = 1.0 * tdiff.tv_sec + 1.0e-9 * tdiff.tv_nsec;
                             screenprint_setcolor(3);
                             TUI_printfw(" %6.2f s ", tdiffv);
                             screenprint_unsetcolor(3);
                             // age since completion
-                            tdiff =  timespec_diff(fpsctrltasklist[fpscmdindex].completiontime, tnow);
+                            tdiff = timespec_diff(fpsctrltasklist[fpscmdindex].completiontime, tnow);
                             double tdiffv = tdiffv = 1.0 * tdiff.tv_sec + 1.0e-9 * tdiff.tv_nsec;
                             //printfw("<%6.2f s>      ", tdiffv);
 
                             //if(tdiffv > 30.0)
                             //fpsctrltasklist[fpscmdindex].status &= ~FPSTASK_STATUS_SHOW;
-
                         }
                         else
                         {
                             TUI_printfw("          ", tdiffv);
                         }
 
-
-                        if(fpsctrltasklist[fpscmdindex].status & FPSTASK_STATUS_ACTIVE)
+                        if (fpsctrltasklist[fpscmdindex].status & FPSTASK_STATUS_ACTIVE)
                         {
                             TUI_printfw(">>");
                         }
@@ -1967,7 +1733,7 @@ errno_t functionparameter_CTRLscreen(
                             TUI_printfw("  ");
                         }
 
-                        if(fpsctrltasklist[fpscmdindex].flag & FPSTASK_FLAG_WAITONRUN)
+                        if (fpsctrltasklist[fpscmdindex].flag & FPSTASK_FLAG_WAITONRUN)
                         {
                             TUI_printfw("WR ");
                         }
@@ -1976,7 +1742,7 @@ errno_t functionparameter_CTRLscreen(
                             TUI_printfw("   ");
                         }
 
-                        if(fpsctrltasklist[fpscmdindex].flag & FPSTASK_FLAG_WAITONCONF)
+                        if (fpsctrltasklist[fpscmdindex].flag & FPSTASK_FLAG_WAITONCONF)
                         {
                             TUI_printfw("WC ");
                         }
@@ -1985,16 +1751,10 @@ errno_t functionparameter_CTRLscreen(
                             TUI_printfw("   ");
                         }
 
-                        TUI_printfw("[Q:%02d P:%02d] %4d",
-                                    fpsctrltasklist[fpscmdindex].queue,
-                                    fpsctrlqueuelist[fpsctrltasklist[fpscmdindex].queue].priority,
-                                    fpscmdindex
-                                   );
-
-
+                        TUI_printfw("[Q:%02d P:%02d] %4d", fpsctrltasklist[fpscmdindex].queue,
+                                    fpsctrlqueuelist[fpsctrltasklist[fpscmdindex].queue].priority, fpscmdindex);
 
-
-                        if(fpsctrltasklist[fpscmdindex].status & FPSTASK_STATUS_RECEIVED)
+                        if (fpsctrltasklist[fpscmdindex].status & FPSTASK_STATUS_RECEIVED)
                         {
                             TUI_printfw(" R");
                         }
@@ -2003,49 +1763,47 @@ errno_t functionparameter_CTRLscreen(
                             TUI_printfw(" -");
                         }
 
-
-
-                        if(fpsctrltasklist[fpscmdindex].status & FPSTASK_STATUS_CMDNOTFOUND)
+                        if (fpsctrltasklist[fpscmdindex].status & FPSTASK_STATUS_CMDNOTFOUND)
                         {
                             screenprint_setcolor(3);
                             TUI_printfw(" NOTCMD");
                             screenprint_unsetcolor(3);
                         }
-                        else if(fpsctrltasklist[fpscmdindex].status & FPSTASK_STATUS_CMDFAIL)
+                        else if (fpsctrltasklist[fpscmdindex].status & FPSTASK_STATUS_CMDFAIL)
                         {
                             screenprint_setcolor(4);
                             TUI_printfw(" FAILED");
-                            if(fpsctrltasklist[fpscmdindex].status & FPSTASK_STATUS_ERR_NBARG)
+                            if (fpsctrltasklist[fpscmdindex].status & FPSTASK_STATUS_ERR_NBARG)
                             {
                                 TUI_printfw(" NBARG");
                             }
-                            if(fpsctrltasklist[fpscmdindex].status & FPSTASK_STATUS_ERR_ARGTYPE)
+                            if (fpsctrltasklist[fpscmdindex].status & FPSTASK_STATUS_ERR_ARGTYPE)
                             {
                                 TUI_printfw(" ARGTYPE");
                             }
-                            if(fpsctrltasklist[fpscmdindex].status & FPSTASK_STATUS_ERR_TYPECONV)
+                            if (fpsctrltasklist[fpscmdindex].status & FPSTASK_STATUS_ERR_TYPECONV)
                             {
                                 TUI_printfw(" TYPECOV");
                             }
-                            if(fpsctrltasklist[fpscmdindex].status & FPSTASK_STATUS_ERR_NOFPS)
+                            if (fpsctrltasklist[fpscmdindex].status & FPSTASK_STATUS_ERR_NOFPS)
                             {
                                 TUI_printfw(" NOFPS");
                             }
                             screenprint_unsetcolor(4);
                         }
-                        else if(fpsctrltasklist[fpscmdindex].status & FPSTASK_STATUS_CMDOK)
+                        else if (fpsctrltasklist[fpscmdindex].status & FPSTASK_STATUS_CMDOK)
                         {
                             screenprint_setcolor(2);
                             TUI_printfw(" PROCOK");
                             screenprint_unsetcolor(2);
                         }
-                        else if(fpsctrltasklist[fpscmdindex].status & FPSTASK_STATUS_RECEIVED)
+                        else if (fpsctrltasklist[fpscmdindex].status & FPSTASK_STATUS_RECEIVED)
                         {
                             screenprint_setcolor(2);
                             TUI_printfw(" RECVD ");
                             screenprint_unsetcolor(2);
                         }
-                        else if(fpsctrltasklist[fpscmdindex].status & FPSTASK_STATUS_WAITING)
+                        else if (fpsctrltasklist[fpscmdindex].status & FPSTASK_STATUS_WAITING)
                         {
                             screenprint_setcolor(5);
                             TUI_printfw("WAITING");
@@ -2058,37 +1816,26 @@ errno_t functionparameter_CTRLscreen(
                             screenprint_unsetcolor(3);
                         }
 
-
-
-
                         TUI_printfw("  %s", fpsctrltasklist[fpscmdindex].cmdstring);
                         TUI_newline();
 
-
-                        if(attron2 == 1)
+                        if (attron2 == 1)
                         {
                             screenprint_unsetcolor(2);
                         }
-                        if(attrbold == 1)
+                        if (attrbold == 1)
                         {
                             screenprint_unsetbold();
                         }
-
                     }
                 }
                 free(sort_indexarray);
-
-
-
             }
 
-
-
             DEBUG_TRACEPOINT(" ");
 
             TUI_ncurses_refresh();
 
-
             DEBUG_TRACEPOINT(" ");
 
         } // end run_display
@@ -2099,21 +1846,15 @@ errno_t functionparameter_CTRLscreen(
 
         loopcnt++;
 
-        if((data.signal_TERM == 1)
-                || (data.signal_INT == 1)
-                || (data.signal_ABRT == 1)
-                || (data.signal_BUS == 1)
-                || (data.signal_SEGV == 1)
-                || (data.signal_HUP == 1)
-                || (data.signal_PIPE == 1))
+        if ((data.signal_TERM == 1) || (data.signal_INT == 1) || (data.signal_ABRT == 1) || (data.signal_BUS == 1) ||
+            (data.signal_SEGV == 1) || (data.signal_HUP == 1) || (data.signal_PIPE == 1))
         {
             printf("Exit condition met\n");
             loopOK = 0;
         }
     }
 
-
-    if(run_display == 1)
+    if (run_display == 1)
     {
         TUI_exit();
     }
@@ -2121,7 +1862,7 @@ errno_t functionparameter_CTRLscreen(
     functionparameter_outlog("FPSCTRL", "STOP");
 
     DEBUG_TRACEPOINT("Disconnect from FPS entries");
-    for(fpsindex = 0; fpsindex < fpsCTRLvar.NBfps; fpsindex++)
+    for (fpsindex = 0; fpsindex < fpsCTRLvar.NBfps; fpsindex++)
     {
         function_parameter_struct_disconnect(&data.fpsarray[fpsindex]);
     }
@@ -2129,8 +1870,6 @@ errno_t functionparameter_CTRLscreen(
     // free(fps);
     free(keywnode);
 
-
-
     free(fpsctrltasklist);
     free(fpsctrlqueuelist);
     functionparameter_outlog("LOGFILECLOSE", "close log file");
diff --git a/src/CommandLineInterface/fpsCTRL_TUI.h b/src/CommandLineInterface/fpsCTRL_TUI.h
index 4d96fca5..406ddbee 100644
--- a/src/CommandLineInterface/fpsCTRL_TUI.h
+++ b/src/CommandLineInterface/fpsCTRL_TUI.h
@@ -8,10 +8,6 @@
 
 #include "processinfo.h"
 
-errno_t functionparameter_CTRLscreen(
-    uint32_t mode,
-    char *fpsnamemask,
-    char *fpsCTRLfifoname
-);
+errno_t functionparameter_CTRLscreen(uint32_t mode, char *fpsnamemask, char *fpsCTRLfifoname);
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/CommandLineInterface/fpsCTRL_TUI_process_user_key.c b/src/CommandLineInterface/fpsCTRL_TUI_process_user_key.c
index bf8ba787..63dded21 100644
--- a/src/CommandLineInterface/fpsCTRL_TUI_process_user_key.c
+++ b/src/CommandLineInterface/fpsCTRL_TUI_process_user_key.c
@@ -3,47 +3,30 @@
  * @brief   TUI key input processing
  */
 
-
 #include <ncurses.h>
 
-
 #include "CommandLineInterface/CLIcore.h"
 #include "TUItools.h"
 
-
 #include "fps_CONFstart.h"
 #include "fps_CONFstop.h"
 #include "fps_FPSremove.h"
+#include "fps_RUNstart.h"
+#include "fps_RUNstop.h"
+#include "fps_WriteParameterToDisk.h"
 #include "fps_outlog.h"
 #include "fps_processcmdline.h"
 #include "fps_read_fpsCMD_fifo.h"
-#include "fps_RUNstart.h"
-#include "fps_RUNstop.h"
 #include "fps_save2disk.h"
 #include "fps_scan.h"
 #include "fps_tmux.h"
 #include "fps_userinputsetparamvalue.h"
-#include "fps_WriteParameterToDisk.h"
-
 
 static short unsigned int wrow, wcol;
 
-
-
-
-
-
-
-
-
-int fpsCTRL_TUI_process_user_key(
-    int ch,
-    FUNCTION_PARAMETER_STRUCT *fps,
-    KEYWORD_TREE_NODE *keywnode,
-    FPSCTRL_TASK_ENTRY *fpsctrltasklist,
-    FPSCTRL_TASK_QUEUE *fpsctrlqueuelist,
-    FPSCTRL_PROCESS_VARS *fpsCTRLvar
-)
+int fpsCTRL_TUI_process_user_key(int ch, FUNCTION_PARAMETER_STRUCT *fps, KEYWORD_TREE_NODE *keywnode,
+                                 FPSCTRL_TASK_ENTRY *fpsctrltasklist, FPSCTRL_TASK_QUEUE *fpsctrlqueuelist,
+                                 FPSCTRL_PROCESS_VARS *fpsCTRLvar)
 {
     int stringmaxlen = 500;
     int loopOK = 1;
@@ -56,428 +39,381 @@ int fpsCTRL_TUI_process_user_key(
 
     FILE *fpin;
 
-    switch(ch)
+    switch (ch)
     {
-        case 3: // CTRL-C
-            loopOK = 0;
-            break;
+    case 3: // CTRL-C
+        loopOK = 0;
+        break;
 
-        case 'x':     // Exit control screen
-            loopOK = 0;
-            break;
+    case 'x': // Exit control screen
+        loopOK = 0;
+        break;
 
         // ============ SCREENS
 
-        case 'h': // help
-            fpsCTRLvar->fpsCTRL_DisplayMode = 1;
-            break;
-
-        case KEY_F(2): // control
-            fpsCTRLvar->fpsCTRL_DisplayMode = 2;
-            break;
-
-        case KEY_F(3): // scheduler
-            fpsCTRLvar->fpsCTRL_DisplayMode = 3;
-            break;
-
-        case 's' : // (re)scan
-            functionparameter_scan_fps(
-                fpsCTRLvar->mode,
-                fpsCTRLvar->fpsnamemask,
-                fps,
-                keywnode,
-                &fpsCTRLvar->NBkwn,
-                &fpsCTRLvar->NBfps,
-                &fpsCTRLvar->NBindex,
-                0);
-            clear();
-            break;
-
-        case 'e' : // erase FPS
-            fpsindex = keywnode[fpsCTRLvar->nodeSelected].fpsindex;
-            functionparameter_FPSremove(&fps[fpsindex]);
-
-            functionparameter_scan_fps(
-                fpsCTRLvar->mode,
-                fpsCTRLvar->fpsnamemask,
-                fps,
-                keywnode,
-                &fpsCTRLvar->NBkwn,
-                &(fpsCTRLvar->NBfps),
-                &fpsCTRLvar->NBindex,
-                0);
-            clear();
-            //DEBUG_TRACEPOINT("fpsCTRLvar->NBfps = %d\n", fpsCTRLvar->NBfps);
-            // abort();
-            fpsCTRLvar->run_display = 0; // skip next display
-            fpsCTRLvar->fpsindexSelected =
-                0; // safeguard in case current selection disappears
-            break;
-
-
-        case 'T' : // initialize tmux session
-            fpsindex = keywnode[fpsCTRLvar->nodeSelected].fpsindex;
-            functionparameter_FPS_tmux_init(&fps[fpsindex]);
-            break;
-
-        case 't' : // kill tmux session
-            fpsindex = keywnode[fpsCTRLvar->nodeSelected].fpsindex;
-            functionparameter_FPS_tmux_kill(&fps[fpsindex]);
-            break;
-
-
-        case 'E' : // Erase FPS and close tmux sessions
-            fpsindex = keywnode[fpsCTRLvar->nodeSelected].fpsindex;
-
-            functionparameter_FPSremove(&fps[fpsindex]);
-            functionparameter_scan_fps(
-                fpsCTRLvar->mode,
-                fpsCTRLvar->fpsnamemask,
-                fps,
-                keywnode,
-                &fpsCTRLvar->NBkwn,
-                &fpsCTRLvar->NBfps,
-                &fpsCTRLvar->NBindex, 0);
-            clear();
-            DEBUG_TRACEPOINT(" ");
-            // safeguard in case current selection disappears
-            fpsCTRLvar->fpsindexSelected = 0;
-            break;
-
-        case KEY_UP:
-            fpsCTRLvar->direction = -1;
-            fpsCTRLvar->GUIlineSelected[fpsCTRLvar->currentlevel] --;
-            if(fpsCTRLvar->GUIlineSelected[fpsCTRLvar->currentlevel] < 0)
+    case 'h': // help
+        fpsCTRLvar->fpsCTRL_DisplayMode = 1;
+        break;
+
+    case KEY_F(2): // control
+        fpsCTRLvar->fpsCTRL_DisplayMode = 2;
+        break;
+
+    case KEY_F(3): // scheduler
+        fpsCTRLvar->fpsCTRL_DisplayMode = 3;
+        break;
+
+    case 's': // (re)scan
+        functionparameter_scan_fps(fpsCTRLvar->mode, fpsCTRLvar->fpsnamemask, fps, keywnode, &fpsCTRLvar->NBkwn,
+                                   &fpsCTRLvar->NBfps, &fpsCTRLvar->NBindex, 0);
+        clear();
+        break;
+
+    case 'e': // erase FPS
+        fpsindex = keywnode[fpsCTRLvar->nodeSelected].fpsindex;
+        functionparameter_FPSremove(&fps[fpsindex]);
+
+        functionparameter_scan_fps(fpsCTRLvar->mode, fpsCTRLvar->fpsnamemask, fps, keywnode, &fpsCTRLvar->NBkwn,
+                                   &(fpsCTRLvar->NBfps), &fpsCTRLvar->NBindex, 0);
+        clear();
+        //DEBUG_TRACEPOINT("fpsCTRLvar->NBfps = %d\n", fpsCTRLvar->NBfps);
+        // abort();
+        fpsCTRLvar->run_display = 0;      // skip next display
+        fpsCTRLvar->fpsindexSelected = 0; // safeguard in case current selection disappears
+        break;
+
+    case 'T': // initialize tmux session
+        fpsindex = keywnode[fpsCTRLvar->nodeSelected].fpsindex;
+        functionparameter_FPS_tmux_init(&fps[fpsindex]);
+        break;
+
+    case 't': // kill tmux session
+        fpsindex = keywnode[fpsCTRLvar->nodeSelected].fpsindex;
+        functionparameter_FPS_tmux_kill(&fps[fpsindex]);
+        break;
+
+    case 'E': // Erase FPS and close tmux sessions
+        fpsindex = keywnode[fpsCTRLvar->nodeSelected].fpsindex;
+
+        functionparameter_FPSremove(&fps[fpsindex]);
+        functionparameter_scan_fps(fpsCTRLvar->mode, fpsCTRLvar->fpsnamemask, fps, keywnode, &fpsCTRLvar->NBkwn,
+                                   &fpsCTRLvar->NBfps, &fpsCTRLvar->NBindex, 0);
+        clear();
+        DEBUG_TRACEPOINT(" ");
+        // safeguard in case current selection disappears
+        fpsCTRLvar->fpsindexSelected = 0;
+        break;
+
+    case KEY_UP:
+        fpsCTRLvar->direction = -1;
+        fpsCTRLvar->GUIlineSelected[fpsCTRLvar->currentlevel]--;
+        if (fpsCTRLvar->GUIlineSelected[fpsCTRLvar->currentlevel] < 0)
+        {
+            fpsCTRLvar->GUIlineSelected[fpsCTRLvar->currentlevel] = 0;
+        }
+        break;
+
+    case KEY_DOWN:
+        fpsCTRLvar->direction = 1;
+        fpsCTRLvar->GUIlineSelected[fpsCTRLvar->currentlevel]++;
+        if (fpsCTRLvar->GUIlineSelected[fpsCTRLvar->currentlevel] > fpsCTRLvar->NBindex - 1)
+        {
+            fpsCTRLvar->GUIlineSelected[fpsCTRLvar->currentlevel] = fpsCTRLvar->NBindex - 1;
+        }
+        if (fpsCTRLvar->GUIlineSelected[fpsCTRLvar->currentlevel] >
+            keywnode[fpsCTRLvar->directorynodeSelected].NBchild - 1)
+        {
+            fpsCTRLvar->GUIlineSelected[fpsCTRLvar->currentlevel] =
+                keywnode[fpsCTRLvar->directorynodeSelected].NBchild - 1;
+        }
+        break;
+
+    case KEY_PPAGE:
+        fpsCTRLvar->direction = -1;
+        fpsCTRLvar->GUIlineSelected[fpsCTRLvar->currentlevel] -= 10;
+        if (fpsCTRLvar->GUIlineSelected[fpsCTRLvar->currentlevel] < 0)
+        {
+            fpsCTRLvar->GUIlineSelected[fpsCTRLvar->currentlevel] = 0;
+        }
+        break;
+
+    case KEY_NPAGE:
+        fpsCTRLvar->direction = 1;
+        fpsCTRLvar->GUIlineSelected[fpsCTRLvar->currentlevel] += 10;
+        while (fpsCTRLvar->GUIlineSelected[fpsCTRLvar->currentlevel] > fpsCTRLvar->NBindex - 1)
+        {
+            fpsCTRLvar->GUIlineSelected[fpsCTRLvar->currentlevel] = fpsCTRLvar->NBindex - 1;
+        }
+        while (fpsCTRLvar->GUIlineSelected[fpsCTRLvar->currentlevel] >
+               keywnode[fpsCTRLvar->directorynodeSelected].NBchild - 1)
+        {
+            fpsCTRLvar->GUIlineSelected[fpsCTRLvar->currentlevel] =
+                keywnode[fpsCTRLvar->directorynodeSelected].NBchild - 1;
+        }
+        break;
+
+    case KEY_LEFT:
+        if (fpsCTRLvar->directorynodeSelected != 0) // ROOT has no parent
+        {
+            fpsCTRLvar->directorynodeSelected = keywnode[fpsCTRLvar->directorynodeSelected].parent_index;
+            fpsCTRLvar->nodeSelected = fpsCTRLvar->directorynodeSelected;
+        }
+        break;
+
+    case KEY_RIGHT:
+        if (keywnode[fpsCTRLvar->nodeSelected].leaf == 0) // this is a directory
+        {
+            if (keywnode[keywnode[fpsCTRLvar->directorynodeSelected]
+                             .child[fpsCTRLvar->GUIlineSelected[fpsCTRLvar->currentlevel]]]
+                    .leaf == 0)
             {
-                fpsCTRLvar->GUIlineSelected[fpsCTRLvar->currentlevel] = 0;
+                fpsCTRLvar->directorynodeSelected = keywnode[fpsCTRLvar->directorynodeSelected]
+                                                        .child[fpsCTRLvar->GUIlineSelected[fpsCTRLvar->currentlevel]];
+                fpsCTRLvar->nodeSelected = fpsCTRLvar->directorynodeSelected;
             }
-            break;
+        }
+        break;
 
+    case 10: // enter key
+        DEBUG_TRACEPOINT_LOG("exiting TUI screen");
+        if (keywnode[fpsCTRLvar->nodeSelected].leaf == 1) // this is a leaf
+        {
+            DEBUG_TRACEPOINT_LOG("exiting TUI screen");
+            TUI_exit();
 
-        case KEY_DOWN:
-            fpsCTRLvar->direction = 1;
-            fpsCTRLvar->GUIlineSelected[fpsCTRLvar->currentlevel] ++;
-            if(fpsCTRLvar->GUIlineSelected[fpsCTRLvar->currentlevel] > fpsCTRLvar->NBindex -
-                    1)
-            {
-                fpsCTRLvar->GUIlineSelected[fpsCTRLvar->currentlevel] = fpsCTRLvar->NBindex - 1;
-            }
-            if(fpsCTRLvar->GUIlineSelected[fpsCTRLvar->currentlevel] >
-                    keywnode[fpsCTRLvar->directorynodeSelected].NBchild - 1)
+            if (system("clear") != 0) // clear screen
             {
-                fpsCTRLvar->GUIlineSelected[fpsCTRLvar->currentlevel] =
-                    keywnode[fpsCTRLvar->directorynodeSelected].NBchild - 1;
+                PRINT_ERROR("system() returns non-zero value");
             }
-            break;
+            functionparameter_UserInputSetParamValue(&fps[fpsCTRLvar->fpsindexSelected], fpsCTRLvar->pindexSelected);
 
-        case KEY_PPAGE:
-            fpsCTRLvar->direction = -1;
-            fpsCTRLvar->GUIlineSelected[fpsCTRLvar->currentlevel] -= 10;
-            if(fpsCTRLvar->GUIlineSelected[fpsCTRLvar->currentlevel] < 0)
-            {
-                fpsCTRLvar->GUIlineSelected[fpsCTRLvar->currentlevel] = 0;
-            }
-            break;
+            DEBUG_TRACEPOINT(" ");
 
-        case KEY_NPAGE:
-            fpsCTRLvar->direction = 1;
-            fpsCTRLvar->GUIlineSelected[fpsCTRLvar->currentlevel] += 10;
-            while(fpsCTRLvar->GUIlineSelected[fpsCTRLvar->currentlevel] >
-                    fpsCTRLvar->NBindex - 1)
-            {
-                fpsCTRLvar->GUIlineSelected[fpsCTRLvar->currentlevel] = fpsCTRLvar->NBindex - 1;
-            }
-            while(fpsCTRLvar->GUIlineSelected[fpsCTRLvar->currentlevel] >
-                    keywnode[fpsCTRLvar->directorynodeSelected].NBchild - 1)
-            {
-                fpsCTRLvar->GUIlineSelected[fpsCTRLvar->currentlevel] =
-                    keywnode[fpsCTRLvar->directorynodeSelected].NBchild - 1;
-            }
-            break;
+            TUI_init_terminal(&wrow, &wcol);
+            DEBUG_TRACEPOINT(" ");
+        }
+        break;
 
+    case ' ':
+        fpsindex = keywnode[fpsCTRLvar->nodeSelected].fpsindex;
+        pindex = keywnode[fpsCTRLvar->nodeSelected].pindex;
 
-        case KEY_LEFT:
-            if(fpsCTRLvar->directorynodeSelected != 0)   // ROOT has no parent
+        // toggles ON / OFF - this is a special case not using function functionparameter_UserInputSetParamValue
+        if (fps[fpsindex].parray[pindex].fpflag & FPFLAG_WRITESTATUS)
+        {
+            if (fps[fpsindex].parray[pindex].type == FPTYPE_ONOFF)
             {
-                fpsCTRLvar->directorynodeSelected =
-                    keywnode[fpsCTRLvar->directorynodeSelected].parent_index;
-                fpsCTRLvar->nodeSelected = fpsCTRLvar->directorynodeSelected;
-            }
-            break;
-
 
-        case KEY_RIGHT :
-            if(keywnode[fpsCTRLvar->nodeSelected].leaf == 0)   // this is a directory
-            {
-                if(keywnode[keywnode[fpsCTRLvar->directorynodeSelected].child[fpsCTRLvar->GUIlineSelected[fpsCTRLvar->currentlevel]]].leaf
-                        == 0)
+                if (fps[fpsindex].parray[pindex].fpflag & FPFLAG_ONOFF) // ON -> OFF
                 {
-                    fpsCTRLvar->directorynodeSelected =
-                        keywnode[fpsCTRLvar->directorynodeSelected].child[fpsCTRLvar->GUIlineSelected[fpsCTRLvar->currentlevel]];
-                    fpsCTRLvar->nodeSelected = fpsCTRLvar->directorynodeSelected;
+                    fps[fpsindex].parray[pindex].fpflag &= ~FPFLAG_ONOFF;
+                    fps[fpsindex].parray[pindex].val.i64[0] = 0;
                 }
-            }
-            break;
-
-        case 10 : // enter key
-            DEBUG_TRACEPOINT_LOG("exiting TUI screen");
-            if(keywnode[fpsCTRLvar->nodeSelected].leaf == 1)   // this is a leaf
-            {
-                DEBUG_TRACEPOINT_LOG("exiting TUI screen");
-                TUI_exit();
-
-                if(system("clear") != 0)   // clear screen
+                else // OFF -> ON
                 {
-                    PRINT_ERROR("system() returns non-zero value");
+                    fps[fpsindex].parray[pindex].fpflag |= FPFLAG_ONOFF;
+                    fps[fpsindex].parray[pindex].val.i64[0] = 1;
                 }
-                functionparameter_UserInputSetParamValue(&fps[fpsCTRLvar->fpsindexSelected],
-                        fpsCTRLvar->pindexSelected);
-
-                DEBUG_TRACEPOINT(" ");
-
-                TUI_init_terminal(&wrow, &wcol);
-                DEBUG_TRACEPOINT(" ");
-            }
-            break;
 
-        case ' ' :
-            fpsindex = keywnode[fpsCTRLvar->nodeSelected].fpsindex;
-            pindex = keywnode[fpsCTRLvar->nodeSelected].pindex;
-
-            // toggles ON / OFF - this is a special case not using function functionparameter_UserInputSetParamValue
-            if(fps[fpsindex].parray[pindex].fpflag & FPFLAG_WRITESTATUS)
-            {
-                if(fps[fpsindex].parray[pindex].type == FPTYPE_ONOFF)
+                // Save to disk
+                if (fps[fpsindex].parray[pindex].fpflag & FPFLAG_SAVEONCHANGE)
                 {
-
-                    if(fps[fpsindex].parray[pindex].fpflag & FPFLAG_ONOFF)    // ON -> OFF
-                    {
-                        fps[fpsindex].parray[pindex].fpflag &= ~FPFLAG_ONOFF;
-                        fps[fpsindex].parray[pindex].val.i64[0] = 0;
-                    }
-                    else     // OFF -> ON
-                    {
-                        fps[fpsindex].parray[pindex].fpflag |= FPFLAG_ONOFF;
-                        fps[fpsindex].parray[pindex].val.i64[0] = 1;
-                    }
-
-                    // Save to disk
-                    if(fps[fpsindex].parray[pindex].fpflag & FPFLAG_SAVEONCHANGE)
-                    {
-                        functionparameter_WriteParameterToDisk(&fps[fpsindex], pindex, "setval",
-                                                               "UserInputSetParamValue");
-                    }
-                    fps[fpsindex].parray[pindex].cnt0 ++;
-                    fps[fpsindex].md->signal |=
-                        FUNCTION_PARAMETER_STRUCT_SIGNAL_UPDATE; // notify GUI loop to update
+                    functionparameter_WriteParameterToDisk(&fps[fpsindex], pindex, "setval", "UserInputSetParamValue");
                 }
+                fps[fpsindex].parray[pindex].cnt0++;
+                fps[fpsindex].md->signal |= FUNCTION_PARAMETER_STRUCT_SIGNAL_UPDATE; // notify GUI loop to update
             }
-
-            if(fps[fpsindex].parray[pindex].type == FPTYPE_EXECFILENAME)
-            {
-                EXECUTE_SYSTEM_COMMAND("tmux send-keys -t %s:run \"cd %s\" C-m",
-                                       fps[fpsindex].md->name, fps[fpsindex].md->workdir);
-                EXECUTE_SYSTEM_COMMAND("tmux send-keys -t %s:run \"%s %s/%s.fps\" C-m",
-                                       fps[fpsindex].md->name, fps[fpsindex].parray[pindex].val.string[0],
-                                       fps[fpsindex].md->datadir, fps[fpsindex].md->name);
-            }
-
-            break;
-
-
-        case 'u' : // update conf process
-            fpsindex = keywnode[fpsCTRLvar->nodeSelected].fpsindex;
-            fps[fpsindex].md->signal |=
-                FUNCTION_PARAMETER_STRUCT_SIGNAL_UPDATE; // notify GUI loop to update
-            if(snprintf(msg, stringmaxlen, "UPDATE %s", fps[fpsindex].md->name) < 0)
-            {
-                PRINT_ERROR("snprintf error");
-            }
-            functionparameter_outlog("FPSCTRL", "%s", msg);
-            //functionparameter_CONFupdate(fps, fpsindex);
-            break;
-
-        case 'R' : // start run process if possible
-            fpsindex = keywnode[fpsCTRLvar->nodeSelected].fpsindex;
-            if(snprintf(msg, stringmaxlen, "RUNSTART %s", fps[fpsindex].md->name) < 0)
+        }
+
+        if (fps[fpsindex].parray[pindex].type == FPTYPE_EXECFILENAME)
+        {
+            EXECUTE_SYSTEM_COMMAND("tmux send-keys -t %s:run \"cd %s\" C-m", fps[fpsindex].md->name,
+                                   fps[fpsindex].md->workdir);
+            EXECUTE_SYSTEM_COMMAND("tmux send-keys -t %s:run \"%s %s/%s.fps\" C-m", fps[fpsindex].md->name,
+                                   fps[fpsindex].parray[pindex].val.string[0], fps[fpsindex].md->datadir,
+                                   fps[fpsindex].md->name);
+        }
+
+        break;
+
+    case 'u': // update conf process
+        fpsindex = keywnode[fpsCTRLvar->nodeSelected].fpsindex;
+        fps[fpsindex].md->signal |= FUNCTION_PARAMETER_STRUCT_SIGNAL_UPDATE; // notify GUI loop to update
+        if (snprintf(msg, stringmaxlen, "UPDATE %s", fps[fpsindex].md->name) < 0)
+        {
+            PRINT_ERROR("snprintf error");
+        }
+        functionparameter_outlog("FPSCTRL", "%s", msg);
+        //functionparameter_CONFupdate(fps, fpsindex);
+        break;
+
+    case 'R': // start run process if possible
+        fpsindex = keywnode[fpsCTRLvar->nodeSelected].fpsindex;
+        if (snprintf(msg, stringmaxlen, "RUNSTART %s", fps[fpsindex].md->name) < 0)
+        {
+            PRINT_ERROR("snprintf error");
+        }
+        functionparameter_outlog("FPSCTRL", msg);
+        functionparameter_RUNstart(&fps[fpsindex]);
+        break;
+
+    case 'r': // stop run process
+        fpsindex = keywnode[fpsCTRLvar->nodeSelected].fpsindex;
+        if (snprintf(msg, stringmaxlen, "RUNSTOP %s", fps[fpsindex].md->name) < 0)
+        {
+            PRINT_ERROR("snprintf error");
+        }
+        functionparameter_outlog("FPSCTRL", msg);
+        functionparameter_RUNstop(&fps[fpsindex]);
+        break;
+
+    case 'C': // start conf process
+        fpsindex = keywnode[fpsCTRLvar->nodeSelected].fpsindex;
+        if (snprintf(msg, stringmaxlen, "CONFSTART %s", fps[fpsindex].md->name) < 0)
+        {
+            PRINT_ERROR("snprintf error");
+        }
+        functionparameter_outlog("FPSCTRL", msg);
+        functionparameter_CONFstart(&fps[fpsindex]);
+        break;
+
+    case 'c': // kill conf process
+        fpsindex = keywnode[fpsCTRLvar->nodeSelected].fpsindex;
+        if (snprintf(msg, stringmaxlen, "CONFSTOP %s", fps[fpsindex].md->name) < 0)
+        {
+            PRINT_ERROR("snprintf error");
+        }
+        functionparameter_outlog("FPSCTRL", msg);
+        functionparameter_CONFstop(&fps[fpsindex]);
+        break;
+
+    case 'l': // list all parameters
+        TUI_exit();
+        if (system("clear") != 0)
+        {
+            PRINT_ERROR("system() returns non-zero value");
+        }
+        printf("FPS entries - Full list \n");
+        printf("\n");
+        for (int kwnindex = 0; kwnindex < fpsCTRLvar->NBkwn; kwnindex++)
+        {
+            if (keywnode[kwnindex].leaf == 1)
             {
-                PRINT_ERROR("snprintf error");
+                printf("%4d  %4d  %s\n", keywnode[kwnindex].fpsindex, keywnode[kwnindex].pindex,
+                       keywnode[kwnindex].keywordfull);
             }
-            functionparameter_outlog("FPSCTRL", msg);
-            functionparameter_RUNstart(&fps[fpsindex]);
-            break;
-
-        case 'r' : // stop run process
-            fpsindex = keywnode[fpsCTRLvar->nodeSelected].fpsindex;
-            if(snprintf(msg, stringmaxlen, "RUNSTOP %s", fps[fpsindex].md->name) < 0)
-            {
-                PRINT_ERROR("snprintf error");
-            }
-            functionparameter_outlog("FPSCTRL", msg);
-            functionparameter_RUNstop(&fps[fpsindex]);
-            break;
-
-
-        case 'C' : // start conf process
-            fpsindex = keywnode[fpsCTRLvar->nodeSelected].fpsindex;
-            if(snprintf(msg, stringmaxlen, "CONFSTART %s", fps[fpsindex].md->name) < 0)
+        }
+        printf("  TOTAL :  %d nodes\n", fpsCTRLvar->NBkwn);
+        printf("\n");
+        printf("Press Any Key to Continue\n");
+        getchar();
+
+        TUI_initncurses();
+
+        break;
+
+    case '>': // export to confdir
+        fpsindex = keywnode[fpsCTRLvar->nodeSelected].fpsindex;
+        fps_datadir_to_confdir(&fps[fpsindex]);
+        break;
+
+    case '<': // Load from confdir
+        TUI_exit();
+        if (system("clear") != 0)
+        {
+            PRINT_ERROR("system() returns non-zero value");
+        }
+        fpsindex = keywnode[fpsCTRLvar->nodeSelected].fpsindex;
+        sprintf(fname, "%s/%s.fps", fps[fpsindex].md->confdir, fps[fpsindex].md->name);
+        //printf("LOADING FPS FILE %s\n", fname);
+
+        fpin = fopen(fname, "r");
+        if (fpin != NULL)
+        {
+            char *FPSline = NULL;
+            size_t len = 0;
+            ssize_t read;
+
+            while ((read = getline(&FPSline, &len, fpin)) != -1)
             {
-                PRINT_ERROR("snprintf error");
-            }
-            functionparameter_outlog("FPSCTRL", msg);
-            functionparameter_CONFstart(&fps[fpsindex]);
-            break;
+                uint64_t taskstatus = 0;
 
-        case 'c': // kill conf process
-            fpsindex = keywnode[fpsCTRLvar->nodeSelected].fpsindex;
-            if(snprintf(msg, stringmaxlen, "CONFSTOP %s", fps[fpsindex].md->name) < 0)
-            {
-                PRINT_ERROR("snprintf error");
-            }
-            functionparameter_outlog("FPSCTRL", msg);
-            functionparameter_CONFstop(&fps[fpsindex]);
-            break;
+                //printf("READING LINE: %s\n", FPSline);
 
-        case 'l': // list all parameters
-            TUI_exit();
-            if(system("clear") != 0)
-            {
-                PRINT_ERROR("system() returns non-zero value");
-            }
-            printf("FPS entries - Full list \n");
-            printf("\n");
-            for(int kwnindex = 0; kwnindex < fpsCTRLvar->NBkwn; kwnindex++)
-            {
-                if(keywnode[kwnindex].leaf == 1)
-                {
-                    printf("%4d  %4d  %s\n", keywnode[kwnindex].fpsindex, keywnode[kwnindex].pindex,
-                           keywnode[kwnindex].keywordfull);
-                }
-            }
-            printf("  TOTAL :  %d nodes\n", fpsCTRLvar->NBkwn);
-            printf("\n");
-            printf("Press Any Key to Continue\n");
-            getchar();
-
-            TUI_initncurses();
-
-            break;
-
-
-        case '>': // export to confdir
-            fpsindex = keywnode[fpsCTRLvar->nodeSelected].fpsindex;
-            fps_datadir_to_confdir(&fps[fpsindex]);
-            break;
-
-
-        case '<': // Load from confdir
-            TUI_exit();
-            if(system("clear") != 0)
-            {
-                PRINT_ERROR("system() returns non-zero value");
-            }
-            fpsindex = keywnode[fpsCTRLvar->nodeSelected].fpsindex;
-            sprintf(fname, "%s/%s.fps", fps[fpsindex].md->confdir, fps[fpsindex].md->name);
-            //printf("LOADING FPS FILE %s\n", fname);
+                char delimiter[] = " ";
+                char *varname, *vartype, *varvalue;
+                char *context;
 
-            fpin = fopen(fname, "r");
-            if(fpin != NULL)
-            {
-                char *FPSline = NULL;
-                size_t len = 0;
-                ssize_t read;
+                int inputLength = strlen(FPSline);
 
-                while((read = getline(&FPSline, &len, fpin)) != -1)
+                char *inputCopy = (char *)calloc(inputLength + 1, sizeof(char));
+                if (inputCopy == NULL)
                 {
-                    uint64_t taskstatus = 0;
-
-                    //printf("READING LINE: %s\n", FPSline);
-
-                    char delimiter[] = " ";
-                    char *varname, *vartype, *varvalue;
-                    char *context;
-
-                    int inputLength = strlen(FPSline);
-
-                    char *inputCopy = (char *) calloc(inputLength + 1, sizeof(char));
-                    if(inputCopy == NULL)
-                    {
-                        PRINT_ERROR("malloc returns NULL pointer");
-                        abort();
-                    }
-
-                    strncpy(inputCopy, FPSline, inputLength);
-
-                    varname = strtok_r(inputCopy, delimiter, &context);
-                    vartype = strtok_r(NULL, delimiter, &context);
-                    (void) vartype;
-                    varvalue = strtok_r(NULL, delimiter, &context);
-
-                    //printf("%s [%s] -< %s\n", varname, vartype, varvalue);
-
-                    char FPScmdline[200];
-                    sprintf(FPScmdline, "setval %s %s", varname, varvalue);
-                    free(inputCopy);
-                    functionparameter_FPSprocess_cmdline(FPScmdline, fpsctrlqueuelist, keywnode,
-                                                         fpsCTRLvar, fps, &taskstatus);
+                    PRINT_ERROR("malloc returns NULL pointer");
+                    abort();
                 }
-                fclose(fpin);
-            }
-            else
-            {
-                printf("File not found\n");
-            }
 
-            TUI_initncurses();
-            break;
+                strncpy(inputCopy, FPSline, inputLength);
 
+                varname = strtok_r(inputCopy, delimiter, &context);
+                vartype = strtok_r(NULL, delimiter, &context);
+                (void)vartype;
+                varvalue = strtok_r(NULL, delimiter, &context);
 
-        case 'F': // process FIFO
-            TUI_exit();
-            if(system("clear") != 0)
-            {
-                PRINT_ERROR("system() returns non-zero value");
-            }
-            printf("Reading FIFO file \"%s\"  fd=%d\n", fpsCTRLvar->fpsCTRLfifoname,
-                   fpsCTRLvar->fpsCTRLfifofd);
+                //printf("%s [%s] -< %s\n", varname, vartype, varvalue);
 
-            if(fpsCTRLvar->fpsCTRLfifofd > 0)
-            {
-                // int verbose = 1;
-                functionparameter_read_fpsCMD_fifo(fpsCTRLvar->fpsCTRLfifofd, fpsctrltasklist,
-                                                   fpsctrlqueuelist);
+                char FPScmdline[200];
+                sprintf(FPScmdline, "setval %s %s", varname, varvalue);
+                free(inputCopy);
+                functionparameter_FPSprocess_cmdline(FPScmdline, fpsctrlqueuelist, keywnode, fpsCTRLvar, fps,
+                                                     &taskstatus);
             }
-
-            printf("\n");
-            printf("Press Any Key to Continue\n");
-            getchar();
-            TUI_initncurses();
-            break;
-
-
-        case 'P': // process input command file
-            TUI_exit();
-            if(system("clear") != 0)
-            {
-                PRINT_ERROR("system() returns non-zero value");
-            }
-            printf("Reading file confscript\n");
-
-            functionparameter_FPSprocess_cmdfile(
-                "confscript",
-                fps,
-                keywnode,
-                fpsctrlqueuelist,
-                fpsCTRLvar
-            );
-
-            printf("\n");
-            printf("Press Any Key to Continue\n");
-            getchar();
-            TUI_initncurses();
-            break;
+            fclose(fpin);
+        }
+        else
+        {
+            printf("File not found\n");
+        }
+
+        TUI_initncurses();
+        break;
+
+    case 'F': // process FIFO
+        TUI_exit();
+        if (system("clear") != 0)
+        {
+            PRINT_ERROR("system() returns non-zero value");
+        }
+        printf("Reading FIFO file \"%s\"  fd=%d\n", fpsCTRLvar->fpsCTRLfifoname, fpsCTRLvar->fpsCTRLfifofd);
+
+        if (fpsCTRLvar->fpsCTRLfifofd > 0)
+        {
+            // int verbose = 1;
+            functionparameter_read_fpsCMD_fifo(fpsCTRLvar->fpsCTRLfifofd, fpsctrltasklist, fpsctrlqueuelist);
+        }
+
+        printf("\n");
+        printf("Press Any Key to Continue\n");
+        getchar();
+        TUI_initncurses();
+        break;
+
+    case 'P': // process input command file
+        TUI_exit();
+        if (system("clear") != 0)
+        {
+            PRINT_ERROR("system() returns non-zero value");
+        }
+        printf("Reading file confscript\n");
+
+        functionparameter_FPSprocess_cmdfile("confscript", fps, keywnode, fpsctrlqueuelist, fpsCTRLvar);
+
+        printf("\n");
+        printf("Press Any Key to Continue\n");
+        getchar();
+        TUI_initncurses();
+        break;
     }
 
-
-    return(loopOK);
+    return (loopOK);
 }
diff --git a/src/CommandLineInterface/fpsCTRL_TUI_process_user_key.h b/src/CommandLineInterface/fpsCTRL_TUI_process_user_key.h
index 0d22c857..68deba14 100644
--- a/src/CommandLineInterface/fpsCTRL_TUI_process_user_key.h
+++ b/src/CommandLineInterface/fpsCTRL_TUI_process_user_key.h
@@ -8,13 +8,8 @@
 
 #include "function_parameters.h"
 
-int fpsCTRL_TUI_process_user_key(
-    int ch,
-    FUNCTION_PARAMETER_STRUCT *fps,
-    KEYWORD_TREE_NODE *keywnode,
-    FPSCTRL_TASK_ENTRY *fpsctrltasklist,
-    FPSCTRL_TASK_QUEUE *fpsctrlqueuelist,
-    FPSCTRL_PROCESS_VARS *fpsCTRLvar
-);
+int fpsCTRL_TUI_process_user_key(int ch, FUNCTION_PARAMETER_STRUCT *fps, KEYWORD_TREE_NODE *keywnode,
+                                 FPSCTRL_TASK_ENTRY *fpsctrltasklist, FPSCTRL_TASK_QUEUE *fpsctrlqueuelist,
+                                 FPSCTRL_PROCESS_VARS *fpsCTRLvar);
 
 #endif
diff --git a/src/CommandLineInterface/fps_CONFstart.c b/src/CommandLineInterface/fps_CONFstart.c
index 3c2a83ec..80c72302 100644
--- a/src/CommandLineInterface/fps_CONFstart.c
+++ b/src/CommandLineInterface/fps_CONFstart.c
@@ -3,13 +3,8 @@
  * @brief   FPS conf process start
  */
 
-
-
 #include "CommandLineInterface/CLIcore.h"
 
-
-
-
 /** @brief FPS start CONF process
  *
  * Requires setup performed by milk-fpsinit, which performs the following setup
@@ -18,17 +13,13 @@
  * - create function fpsrunstart, fpsrunstop, fpsconfstart and fpsconfstop
  */
 
-errno_t functionparameter_CONFstart(
-    FUNCTION_PARAMETER_STRUCT *fps
-)
+errno_t functionparameter_CONFstart(FUNCTION_PARAMETER_STRUCT *fps)
 {
     // Move to correct launch directory
     //
-    EXECUTE_SYSTEM_COMMAND("tmux send-keys -t %s:conf \"cd %s\" C-m",
-                           fps->md->name, fps->md->workdir);
+    EXECUTE_SYSTEM_COMMAND("tmux send-keys -t %s:conf \"cd %s\" C-m", fps->md->name, fps->md->workdir);
 
-    EXECUTE_SYSTEM_COMMAND("tmux send-keys -t %s:conf \"fpsconfstart\" C-m",
-                           fps->md->name);
+    EXECUTE_SYSTEM_COMMAND("tmux send-keys -t %s:conf \"fpsconfstart\" C-m", fps->md->name);
 
     fps->md->status |= FUNCTION_PARAMETER_STRUCT_STATUS_CMDCONF;
 
@@ -37,4 +28,3 @@ errno_t functionparameter_CONFstart(
 
     return RETURN_SUCCESS;
 }
-
diff --git a/src/CommandLineInterface/fps_CONFstart.h b/src/CommandLineInterface/fps_CONFstart.h
index ba5f7698..fad1d890 100644
--- a/src/CommandLineInterface/fps_CONFstart.h
+++ b/src/CommandLineInterface/fps_CONFstart.h
@@ -7,8 +7,6 @@
 #ifndef FPS_CONFSTART_H
 #define FPS_CONFSTART_H
 
-errno_t functionparameter_CONFstart(
-    FUNCTION_PARAMETER_STRUCT *fps
-);
+errno_t functionparameter_CONFstart(FUNCTION_PARAMETER_STRUCT *fps);
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/CommandLineInterface/fps_CONFstop.c b/src/CommandLineInterface/fps_CONFstop.c
index 7a442ac9..56ef1ea3 100644
--- a/src/CommandLineInterface/fps_CONFstop.c
+++ b/src/CommandLineInterface/fps_CONFstop.c
@@ -3,21 +3,15 @@
  * @brief   FPS conf process stop
  */
 
-
-
 #include "CommandLineInterface/CLIcore.h"
 
-
-
 /** @brief FPS stop CONF process
- * 
+ *
  */
-errno_t functionparameter_CONFstop(
-    FUNCTION_PARAMETER_STRUCT *fps
-)
+errno_t functionparameter_CONFstop(FUNCTION_PARAMETER_STRUCT *fps)
 {
-	// send conf stop signal
-	fps->md->signal &= ~FUNCTION_PARAMETER_STRUCT_SIGNAL_CONFRUN;
+    // send conf stop signal
+    fps->md->signal &= ~FUNCTION_PARAMETER_STRUCT_SIGNAL_CONFRUN;
 
     return RETURN_SUCCESS;
 }
diff --git a/src/CommandLineInterface/fps_CONFstop.h b/src/CommandLineInterface/fps_CONFstop.h
index 1ac7adc3..6f5ce235 100644
--- a/src/CommandLineInterface/fps_CONFstop.h
+++ b/src/CommandLineInterface/fps_CONFstop.h
@@ -7,8 +7,6 @@
 #ifndef FPS_CONFSTOP_H
 #define FPS_CONFSTOP_H
 
-errno_t functionparameter_CONFstop(
-    FUNCTION_PARAMETER_STRUCT *fps
-);
+errno_t functionparameter_CONFstop(FUNCTION_PARAMETER_STRUCT *fps);
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/CommandLineInterface/fps_FPCONFexit.c b/src/CommandLineInterface/fps_FPCONFexit.c
index e5c24731..95c3717e 100644
--- a/src/CommandLineInterface/fps_FPCONFexit.c
+++ b/src/CommandLineInterface/fps_FPCONFexit.c
@@ -3,20 +3,16 @@
  * @brief   Exit FPS conf process
  */
 
-
 #include "CommandLineInterface/CLIcore.h"
 
 #include "fps_disconnect.h"
 
-
 uint16_t function_parameter_FPCONFexit(FUNCTION_PARAMETER_STRUCT *fps)
 {
     //fps->md->confpid = 0;
 
-
     fps->md->status &= ~FUNCTION_PARAMETER_STRUCT_STATUS_CMDCONF;
     function_parameter_struct_disconnect(fps);
 
     return 0;
 }
-
diff --git a/src/CommandLineInterface/fps_FPCONFloopstep.c b/src/CommandLineInterface/fps_FPCONFloopstep.c
index a43821d0..287388bc 100644
--- a/src/CommandLineInterface/fps_FPCONFloopstep.c
+++ b/src/CommandLineInterface/fps_FPCONFloopstep.c
@@ -3,14 +3,9 @@
  * @brief   FPS conf process loop step
  */
 
-
 #include "CommandLineInterface/CLIcore.h"
 
-
-
-uint16_t function_parameter_FPCONFloopstep(
-    FUNCTION_PARAMETER_STRUCT *fps
-)
+uint16_t function_parameter_FPCONFloopstep(FUNCTION_PARAMETER_STRUCT *fps)
 {
     static int loopINIT = 0;
     uint16_t updateFLAG = 0;
@@ -18,13 +13,12 @@ uint16_t function_parameter_FPCONFloopstep(
     static uint32_t prev_status;
     //static uint32_t statuschanged = 0;
 
-
-    if(loopINIT == 0)
+    if (loopINIT == 0)
     {
         loopINIT = 1; // update on first loop iteration
         fps->md->signal |= FUNCTION_PARAMETER_STRUCT_SIGNAL_UPDATE;
 
-        if(fps->CMDmode & FPSCMDCODE_CONFSTART)    // parameter configuration loop
+        if (fps->CMDmode & FPSCMDCODE_CONFSTART) // parameter configuration loop
         {
             fps->md->signal |= FUNCTION_PARAMETER_STRUCT_SIGNAL_CONFRUN;
             fps->md->confpid = getpid();
@@ -36,39 +30,34 @@ uint16_t function_parameter_FPCONFloopstep(
         }
     }
 
-
-    if(fps->md->signal & FUNCTION_PARAMETER_STRUCT_SIGNAL_CONFRUN)
+    if (fps->md->signal & FUNCTION_PARAMETER_STRUCT_SIGNAL_CONFRUN)
     {
         // Test if CONF process is running
-        if((getpgid(fps->md->confpid) >= 0) && (fps->md->confpid > 0))
+        if ((getpgid(fps->md->confpid) >= 0) && (fps->md->confpid > 0))
         {
-            fps->md->status |= FUNCTION_PARAMETER_STRUCT_STATUS_CONF;    // running
+            fps->md->status |= FUNCTION_PARAMETER_STRUCT_STATUS_CONF; // running
         }
         else
         {
-            fps->md->status &= ~FUNCTION_PARAMETER_STRUCT_STATUS_CONF;    // not running
+            fps->md->status &= ~FUNCTION_PARAMETER_STRUCT_STATUS_CONF; // not running
         }
 
         // Test if RUN process is running
-        if((getpgid(fps->md->runpid) >= 0) && (fps->md->runpid > 0))
+        if ((getpgid(fps->md->runpid) >= 0) && (fps->md->runpid > 0))
         {
-            fps->md->status |= FUNCTION_PARAMETER_STRUCT_STATUS_RUN;    // running
+            fps->md->status |= FUNCTION_PARAMETER_STRUCT_STATUS_RUN; // running
         }
         else
         {
-            fps->md->status &= ~FUNCTION_PARAMETER_STRUCT_STATUS_RUN;    // not running
+            fps->md->status &= ~FUNCTION_PARAMETER_STRUCT_STATUS_RUN; // not running
         }
 
-
-        if(prev_status != fps->md->status)
+        if (prev_status != fps->md->status)
         {
             fps->md->signal |= FUNCTION_PARAMETER_STRUCT_SIGNAL_UPDATE; // request an update
         }
 
-
-
-        if(fps->md->signal &
-                FUNCTION_PARAMETER_STRUCT_SIGNAL_UPDATE)   // update is required
+        if (fps->md->signal & FUNCTION_PARAMETER_STRUCT_SIGNAL_UPDATE) // update is required
         {
             updateFLAG = 1;
             fps->md->signal &=
@@ -81,11 +70,7 @@ uint16_t function_parameter_FPCONFloopstep(
         fps->localstatus &= ~FPS_LOCALSTATUS_CONFLOOP;
     }
 
-
-
     prev_status = fps->md->status;
 
-
     return updateFLAG;
 }
-
diff --git a/src/CommandLineInterface/fps_FPCONFloopstep.h b/src/CommandLineInterface/fps_FPCONFloopstep.h
index a9edf077..6b6d7bbe 100644
--- a/src/CommandLineInterface/fps_FPCONFloopstep.h
+++ b/src/CommandLineInterface/fps_FPCONFloopstep.h
@@ -8,8 +8,6 @@
 
 #include "function_parameters.h"
 
-uint16_t function_parameter_FPCONFloopstep(
-    FUNCTION_PARAMETER_STRUCT *fps
-);
+uint16_t function_parameter_FPCONFloopstep(FUNCTION_PARAMETER_STRUCT *fps);
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/CommandLineInterface/fps_FPCONFsetup.c b/src/CommandLineInterface/fps_FPCONFsetup.c
index 4c6ef5b8..eede45f8 100644
--- a/src/CommandLineInterface/fps_FPCONFsetup.c
+++ b/src/CommandLineInterface/fps_FPCONFsetup.c
@@ -3,23 +3,18 @@
  * @brief   FPS config setup
  */
 
-
-#include "CommandLineInterface/CLIcore.h"
 #include "COREMOD_memory/fps_create.h"
+#include "CommandLineInterface/CLIcore.h"
 
 #include "fps_connect.h"
 #include "fps_disconnect.h"
 
-
 /** @brief FPS config setup
  *
  * called by conf and run functions
  *
  */
-FUNCTION_PARAMETER_STRUCT function_parameter_FPCONFsetup(
-    const char *fpsname,
-    uint32_t CMDmode
-)
+FUNCTION_PARAMETER_STRUCT function_parameter_FPCONFsetup(const char *fpsname, uint32_t CMDmode)
 {
     long NBparamMAX = FUNCTION_PARAMETER_NBPARAM_DEFAULT;
     uint32_t FPSCONNECTFLAG;
@@ -35,9 +30,9 @@ FUNCTION_PARAMETER_STRUCT function_parameter_FPCONFsetup(
     data.FPS_TIMESTAMP = tnow.tv_sec;
 
     strcpy(data.FPS_PROCESS_TYPE, "UNDEF");
-//	char ptstring[STRINGMAXLEN_FPSPROCESSTYPE];
+    //	char ptstring[STRINGMAXLEN_FPSPROCESSTYPE];
 
-    switch(CMDmode)
+    switch (CMDmode)
     {
     case FPSCMDCODE_CONFSTART:
         snprintf(data.FPS_PROCESS_TYPE, STRINGMAXLEN_FPSPROCESSTYPE, "confstart-%s", fpsname);
@@ -63,7 +58,6 @@ FUNCTION_PARAMETER_STRUCT function_parameter_FPCONFsetup(
         snprintf(data.FPS_PROCESS_TYPE, STRINGMAXLEN_FPSPROCESSTYPE, "runstop-%s", fpsname);
         break;
 
-
     case FPSCMDCODE_TMUXSTART:
         snprintf(data.FPS_PROCESS_TYPE, STRINGMAXLEN_FPSPROCESSTYPE, "tmuxstart-%s", fpsname);
         break;
@@ -71,42 +65,37 @@ FUNCTION_PARAMETER_STRUCT function_parameter_FPCONFsetup(
     case FPSCMDCODE_TMUXSTOP:
         snprintf(data.FPS_PROCESS_TYPE, STRINGMAXLEN_FPSPROCESSTYPE, "tmuxstop-%s", fpsname);
         break;
-
     }
 
-
-
-
-    if(CMDmode & FPSCMDCODE_FPSINITCREATE)   // (re-)create fps even if it exists
+    if (CMDmode & FPSCMDCODE_FPSINITCREATE) // (re-)create fps even if it exists
     {
         //printf("=== FPSINITCREATE NBparamMAX = %ld\n", NBparamMAX);
         function_parameter_struct_create(NBparamMAX, fpsname);
         function_parameter_struct_connect(fpsname, &fps, FPSCONNECT_SIMPLE);
     }
-    else     // load existing fps if exists
+    else // load existing fps if exists
     {
         //printf("=== CHECK IF FPS EXISTS\n");
 
-
         FPSCONNECTFLAG = FPSCONNECT_SIMPLE;
-        if(CMDmode & FPSCMDCODE_CONFSTART)
+        if (CMDmode & FPSCMDCODE_CONFSTART)
         {
             FPSCONNECTFLAG = FPSCONNECT_CONF;
         }
 
-        if(function_parameter_struct_connect(fpsname, &fps, FPSCONNECTFLAG) == -1)
+        if (function_parameter_struct_connect(fpsname, &fps, FPSCONNECTFLAG) == -1)
         {
             //printf("=== FPS DOES NOT EXISTS -> CREATE\n");
             function_parameter_struct_create(NBparamMAX, fpsname);
             function_parameter_struct_connect(fpsname, &fps, FPSCONNECTFLAG);
         }
-/*        else
+        /*        else
         {
             printf("=== FPS EXISTS\n");
         }*/
     }
 
-    if(CMDmode & FPSCMDCODE_CONFSTOP)   // stop conf
+    if (CMDmode & FPSCMDCODE_CONFSTOP) // stop conf
     {
         fps.md->signal &= ~FUNCTION_PARAMETER_STRUCT_SIGNAL_CONFRUN;
         function_parameter_struct_disconnect(&fps);
@@ -117,20 +106,15 @@ FUNCTION_PARAMETER_STRUCT function_parameter_FPCONFsetup(
         fps.localstatus |= FPS_LOCALSTATUS_CONFLOOP;
     }
 
-
-
-    if((CMDmode & FPSCMDCODE_FPSINITCREATE) || (CMDmode & FPSCMDCODE_FPSINIT)
-            || (CMDmode & FPSCMDCODE_CONFSTOP))
+    if ((CMDmode & FPSCMDCODE_FPSINITCREATE) || (CMDmode & FPSCMDCODE_FPSINIT) || (CMDmode & FPSCMDCODE_CONFSTOP))
     {
         fps.localstatus &= ~FPS_LOCALSTATUS_CONFLOOP; // do not start conf
     }
 
-    if(CMDmode & FPSCMDCODE_CONFSTART)
+    if (CMDmode & FPSCMDCODE_CONFSTART)
     {
         fps.localstatus |= FPS_LOCALSTATUS_CONFLOOP;
     }
 
-
     return fps;
 }
-
diff --git a/src/CommandLineInterface/fps_FPCONFsetup.h b/src/CommandLineInterface/fps_FPCONFsetup.h
index 0cf8f9ad..515526d1 100644
--- a/src/CommandLineInterface/fps_FPCONFsetup.h
+++ b/src/CommandLineInterface/fps_FPCONFsetup.h
@@ -8,9 +8,6 @@
 
 #include "function_parameters.h"
 
-FUNCTION_PARAMETER_STRUCT function_parameter_FPCONFsetup(
-    const char *fpsname,
-    uint32_t CMDmode
-);
+FUNCTION_PARAMETER_STRUCT function_parameter_FPCONFsetup(const char *fpsname, uint32_t CMDmode);
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/CommandLineInterface/fps_FPSremove.c b/src/CommandLineInterface/fps_FPSremove.c
index 2b5e3bf3..2cb89c3a 100644
--- a/src/CommandLineInterface/fps_FPSremove.c
+++ b/src/CommandLineInterface/fps_FPSremove.c
@@ -5,18 +5,12 @@
 
 #include "CommandLineInterface/CLIcore.h"
 
-
-
-
-
 /** @brief remove FPS and associated files
  *
  * Requires CONF and RUN to be off
  *
  */
-errno_t functionparameter_FPSremove(
-    FUNCTION_PARAMETER_STRUCT *fps
-)
+errno_t functionparameter_FPSremove(FUNCTION_PARAMETER_STRUCT *fps)
 {
 
     // get directory name
@@ -37,8 +31,8 @@ errno_t functionparameter_FPSremove(
     //    remove(conflogfname);
     int ret = remove(fpsfname);
     int errcode = errno;
-    (void) ret;
-    (void) errcode;
+    (void)ret;
+    (void)errcode;
 
     // TEST
     /*
@@ -77,22 +71,14 @@ errno_t functionparameter_FPSremove(
 
     // terminate tmux sessions
     // 2x exit required: first one to exit bash, second one to exit tmux
-    EXECUTE_SYSTEM_COMMAND("tmux send-keys -t %s:ctrl \"exit\" C-m",
-                           fps->md->name);
-    EXECUTE_SYSTEM_COMMAND("tmux send-keys -t %s:ctrl \"exit\" C-m",
-                           fps->md->name);
+    EXECUTE_SYSTEM_COMMAND("tmux send-keys -t %s:ctrl \"exit\" C-m", fps->md->name);
+    EXECUTE_SYSTEM_COMMAND("tmux send-keys -t %s:ctrl \"exit\" C-m", fps->md->name);
 
-    EXECUTE_SYSTEM_COMMAND("tmux send-keys -t %s:conf \"exit\" C-m",
-                           fps->md->name);
-    EXECUTE_SYSTEM_COMMAND("tmux send-keys -t %s:conf \"exit\" C-m",
-                           fps->md->name);
+    EXECUTE_SYSTEM_COMMAND("tmux send-keys -t %s:conf \"exit\" C-m", fps->md->name);
+    EXECUTE_SYSTEM_COMMAND("tmux send-keys -t %s:conf \"exit\" C-m", fps->md->name);
 
-    EXECUTE_SYSTEM_COMMAND("tmux send-keys -t %s:run \"exit\" C-m",
-                           fps->md->name);
-    EXECUTE_SYSTEM_COMMAND("tmux send-keys -t %s:run \"exit\" C-m",
-                           fps->md->name);
+    EXECUTE_SYSTEM_COMMAND("tmux send-keys -t %s:run \"exit\" C-m", fps->md->name);
+    EXECUTE_SYSTEM_COMMAND("tmux send-keys -t %s:run \"exit\" C-m", fps->md->name);
 
     return RETURN_SUCCESS;
 }
-
-
diff --git a/src/CommandLineInterface/fps_FPSremove.h b/src/CommandLineInterface/fps_FPSremove.h
index cfaf36e7..556b4a3b 100644
--- a/src/CommandLineInterface/fps_FPSremove.h
+++ b/src/CommandLineInterface/fps_FPSremove.h
@@ -8,8 +8,6 @@
 
 #include "function_parameters.h"
 
-errno_t functionparameter_FPSremove(
-    FUNCTION_PARAMETER_STRUCT *fps
-);
+errno_t functionparameter_FPSremove(FUNCTION_PARAMETER_STRUCT *fps);
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/CommandLineInterface/fps_GetFileName.c b/src/CommandLineInterface/fps_GetFileName.c
index b0f3b456..9b9f8f2e 100644
--- a/src/CommandLineInterface/fps_GetFileName.c
+++ b/src/CommandLineInterface/fps_GetFileName.c
@@ -3,45 +3,37 @@
  * @brief   get FPS filename for entry
  */
 
-
 #include "CommandLineInterface/CLIcore.h"
 
-
-int functionparameter_GetFileName(
-    FUNCTION_PARAMETER_STRUCT *fps,
-    FUNCTION_PARAMETER *fparam,
-    char *outfname,
-    char *tagname
-)
+int functionparameter_GetFileName(FUNCTION_PARAMETER_STRUCT *fps, FUNCTION_PARAMETER *fparam, char *outfname,
+                                  char *tagname)
 {
-    int stringmaxlen = STRINGMAXLEN_DIRNAME/2;
+    int stringmaxlen = STRINGMAXLEN_DIRNAME / 2;
     char ffname[STRINGMAXLEN_FULLFILENAME]; // full filename
     char fname1[stringmaxlen];
     int l;
     char fpsconfdirname[STRINGMAXLEN_DIRNAME];
 
-    if(snprintf(fpsconfdirname, stringmaxlen, "%s/fpsconf", fps->md->workdir) < 0)
+    if (snprintf(fpsconfdirname, stringmaxlen, "%s/fpsconf", fps->md->workdir) < 0)
     {
         PRINT_ERROR("snprintf error");
     }
 
     EXECUTE_SYSTEM_COMMAND("mkdir -p %s", fpsconfdirname);
 
-
     // build up directory name
-    for(l = 0; l < fparam->keywordlevel - 1; l++)
+    for (l = 0; l < fparam->keywordlevel - 1; l++)
     {
-        if(snprintf(fname1, stringmaxlen, "/%s", fparam->keyword[l]) < 0)
+        if (snprintf(fname1, stringmaxlen, "/%s", fparam->keyword[l]) < 0)
         {
             PRINT_ERROR("snprintf error");
         }
-        strncat(fpsconfdirname, fname1, STRINGMAXLEN_DIRNAME-1);
+        strncat(fpsconfdirname, fname1, STRINGMAXLEN_DIRNAME - 1);
 
         EXECUTE_SYSTEM_COMMAND("mkdir -p %s", fpsconfdirname);
     }
 
-    if(snprintf(fname1, stringmaxlen, "/%s.%s.txt", fparam->keyword[l],
-                tagname) < 0)
+    if (snprintf(fname1, stringmaxlen, "/%s.%s.txt", fparam->keyword[l], tagname) < 0)
     {
         PRINT_ERROR("snprintf error");
     }
@@ -52,4 +44,3 @@ int functionparameter_GetFileName(
 
     return 0;
 }
-
diff --git a/src/CommandLineInterface/fps_GetFileName.h b/src/CommandLineInterface/fps_GetFileName.h
index 8fd3b086..57a536e7 100644
--- a/src/CommandLineInterface/fps_GetFileName.h
+++ b/src/CommandLineInterface/fps_GetFileName.h
@@ -8,11 +8,7 @@
 
 #include "function_parameters.h"
 
-int functionparameter_GetFileName(
-    FUNCTION_PARAMETER_STRUCT *fps,
-    FUNCTION_PARAMETER *fparam,
-    char *outfname,
-    char *tagname
-);
+int functionparameter_GetFileName(FUNCTION_PARAMETER_STRUCT *fps, FUNCTION_PARAMETER *fparam, char *outfname,
+                                  char *tagname);
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/CommandLineInterface/fps_GetParamIndex.c b/src/CommandLineInterface/fps_GetParamIndex.c
index e2bb289b..d52bb27e 100644
--- a/src/CommandLineInterface/fps_GetParamIndex.c
+++ b/src/CommandLineInterface/fps_GetParamIndex.c
@@ -3,31 +3,23 @@
  * @brief   Get index of parameter
  */
 
-
 #include "CommandLineInterface/CLIcore.h"
 
-
-
-
-int functionparameter_GetParamIndex(
-    FUNCTION_PARAMETER_STRUCT *fps,
-    const char                *paramname
-)
+int functionparameter_GetParamIndex(FUNCTION_PARAMETER_STRUCT *fps, const char *paramname)
 {
     long index = -1;
     long pindex = 0;
 
-
     long NBparamMAX = fps->md->NBparamMAX;
 
     int found = 0;
-    for(pindex = 0; pindex < NBparamMAX; pindex++)
+    for (pindex = 0; pindex < NBparamMAX; pindex++)
     {
-        if(found == 0)
+        if (found == 0)
         {
-            if(fps->parray[pindex].fpflag & FPFLAG_ACTIVE)
+            if (fps->parray[pindex].fpflag & FPFLAG_ACTIVE)
             {
-                if(strstr(fps->parray[pindex].keywordfull, paramname) != NULL)
+                if (strstr(fps->parray[pindex].keywordfull, paramname) != NULL)
                 {
                     index = pindex;
                     found = 1;
diff --git a/src/CommandLineInterface/fps_GetParamIndex.h b/src/CommandLineInterface/fps_GetParamIndex.h
index c5681ec6..f8ab36f1 100644
--- a/src/CommandLineInterface/fps_GetParamIndex.h
+++ b/src/CommandLineInterface/fps_GetParamIndex.h
@@ -8,9 +8,6 @@
 
 #include "function_parameters.h"
 
-int functionparameter_GetParamIndex(
-    FUNCTION_PARAMETER_STRUCT *fps,
-    const char                *paramname
-);
+int functionparameter_GetParamIndex(FUNCTION_PARAMETER_STRUCT *fps, const char *paramname);
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/CommandLineInterface/fps_GetTypeString.c b/src/CommandLineInterface/fps_GetTypeString.c
index 8e7096c5..93cd37e1 100644
--- a/src/CommandLineInterface/fps_GetTypeString.c
+++ b/src/CommandLineInterface/fps_GetTypeString.c
@@ -2,94 +2,85 @@
  * @file    fps_GetTypeString.c
  */
 
-
 #include "CommandLineInterface/CLIcore.h"
 
-
-
-errno_t functionparameter_GetTypeString(
-    uint32_t type,
-    char *typestring
-)
+errno_t functionparameter_GetTypeString(uint32_t type, char *typestring)
 {
 
     sprintf(typestring, " ");
 
     // using if statements (not switch) to allow for multiple types
-    if(type & FPTYPE_UNDEF)
+    if (type & FPTYPE_UNDEF)
     {
         strcat(typestring, "UNDEF ");
     }
 
-    if(type & FPTYPE_INT32)
+    if (type & FPTYPE_INT32)
     {
         strcat(typestring, "INT32 ");
     }
-    if(type & FPTYPE_UINT32)
+    if (type & FPTYPE_UINT32)
     {
         strcat(typestring, "UINT32 ");
     }
-    if(type & FPTYPE_INT64)
+    if (type & FPTYPE_INT64)
     {
         strcat(typestring, "INT64 ");
     }
-    if(type & FPTYPE_UINT64)
+    if (type & FPTYPE_UINT64)
     {
         strcat(typestring, "UINT64 ");
     }
 
-
-    if(type & FPTYPE_FLOAT64)
+    if (type & FPTYPE_FLOAT64)
     {
         strcat(typestring, "FLOAT64 ");
     }
-    if(type & FPTYPE_FLOAT32)
+    if (type & FPTYPE_FLOAT32)
     {
         strcat(typestring, "FLOAT32 ");
     }
 
-
-    if(type & FPTYPE_PID)
+    if (type & FPTYPE_PID)
     {
         strcat(typestring, "PID ");
     }
-    if(type & FPTYPE_TIMESPEC)
+    if (type & FPTYPE_TIMESPEC)
     {
         strcat(typestring, "TIMESPEC ");
     }
-    if(type & FPTYPE_FILENAME)
+    if (type & FPTYPE_FILENAME)
     {
         strcat(typestring, "FILENAME ");
     }
-    if(type & FPTYPE_FITSFILENAME)
+    if (type & FPTYPE_FITSFILENAME)
     {
         strcat(typestring, "FITSFILENAME ");
     }
-    if(type & FPTYPE_EXECFILENAME)
+    if (type & FPTYPE_EXECFILENAME)
     {
         strcat(typestring, "EXECFILENAME");
     }
-    if(type & FPTYPE_DIRNAME)
+    if (type & FPTYPE_DIRNAME)
     {
         strcat(typestring, "DIRNAME");
     }
-    if(type & FPTYPE_STREAMNAME)
+    if (type & FPTYPE_STREAMNAME)
     {
         strcat(typestring, "STREAMNAME");
     }
-    if(type & FPTYPE_STRING)
+    if (type & FPTYPE_STRING)
     {
         strcat(typestring, "STRING ");
     }
-    if(type & FPTYPE_ONOFF)
+    if (type & FPTYPE_ONOFF)
     {
         strcat(typestring, "ONOFF ");
     }
-    if(type & FPTYPE_FPSNAME)
+    if (type & FPTYPE_FPSNAME)
     {
         strcat(typestring, "FPSNAME ");
     }
 
     return RETURN_SUCCESS;
 }
-
diff --git a/src/CommandLineInterface/fps_GetTypeString.h b/src/CommandLineInterface/fps_GetTypeString.h
index a2ab2512..3fb5956a 100644
--- a/src/CommandLineInterface/fps_GetTypeString.h
+++ b/src/CommandLineInterface/fps_GetTypeString.h
@@ -5,9 +5,6 @@
 #ifndef FPS_GETTYPESTRING_H
 #define FPS_GETTYPESTRING_H
 
-errno_t functionparameter_GetTypeString(
-    uint32_t type,
-    char *typestring
-);
+errno_t functionparameter_GetTypeString(uint32_t type, char *typestring);
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/CommandLineInterface/fps_PrintParameterInfo.c b/src/CommandLineInterface/fps_PrintParameterInfo.c
index a5093132..fc9f5217 100644
--- a/src/CommandLineInterface/fps_PrintParameterInfo.c
+++ b/src/CommandLineInterface/fps_PrintParameterInfo.c
@@ -3,41 +3,30 @@
  * @brief   print FPS parameter status/values
  */
 
-
 #include <limits.h> // CHAR_BIT
 
-
-
 #include "CommandLineInterface/CLIcore.h"
 
 #include "fps_GetTypeString.h"
 
 #include "TUItools.h"
 
-
-
-
-
-errno_t functionparameter_PrintParameterInfo(
-    FUNCTION_PARAMETER_STRUCT *fpsentry,
-    int pindex
-)
+errno_t functionparameter_PrintParameterInfo(FUNCTION_PARAMETER_STRUCT *fpsentry, int pindex)
 {
     printf("%s\n", fpsentry->parray[pindex].description);
     printf("\n");
 
-
     printf("------------- FUNCTION PARAMETER STRUCTURE\n");
     printf("FPS name       : %s\n", fpsentry->md->name);
     printf("   %s ", fpsentry->md->pname);
     int i;
-    for(i = 0; i < fpsentry->md->NBnameindex; i++)
+    for (i = 0; i < fpsentry->md->NBnameindex; i++)
     {
         printf(" [%s]", fpsentry->md->nameindexW[i]);
     }
     printf("\n\n");
 
-    if(fpsentry->md->status & FUNCTION_PARAMETER_STRUCT_STATUS_CHECKOK)
+    if (fpsentry->md->status & FUNCTION_PARAMETER_STRUCT_STATUS_CHECKOK)
     {
         printf("[%ld] Scan OK\n", fpsentry->md->msgcnt);
     }
@@ -45,48 +34,39 @@ errno_t functionparameter_PrintParameterInfo(
     {
         int msgi;
 
-        printf("%s [%ld] %d ERROR(s)\n", fpsentry->md->name, fpsentry->md->msgcnt,
-               fpsentry->md->conferrcnt);
-        for(msgi = 0; msgi < fpsentry->md->msgcnt; msgi++)
+        printf("%s [%ld] %d ERROR(s)\n", fpsentry->md->name, fpsentry->md->msgcnt, fpsentry->md->conferrcnt);
+        for (msgi = 0; msgi < fpsentry->md->msgcnt; msgi++)
         {
-            printf("%s [%3d] %s\n", fpsentry->md->name, fpsentry->md->msgpindex[msgi],
-                   fpsentry->md->message[msgi]);
+            printf("%s [%3d] %s\n", fpsentry->md->name, fpsentry->md->msgpindex[msgi], fpsentry->md->message[msgi]);
         }
     }
 
-
     //snprintf(fpsentry->md->message[fpsentry->md->msgcnt], FUNCTION_PARAMETER_STRUCT_MSG_SIZE, "cannot load stream");
     //			fpsentry->md->msgcnt++;
 
     printf("\n");
 
-
-
     printf("------------- FUNCTION PARAMETER \n");
-    printf("[%d] Parameter name : %s\n", pindex,
-           fpsentry->parray[pindex].keywordfull);
+    printf("[%d] Parameter name : %s\n", pindex, fpsentry->parray[pindex].keywordfull);
 
     char typestring[100];
     functionparameter_GetTypeString(fpsentry->parray[pindex].type, typestring);
     printf("type: %s\n", typestring);
 
-
     printf("\n");
     printf("-- FLAG: ");
 
-
-
     // print binary flag
     TUI_printfw("FLAG : ");
-    uint64_t mask = (uint64_t) 1 << (sizeof(uint64_t) * CHAR_BIT - 1);
-    while(mask)
+    uint64_t mask = (uint64_t)1 << (sizeof(uint64_t) * CHAR_BIT - 1);
+    while (mask)
     {
         int digit = fpsentry->parray[pindex].fpflag & mask ? 1 : 0;
-        if(digit == 1)
+        if (digit == 1)
         {
-            printf( AECBOLDHIGREEN );
+            printf(AECBOLDHIGREEN);
             printf("%d", digit);
-            printf( AECNORMAL );
+            printf(AECNORMAL);
         }
         else
         {
@@ -96,36 +76,35 @@ errno_t functionparameter_PrintParameterInfo(
     }
     printf("\n");
 
-
     int flagstringlen = 32;
 
-    if(fpsentry->parray[pindex].fpflag & FPFLAG_ACTIVE)
+    if (fpsentry->parray[pindex].fpflag & FPFLAG_ACTIVE)
     {
-        printf( AECBOLDHIGREEN );
+        printf(AECBOLDHIGREEN);
         printf("%*s", flagstringlen, "ACTIVE");
-        printf( AECNORMAL );
+        printf(AECNORMAL);
     }
     else
     {
         printf("%*s", flagstringlen, "ACTIVE");
     }
 
-    if(fpsentry->parray[pindex].fpflag & FPFLAG_USED)
+    if (fpsentry->parray[pindex].fpflag & FPFLAG_USED)
     {
-        printf( AECBOLDHIGREEN );
+        printf(AECBOLDHIGREEN);
         printf("%*s", flagstringlen, "USED");
-        printf( AECNORMAL );
+        printf(AECNORMAL);
     }
     else
     {
         printf("%*s", flagstringlen, "USED");
     }
 
-    if(fpsentry->parray[pindex].fpflag & FPFLAG_VISIBLE)
+    if (fpsentry->parray[pindex].fpflag & FPFLAG_VISIBLE)
     {
-        printf( AECBOLDHIGREEN );
+        printf(AECBOLDHIGREEN);
         printf("%*s", flagstringlen, "VISIBLE");
-        printf( AECNORMAL );
+        printf(AECNORMAL);
     }
     else
     {
@@ -136,44 +115,44 @@ errno_t functionparameter_PrintParameterInfo(
 
     printf("\n");
 
-    if(fpsentry->parray[pindex].fpflag & FPFLAG_WRITE)
+    if (fpsentry->parray[pindex].fpflag & FPFLAG_WRITE)
     {
-        printf( AECBOLDHIGREEN );
+        printf(AECBOLDHIGREEN);
         printf("%*s", flagstringlen, "WRITE");
-        printf( AECNORMAL );
+        printf(AECNORMAL);
     }
     else
     {
         printf("%*s", flagstringlen, "WRITE");
     }
 
-    if(fpsentry->parray[pindex].fpflag & FPFLAG_WRITECONF)
+    if (fpsentry->parray[pindex].fpflag & FPFLAG_WRITECONF)
     {
-        printf( AECBOLDHIGREEN );
+        printf(AECBOLDHIGREEN);
         printf("%*s", flagstringlen, "WRITECONF");
-        printf( AECNORMAL );
+        printf(AECNORMAL);
     }
     else
     {
         printf("%*s", flagstringlen, "WRITECONF");
     }
 
-    if(fpsentry->parray[pindex].fpflag & FPFLAG_WRITERUN)
+    if (fpsentry->parray[pindex].fpflag & FPFLAG_WRITERUN)
     {
-        printf( AECBOLDHIGREEN );
+        printf(AECBOLDHIGREEN);
         printf("%*s", flagstringlen, "WRITERUN");
-        printf( AECNORMAL );
+        printf(AECNORMAL);
     }
     else
     {
         printf("%*s", flagstringlen, "WRITERUN");
     }
 
-    if(fpsentry->parray[pindex].fpflag & FPFLAG_WRITESTATUS)
+    if (fpsentry->parray[pindex].fpflag & FPFLAG_WRITESTATUS)
     {
-        printf( AECBOLDHIGREEN );
+        printf(AECBOLDHIGREEN);
         printf("%*s", flagstringlen, "WRITESTATUS");
-        printf( AECNORMAL );
+        printf(AECNORMAL);
     }
     else
     {
@@ -182,313 +161,302 @@ errno_t functionparameter_PrintParameterInfo(
 
     printf("\n");
 
-    if(fpsentry->parray[pindex].fpflag & FPFLAG_LOG)
+    if (fpsentry->parray[pindex].fpflag & FPFLAG_LOG)
     {
-        printf( AECBOLDHIGREEN );
+        printf(AECBOLDHIGREEN);
         printf("%*s", flagstringlen, "LOG");
-        printf( AECNORMAL );
+        printf(AECNORMAL);
     }
     else
     {
         printf("%*s", flagstringlen, "LOG");
     }
 
-    if(fpsentry->parray[pindex].fpflag & FPFLAG_SAVEONCHANGE)
+    if (fpsentry->parray[pindex].fpflag & FPFLAG_SAVEONCHANGE)
     {
-        printf( AECBOLDHIGREEN );
+        printf(AECBOLDHIGREEN);
         printf("%*s", flagstringlen, "SAVEONCHANGE");
-        printf( AECNORMAL );
+        printf(AECNORMAL);
     }
     else
     {
         printf("%*s", flagstringlen, "SAVEONCHANGE");
     }
 
-    if(fpsentry->parray[pindex].fpflag & FPFLAG_SAVEONCLOSE)
+    if (fpsentry->parray[pindex].fpflag & FPFLAG_SAVEONCLOSE)
     {
-        printf( AECBOLDHIGREEN );
+        printf(AECBOLDHIGREEN);
         printf("%*s", flagstringlen, "SAVEONCLOSE");
-        printf( AECNORMAL );
+        printf(AECNORMAL);
     }
     else
     {
         printf("%*s", flagstringlen, "SAVEONCLOSE");
     }
 
-
     printf("%*s", flagstringlen, "---");
 
-
     printf("\n");
 
-    if(fpsentry->parray[pindex].fpflag & FPFLAG_IMPORTED)
+    if (fpsentry->parray[pindex].fpflag & FPFLAG_IMPORTED)
     {
-        printf( AECBOLDHIGREEN );
+        printf(AECBOLDHIGREEN);
         printf("%*s", flagstringlen, "IMPORTED");
-        printf( AECNORMAL );
+        printf(AECNORMAL);
     }
     else
     {
         printf("%*s", flagstringlen, "IMPORTED");
     }
 
-    if(fpsentry->parray[pindex].fpflag & FPFLAG_FEEDBACK)
+    if (fpsentry->parray[pindex].fpflag & FPFLAG_FEEDBACK)
     {
-        printf( AECBOLDHIGREEN );
+        printf(AECBOLDHIGREEN);
         printf("%*s", flagstringlen, "FEEDBACK");
-        printf( AECNORMAL );
+        printf(AECNORMAL);
     }
     else
     {
         printf("%*s", flagstringlen, "FEEDBACK");
     }
 
-    if(fpsentry->parray[pindex].fpflag & FPFLAG_ONOFF)
+    if (fpsentry->parray[pindex].fpflag & FPFLAG_ONOFF)
     {
-        printf( AECBOLDHIGREEN );
+        printf(AECBOLDHIGREEN);
         printf("%*s", flagstringlen, "ONOFF");
-        printf( AECNORMAL );
+        printf(AECNORMAL);
     }
     else
     {
         printf("%*s", flagstringlen, "ONOFF");
     }
 
-
     printf("%*s", flagstringlen, "---");
 
-
     printf("\n");
 
-    if(fpsentry->parray[pindex].fpflag & FPFLAG_CHECKINIT)
+    if (fpsentry->parray[pindex].fpflag & FPFLAG_CHECKINIT)
     {
-        printf( AECBOLDHIGREEN );
+        printf(AECBOLDHIGREEN);
         printf("%*s", flagstringlen, "CHECKINIT");
-        printf( AECNORMAL );
+        printf(AECNORMAL);
     }
     else
     {
         printf("%*s", flagstringlen, "CHECKINIT");
     }
 
-    if(fpsentry->parray[pindex].fpflag & FPFLAG_MINLIMIT)
+    if (fpsentry->parray[pindex].fpflag & FPFLAG_MINLIMIT)
     {
-        printf( AECBOLDHIGREEN );
+        printf(AECBOLDHIGREEN);
         printf("%*s", flagstringlen, "MINLIMIT");
-        printf( AECNORMAL );
+        printf(AECNORMAL);
     }
     else
     {
         printf("%*s", flagstringlen, "MINLIMIT");
     }
 
-    if(fpsentry->parray[pindex].fpflag & FPFLAG_MAXLIMIT)
+    if (fpsentry->parray[pindex].fpflag & FPFLAG_MAXLIMIT)
     {
-        printf( AECBOLDHIGREEN );
+        printf(AECBOLDHIGREEN);
         printf("%*s", flagstringlen, "MAXLIMIT");
-        printf( AECNORMAL );
+        printf(AECNORMAL);
     }
     else
     {
         printf("%*s", flagstringlen, "MAXLIMIT");
     }
 
-    if(fpsentry->parray[pindex].fpflag & FPFLAG_ERROR)
+    if (fpsentry->parray[pindex].fpflag & FPFLAG_ERROR)
     {
-        printf( AECBOLDHIGREEN );
+        printf(AECBOLDHIGREEN);
         printf("%*s", flagstringlen, "ERROR");
-        printf( AECNORMAL );
+        printf(AECNORMAL);
     }
     else
     {
         printf("%*s", flagstringlen, "ERROR");
     }
 
-
     printf("\n");
 
-    if(fpsentry->parray[pindex].fpflag & FPFLAG_STREAM_LOAD_FORCE_LOCALMEM)
+    if (fpsentry->parray[pindex].fpflag & FPFLAG_STREAM_LOAD_FORCE_LOCALMEM)
     {
-        printf( AECBOLDHIGREEN );
+        printf(AECBOLDHIGREEN);
         printf("%*s", flagstringlen, "STREAM_LOAD_FORCE_LOCALMEM");
-        printf( AECNORMAL );
+        printf(AECNORMAL);
     }
     else
     {
         printf("%*s", flagstringlen, "STREAM_LOAD_FORCE_LOCALMEM");
     }
 
-    if(fpsentry->parray[pindex].fpflag & FPFLAG_STREAM_LOAD_FORCE_SHAREMEM)
+    if (fpsentry->parray[pindex].fpflag & FPFLAG_STREAM_LOAD_FORCE_SHAREMEM)
     {
-        printf( AECBOLDHIGREEN );
+        printf(AECBOLDHIGREEN);
         printf("%*s", flagstringlen, "STREAM_LOAD_FORCE_SHAREMEM");
-        printf( AECNORMAL );
+        printf(AECNORMAL);
     }
     else
     {
         printf("%*s", flagstringlen, "STREAM_LOAD_FORCE_SHAREMEM");
     }
 
-    if(fpsentry->parray[pindex].fpflag & FPFLAG_STREAM_LOAD_FORCE_CONFFITS)
+    if (fpsentry->parray[pindex].fpflag & FPFLAG_STREAM_LOAD_FORCE_CONFFITS)
     {
-        printf( AECBOLDHIGREEN );
+        printf(AECBOLDHIGREEN);
         printf("%*s", flagstringlen, "STREAM_LOAD_FORCE_CONFFITS");
-        printf( AECNORMAL );
+        printf(AECNORMAL);
     }
     else
     {
         printf("%*s", flagstringlen, "STREAM_LOAD_FORCE_CONFFITS");
     }
 
-    if(fpsentry->parray[pindex].fpflag & FPFLAG_STREAM_LOAD_FORCE_CONFNAME)
+    if (fpsentry->parray[pindex].fpflag & FPFLAG_STREAM_LOAD_FORCE_CONFNAME)
     {
-		printf( AECBOLDHIGREEN );
+        printf(AECBOLDHIGREEN);
         printf("%*s", flagstringlen, "STREAM_LOAD_FORCE_CONFNAME");
-        printf( AECNORMAL );
+        printf(AECNORMAL);
     }
     else
     {
         printf("%*s", flagstringlen, "STREAM_LOAD_FORCE_CONFNAME");
     }
 
-
     printf("\n");
 
-    if(fpsentry->parray[pindex].fpflag & FPFLAG_STREAM_LOAD_SKIPSEARCH_LOCALMEM)
+    if (fpsentry->parray[pindex].fpflag & FPFLAG_STREAM_LOAD_SKIPSEARCH_LOCALMEM)
     {
-		printf( AECBOLDHIGREEN );
+        printf(AECBOLDHIGREEN);
         printf("%*s", flagstringlen, "STREAM_LOAD_SKIPSEARCH_LOCALMEM");
-        printf( AECNORMAL );
+        printf(AECNORMAL);
     }
     else
     {
         printf("%*s", flagstringlen, "STREAM_LOAD_SKIPSEARCH_LOCALMEM");
     }
 
-    if(fpsentry->parray[pindex].fpflag & FPFLAG_STREAM_LOAD_SKIPSEARCH_SHAREMEM)
+    if (fpsentry->parray[pindex].fpflag & FPFLAG_STREAM_LOAD_SKIPSEARCH_SHAREMEM)
     {
-		printf( AECBOLDHIGREEN );
+        printf(AECBOLDHIGREEN);
         printf("%*s", flagstringlen, "STREAM_LOAD_SKIPSEARCH_SHAREMEM");
-        printf( AECNORMAL );
+        printf(AECNORMAL);
     }
     else
     {
         printf("%*s", flagstringlen, "STREAM_LOAD_SKIPSEARCH_SHAREMEM");
     }
 
-    if(fpsentry->parray[pindex].fpflag & FPFLAG_STREAM_LOAD_SKIPSEARCH_CONFFITS)
+    if (fpsentry->parray[pindex].fpflag & FPFLAG_STREAM_LOAD_SKIPSEARCH_CONFFITS)
     {
-		printf( AECBOLDHIGREEN );
+        printf(AECBOLDHIGREEN);
         printf("%*s", flagstringlen, "STREAM_LOAD_SKIPSEARCH_CONFFITS");
-        printf( AECNORMAL );
+        printf(AECNORMAL);
     }
     else
     {
         printf("%*s", flagstringlen, "STREAM_LOAD_SKIPSEARCH_CONFFITS");
     }
 
-
-    if(fpsentry->parray[pindex].fpflag & FPFLAG_STREAM_LOAD_SKIPSEARCH_CONFNAME)
+    if (fpsentry->parray[pindex].fpflag & FPFLAG_STREAM_LOAD_SKIPSEARCH_CONFNAME)
     {
-		printf( AECBOLDHIGREEN );
+        printf(AECBOLDHIGREEN);
         printf("%*s", flagstringlen, "STREAM_LOAD_SKIPSEARCH_CONFNAME");
-        printf( AECNORMAL );
+        printf(AECNORMAL);
     }
     else
     {
         printf("%*s", flagstringlen, "STREAM_LOAD_SKIPSEARCH_CONFNAME");
     }
 
-
     printf("\n");
 
-    if(fpsentry->parray[pindex].fpflag & FPFLAG_STREAM_LOAD_UPDATE_SHAREMEM)
+    if (fpsentry->parray[pindex].fpflag & FPFLAG_STREAM_LOAD_UPDATE_SHAREMEM)
     {
-		printf( AECBOLDHIGREEN );
+        printf(AECBOLDHIGREEN);
         printf("%*s", flagstringlen, "STREAM_LOAD_UPDATE_SHAREMEM");
-        printf( AECNORMAL );
+        printf(AECNORMAL);
     }
     else
     {
         printf("%*s", flagstringlen, "STREAM_LOAD_UPDATE_SHAREMEM");
     }
 
-
-    if(fpsentry->parray[pindex].fpflag & FPFLAG_STREAM_LOAD_UPDATE_CONFFITS)
+    if (fpsentry->parray[pindex].fpflag & FPFLAG_STREAM_LOAD_UPDATE_CONFFITS)
     {
-		printf( AECBOLDHIGREEN );
+        printf(AECBOLDHIGREEN);
         printf("%*s", flagstringlen, "STREAM_LOAD_UPDATE_CONFFITS");
-        printf( AECNORMAL );
+        printf(AECNORMAL);
     }
     else
     {
         printf("%*s", flagstringlen, "STREAM_LOAD_UPDATE_CONFFITS");
     }
 
-
-    if(fpsentry->parray[pindex].fpflag & FPFLAG_FILE_CONF_REQUIRED)
+    if (fpsentry->parray[pindex].fpflag & FPFLAG_FILE_CONF_REQUIRED)
     {
-		printf( AECBOLDHIGREEN );
+        printf(AECBOLDHIGREEN);
         printf("%*s", flagstringlen, "FILE/FPS/STREAM_CONF_REQUIRED");
-        printf( AECNORMAL );
+        printf(AECNORMAL);
     }
     else
     {
         printf("%*s", flagstringlen, "FILE/FPS/STREAM_CONF_REQUIRED");
     }
 
-    if(fpsentry->parray[pindex].fpflag & FPFLAG_FILE_RUN_REQUIRED)
+    if (fpsentry->parray[pindex].fpflag & FPFLAG_FILE_RUN_REQUIRED)
     {
-		printf( AECBOLDHIGREEN );
+        printf(AECBOLDHIGREEN);
         printf("%*s", flagstringlen, "FILE/FPS/STREAM_RUN_REQUIRED");
-        printf( AECNORMAL );
+        printf(AECNORMAL);
     }
     else
     {
         printf("%*s", flagstringlen, "FILE/FPS/STREAM_RUN_REQUIRED");
     }
 
-
     printf("\n");
 
-    if(fpsentry->parray[pindex].fpflag & FPFLAG_STREAM_ENFORCE_DATATYPE)
+    if (fpsentry->parray[pindex].fpflag & FPFLAG_STREAM_ENFORCE_DATATYPE)
     {
-		printf( AECBOLDHIGREEN );
+        printf(AECBOLDHIGREEN);
         printf("%*s", flagstringlen, "STREAM_ENFORCE_DATATYPE");
-        printf( AECNORMAL );
+        printf(AECNORMAL);
     }
     else
     {
         printf("%*s", flagstringlen, "STREAM_ENFORCE_DATATYPE");
     }
 
-    if(fpsentry->parray[pindex].fpflag & FPFLAG_STREAM_TEST_DATATYPE_UINT8)
+    if (fpsentry->parray[pindex].fpflag & FPFLAG_STREAM_TEST_DATATYPE_UINT8)
     {
-		printf( AECBOLDHIGREEN );
+        printf(AECBOLDHIGREEN);
         printf("%*s", flagstringlen, "STREAM_TEST_DATATYPE_UINT8");
-        printf( AECNORMAL );
+        printf(AECNORMAL);
     }
     else
     {
         printf("%*s", flagstringlen, "STREAM_TEST_DATATYPE_UINT8");
     }
 
-    if(fpsentry->parray[pindex].fpflag & FPFLAG_STREAM_TEST_DATATYPE_INT8)
+    if (fpsentry->parray[pindex].fpflag & FPFLAG_STREAM_TEST_DATATYPE_INT8)
     {
-		printf( AECBOLDHIGREEN );
+        printf(AECBOLDHIGREEN);
         printf("%*s", flagstringlen, "STREAM_TEST_DATATYPE_INT8");
-        printf( AECNORMAL );
+        printf(AECNORMAL);
     }
     else
     {
         printf("%*s", flagstringlen, "STREAM_TEST_DATATYPE_INT8");
     }
 
-    if(fpsentry->parray[pindex].fpflag & FPFLAG_STREAM_TEST_DATATYPE_UINT16)
+    if (fpsentry->parray[pindex].fpflag & FPFLAG_STREAM_TEST_DATATYPE_UINT16)
     {
-       printf( AECBOLDHIGREEN );
+        printf(AECBOLDHIGREEN);
         printf("%*s", flagstringlen, "STREAM_TEST_DATATYPE_UINT16");
-        printf( AECNORMAL );
+        printf(AECNORMAL);
     }
     else
     {
@@ -497,44 +465,44 @@ errno_t functionparameter_PrintParameterInfo(
 
     printf("\n");
 
-    if(fpsentry->parray[pindex].fpflag & FPFLAG_STREAM_TEST_DATATYPE_INT16)
+    if (fpsentry->parray[pindex].fpflag & FPFLAG_STREAM_TEST_DATATYPE_INT16)
     {
-        printf( AECBOLDHIGREEN );
+        printf(AECBOLDHIGREEN);
         printf("%*s", flagstringlen, "STREAM_TEST_DATATYPE_INT16");
-        printf( AECNORMAL );
+        printf(AECNORMAL);
     }
     else
     {
         printf("%*s", flagstringlen, "STREAM_TEST_DATATYPE_INT16");
     }
 
-    if(fpsentry->parray[pindex].fpflag & FPFLAG_STREAM_TEST_DATATYPE_UINT32)
+    if (fpsentry->parray[pindex].fpflag & FPFLAG_STREAM_TEST_DATATYPE_UINT32)
     {
-        printf( AECBOLDHIGREEN );
+        printf(AECBOLDHIGREEN);
         printf("%*s", flagstringlen, "STREAM_TEST_DATATYPE_UINT32");
-        printf( AECNORMAL );
+        printf(AECNORMAL);
     }
     else
     {
         printf("%*s", flagstringlen, "STREAM_TEST_DATATYPE_UINT32");
     }
 
-    if(fpsentry->parray[pindex].fpflag & FPFLAG_STREAM_TEST_DATATYPE_INT32)
+    if (fpsentry->parray[pindex].fpflag & FPFLAG_STREAM_TEST_DATATYPE_INT32)
     {
-        printf( AECBOLDHIGREEN );
+        printf(AECBOLDHIGREEN);
         printf("%*s", flagstringlen, "STREAM_TEST_DATATYPE_INT32");
-        printf( AECNORMAL );
+        printf(AECNORMAL);
     }
     else
     {
         printf("%*s", flagstringlen, "STREAM_TEST_DATATYPE_INT32");
     }
 
-    if(fpsentry->parray[pindex].fpflag & FPFLAG_STREAM_TEST_DATATYPE_UINT64)
+    if (fpsentry->parray[pindex].fpflag & FPFLAG_STREAM_TEST_DATATYPE_UINT64)
     {
-        printf( AECBOLDHIGREEN );
+        printf(AECBOLDHIGREEN);
         printf("%*s", flagstringlen, "STREAM_TEST_DATATYPE_UINT64");
-        printf( AECNORMAL );
+        printf(AECNORMAL);
     }
     else
     {
@@ -543,152 +511,142 @@ errno_t functionparameter_PrintParameterInfo(
 
     printf("\n");
 
-    if(fpsentry->parray[pindex].fpflag & FPFLAG_STREAM_TEST_DATATYPE_INT64)
+    if (fpsentry->parray[pindex].fpflag & FPFLAG_STREAM_TEST_DATATYPE_INT64)
     {
-        printf( AECBOLDHIGREEN );
+        printf(AECBOLDHIGREEN);
         printf("%*s", flagstringlen, "STREAM_TEST_DATATYPE_INT64");
-        printf( AECNORMAL );
+        printf(AECNORMAL);
     }
     else
     {
         printf("%*s", flagstringlen, "STREAM_TEST_DATATYPE_INT64");
     }
 
-    if(fpsentry->parray[pindex].fpflag & FPFLAG_STREAM_TEST_DATATYPE_HALF)
+    if (fpsentry->parray[pindex].fpflag & FPFLAG_STREAM_TEST_DATATYPE_HALF)
     {
-        printf( AECBOLDHIGREEN );
+        printf(AECBOLDHIGREEN);
         printf("%*s", flagstringlen, "STREAM_TEST_DATATYPE_HALF");
-        printf( AECNORMAL );
+        printf(AECNORMAL);
     }
     else
     {
         printf("%*s", flagstringlen, "STREAM_TEST_DATATYPE_HALF");
     }
 
-    if(fpsentry->parray[pindex].fpflag & FPFLAG_STREAM_TEST_DATATYPE_FLOAT)
+    if (fpsentry->parray[pindex].fpflag & FPFLAG_STREAM_TEST_DATATYPE_FLOAT)
     {
-        printf( AECBOLDHIGREEN );
+        printf(AECBOLDHIGREEN);
         printf("%*s", flagstringlen, "STREAM_TEST_DATATYPE_FLOAT");
-        printf( AECNORMAL );
+        printf(AECNORMAL);
     }
     else
     {
         printf("%*s", flagstringlen, "STREAM_TEST_DATATYPE_FLOAT");
     }
 
-    if(fpsentry->parray[pindex].fpflag & FPFLAG_STREAM_TEST_DATATYPE_DOUBLE)
+    if (fpsentry->parray[pindex].fpflag & FPFLAG_STREAM_TEST_DATATYPE_DOUBLE)
     {
-        printf( AECBOLDHIGREEN );
+        printf(AECBOLDHIGREEN);
         printf("%*s", flagstringlen, "STREAM_TEST_DATATYPE_DOUBLE");
-        printf( AECNORMAL );
+        printf(AECNORMAL);
     }
     else
     {
         printf("%*s", flagstringlen, "STREAM_TEST_DATATYPE_DOUBLE");
     }
 
-
     printf("\n");
 
-    if(fpsentry->parray[pindex].fpflag & FPFLAG_STREAM_ENFORCE_1D)
+    if (fpsentry->parray[pindex].fpflag & FPFLAG_STREAM_ENFORCE_1D)
     {
-        printf( AECBOLDHIGREEN );
+        printf(AECBOLDHIGREEN);
         printf("%*s", flagstringlen, "STREAM_ENFORCE_1D");
-        printf( AECNORMAL );
+        printf(AECNORMAL);
     }
     else
     {
         printf("%*s", flagstringlen, "STREAM_ENFORCE_1D");
     }
 
-    if(fpsentry->parray[pindex].fpflag & FPFLAG_STREAM_ENFORCE_2D)
+    if (fpsentry->parray[pindex].fpflag & FPFLAG_STREAM_ENFORCE_2D)
     {
-        printf( AECBOLDHIGREEN );
+        printf(AECBOLDHIGREEN);
         printf("%*s", flagstringlen, "STREAM_ENFORCE_2D");
-        printf( AECNORMAL );
+        printf(AECNORMAL);
     }
     else
     {
         printf("%*s", flagstringlen, "STREAM_ENFORCE_2D");
     }
 
-    if(fpsentry->parray[pindex].fpflag & FPFLAG_STREAM_ENFORCE_3D)
+    if (fpsentry->parray[pindex].fpflag & FPFLAG_STREAM_ENFORCE_3D)
     {
-        printf( AECBOLDHIGREEN );
+        printf(AECBOLDHIGREEN);
         printf("%*s", flagstringlen, "STREAM_ENFORCE_3D");
-        printf( AECNORMAL );
+        printf(AECNORMAL);
     }
     else
     {
         printf("%*s", flagstringlen, "STREAM_ENFORCE_3D");
     }
 
-    if(fpsentry->parray[pindex].fpflag & FPFLAG_STREAM_ENFORCE_XSIZE)
+    if (fpsentry->parray[pindex].fpflag & FPFLAG_STREAM_ENFORCE_XSIZE)
     {
-        printf( AECBOLDHIGREEN );
+        printf(AECBOLDHIGREEN);
         printf("%*s", flagstringlen, "STREAM_ENFORCE_XSIZE");
-        printf( AECNORMAL );
+        printf(AECNORMAL);
     }
     else
     {
         printf("%*s", flagstringlen, "STREAM_ENFORCE_XSIZE");
     }
 
-
     printf("\n");
 
-    if(fpsentry->parray[pindex].fpflag & FPFLAG_STREAM_ENFORCE_YSIZE)
+    if (fpsentry->parray[pindex].fpflag & FPFLAG_STREAM_ENFORCE_YSIZE)
     {
-        printf( AECBOLDHIGREEN );
+        printf(AECBOLDHIGREEN);
         printf("%*s", flagstringlen, "STREAM_ENFORCE_YSIZE");
-        printf( AECNORMAL );
+        printf(AECNORMAL);
     }
     else
     {
         printf("%*s", flagstringlen, "STREAM_ENFORCE_YSIZE");
     }
 
-    if(fpsentry->parray[pindex].fpflag & FPFLAG_STREAM_ENFORCE_ZSIZE)
+    if (fpsentry->parray[pindex].fpflag & FPFLAG_STREAM_ENFORCE_ZSIZE)
     {
-        printf( AECBOLDHIGREEN );
+        printf(AECBOLDHIGREEN);
         printf("%*s", flagstringlen, "STREAM_ENFORCE_ZSIZE");
-        printf( AECNORMAL );
+        printf(AECNORMAL);
     }
     else
     {
         printf("%*s", flagstringlen, "STREAM_ENFORCE_ZSIZE");
     }
 
-    if(fpsentry->parray[pindex].fpflag & FPFLAG_CHECKSTREAM)
+    if (fpsentry->parray[pindex].fpflag & FPFLAG_CHECKSTREAM)
     {
-        printf( AECBOLDHIGREEN );
+        printf(AECBOLDHIGREEN);
         printf("%*s", flagstringlen, "CHECKSTREAM");
-        printf( AECNORMAL );
+        printf(AECNORMAL);
     }
     else
     {
         printf("%*s", flagstringlen, "CHECKSTREAM");
     }
 
-    if(fpsentry->parray[pindex].fpflag & FPFLAG_STREAM_MEMLOADREPORT)
+    if (fpsentry->parray[pindex].fpflag & FPFLAG_STREAM_MEMLOADREPORT)
     {
-        printf( AECBOLDHIGREEN );
+        printf(AECBOLDHIGREEN);
         printf("%*s", flagstringlen, "STREAM_MEMLOADREPORT");
-        printf( AECNORMAL );
+        printf(AECNORMAL);
     }
     else
     {
         printf("%*s", flagstringlen, "STREAM_MEMLOADREPORT");
     }
 
-
-
-
-
-
-
-
-
     printf("\n");
     printf("\n");
     printf("cnt0 = %ld\n", fpsentry->parray[pindex].cnt0);
@@ -697,69 +655,70 @@ errno_t functionparameter_PrintParameterInfo(
 
     printf("Current value : ");
 
-    if(fpsentry->parray[pindex].type == FPTYPE_UNDEF)
+    if (fpsentry->parray[pindex].type == FPTYPE_UNDEF)
     {
         printf("  %s", "-undef-");
     }
 
-    if(fpsentry->parray[pindex].type == FPTYPE_INT64)
+    if (fpsentry->parray[pindex].type == FPTYPE_INT64)
     {
-        printf("  %10d", (int) fpsentry->parray[pindex].val.i64[0]);
+        printf("  %10d", (int)fpsentry->parray[pindex].val.i64[0]);
     }
 
-    if(fpsentry->parray[pindex].type == FPTYPE_FLOAT64)
+    if (fpsentry->parray[pindex].type == FPTYPE_FLOAT64)
     {
-        printf("  %10f", (float) fpsentry->parray[pindex].val.f64[0]);
+        printf("  %10f", (float)fpsentry->parray[pindex].val.f64[0]);
     }
 
-    if(fpsentry->parray[pindex].type == FPTYPE_FLOAT32)
+    if (fpsentry->parray[pindex].type == FPTYPE_FLOAT32)
     {
-        printf("  %10f", (float) fpsentry->parray[pindex].val.f32[0]);
+        printf("  %10f", (float)fpsentry->parray[pindex].val.f32[0]);
     }
 
-    if(fpsentry->parray[pindex].type == FPTYPE_PID)
+    if (fpsentry->parray[pindex].type == FPTYPE_PID)
     {
-        printf("  %10d", (int) fpsentry->parray[pindex].val.pid[0]);
+        printf("  %10d", (int)fpsentry->parray[pindex].val.pid[0]);
     }
 
-    if(fpsentry->parray[pindex].type == FPTYPE_TIMESPEC)
+    if (fpsentry->parray[pindex].type == FPTYPE_TIMESPEC)
     {
-        printf("  %10f", 1.0*fpsentry->parray[pindex].val.ts[0].tv_sec + 1e-9*fpsentry->parray[pindex].val.ts[0].tv_nsec);
+        printf("  %10f",
+               1.0 * fpsentry->parray[pindex].val.ts[0].tv_sec + 1e-9 * fpsentry->parray[pindex].val.ts[0].tv_nsec);
     }
 
-    if(fpsentry->parray[pindex].type == FPTYPE_FILENAME)
+    if (fpsentry->parray[pindex].type == FPTYPE_FILENAME)
     {
         printf("  %10s", fpsentry->parray[pindex].val.string[0]);
     }
 
-    if(fpsentry->parray[pindex].type == FPTYPE_FITSFILENAME)
+    if (fpsentry->parray[pindex].type == FPTYPE_FITSFILENAME)
     {
         printf("  %10s", fpsentry->parray[pindex].val.string[0]);
     }
 
-    if(fpsentry->parray[pindex].type == FPTYPE_EXECFILENAME)
+    if (fpsentry->parray[pindex].type == FPTYPE_EXECFILENAME)
     {
         printf("  %10s", fpsentry->parray[pindex].val.string[0]);
     }
 
-    if(fpsentry->parray[pindex].type == FPTYPE_DIRNAME)
+    if (fpsentry->parray[pindex].type == FPTYPE_DIRNAME)
     {
         printf("  %10s", fpsentry->parray[pindex].val.string[0]);
     }
 
-    if(fpsentry->parray[pindex].type == FPTYPE_STREAMNAME)
+    if (fpsentry->parray[pindex].type == FPTYPE_STREAMNAME)
     {
         printf("  %10s", fpsentry->parray[pindex].val.string[0]);
     }
 
-    if(fpsentry->parray[pindex].type == FPTYPE_STRING)
+    if (fpsentry->parray[pindex].type == FPTYPE_STRING)
     {
         printf("  %10s", fpsentry->parray[pindex].val.string[0]);
     }
 
-    if(fpsentry->parray[pindex].type == FPTYPE_ONOFF)
+    if (fpsentry->parray[pindex].type == FPTYPE_ONOFF)
     {
-        if(fpsentry->parray[pindex].fpflag & FPFLAG_ONOFF)
+        if (fpsentry->parray[pindex].fpflag & FPFLAG_ONOFF)
         {
             printf("    ON  [ %s ]\n", fpsentry->parray[pindex].val.string[1]);
         }
@@ -769,7 +728,7 @@ errno_t functionparameter_PrintParameterInfo(
         }
     }
 
-    if(fpsentry->parray[pindex].type == FPTYPE_FPSNAME)
+    if (fpsentry->parray[pindex].type == FPTYPE_FPSNAME)
     {
         printf("  %10s", fpsentry->parray[pindex].val.string[0]);
     }
@@ -778,6 +737,4 @@ errno_t functionparameter_PrintParameterInfo(
     printf("\n");
 
     return RETURN_SUCCESS;
-
 }
-
diff --git a/src/CommandLineInterface/fps_PrintParameterInfo.h b/src/CommandLineInterface/fps_PrintParameterInfo.h
index 2701abf1..e0e9ac3e 100644
--- a/src/CommandLineInterface/fps_PrintParameterInfo.h
+++ b/src/CommandLineInterface/fps_PrintParameterInfo.h
@@ -8,9 +8,6 @@
 
 #include "function_parameters.h"
 
-errno_t functionparameter_PrintParameterInfo(
-    FUNCTION_PARAMETER_STRUCT *fpsentry,
-    int pindex
-);
+errno_t functionparameter_PrintParameterInfo(FUNCTION_PARAMETER_STRUCT *fpsentry, int pindex);
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/CommandLineInterface/fps_RUNexit.c b/src/CommandLineInterface/fps_RUNexit.c
index 4555de66..de609b07 100644
--- a/src/CommandLineInterface/fps_RUNexit.c
+++ b/src/CommandLineInterface/fps_RUNexit.c
@@ -3,18 +3,14 @@
  * @brief   Exit FPS run process
  */
 
-
 #include "CommandLineInterface/CLIcore.h"
 
-
 uint16_t function_parameter_RUNexit(FUNCTION_PARAMETER_STRUCT *fps)
 {
     //fps->md->confpid = 0;
 
-
     fps->md->status &= ~FUNCTION_PARAMETER_STRUCT_STATUS_CMDRUN;
     function_parameter_struct_disconnect(fps);
 
     return 0;
 }
-
diff --git a/src/CommandLineInterface/fps_RUNexit.h b/src/CommandLineInterface/fps_RUNexit.h
index 14eea96f..a7c844fa 100644
--- a/src/CommandLineInterface/fps_RUNexit.h
+++ b/src/CommandLineInterface/fps_RUNexit.h
@@ -10,4 +10,4 @@
 
 uint16_t function_parameter_RUNexit(FUNCTION_PARAMETER_STRUCT *fps);
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/CommandLineInterface/fps_RUNstart.c b/src/CommandLineInterface/fps_RUNstart.c
index 6247f770..aeaf9b38 100644
--- a/src/CommandLineInterface/fps_RUNstart.c
+++ b/src/CommandLineInterface/fps_RUNstart.c
@@ -3,14 +3,11 @@
  * @brief   FPS run process start
  */
 
-
-
 #include "CommandLineInterface/CLIcore.h"
 #include "CommandLineInterface/timeutils.h"
 
 #include "fps_GetParamIndex.h"
 
-
 /** @brief FPS start RUN process
  *
  * Requires setup performed by milk-fpsinit, which performs the following setup
@@ -18,27 +15,24 @@
  * - create up tmux sessions
  * - create function fpsrunstart, fpsrunstop, fpsconfstart and fpsconfstop
  */
-errno_t functionparameter_RUNstart(
-    FUNCTION_PARAMETER_STRUCT *fps
-)
+errno_t functionparameter_RUNstart(FUNCTION_PARAMETER_STRUCT *fps)
 {
 
-    if(fps->md->status & FUNCTION_PARAMETER_STRUCT_STATUS_CHECKOK)
+    if (fps->md->status & FUNCTION_PARAMETER_STRUCT_STATUS_CHECKOK)
     {
         long pindex;
 
-
         // Move to correct launch directory
-        EXECUTE_SYSTEM_COMMAND("tmux send-keys -t %s:run \"cd %s\" C-m",
-                               fps->md->name, fps->md->workdir);
-
+        EXECUTE_SYSTEM_COMMAND("tmux send-keys -t %s:run \"cd %s\" C-m", fps->md->name, fps->md->workdir);
 
         // set cset if applicable
         //
         pindex = functionparameter_GetParamIndex(fps, ".procinfo.cset");
-        if(pindex > -1) {
+        if (pindex > -1)
+        {
             //sprintf(cmdprefix, "taskset --cpu-list %s ", fps->parray[pindex].val.string[0]);
-            EXECUTE_SYSTEM_COMMAND("tmux send-keys -t %s:run \"export TCSETCMDPREFIX=\\\"csetpmove %s;\\\"\" C-m", fps->md->name, fps->parray[pindex].val.string[0]);
+            EXECUTE_SYSTEM_COMMAND("tmux send-keys -t %s:run \"export TCSETCMDPREFIX=\\\"csetpmove %s;\\\"\" C-m",
+                                   fps->md->name, fps->parray[pindex].val.string[0]);
         }
         else
         {
@@ -48,9 +42,12 @@ errno_t functionparameter_RUNstart(
         // set taskset if applicable
         //
         pindex = functionparameter_GetParamIndex(fps, ".procinfo.taskset");
-        if(pindex > -1) {
+        if (pindex > -1)
+        {
             //sprintf(cmdprefix, "taskset --cpu-list %s ", fps->parray[pindex].val.string[0]);
-            EXECUTE_SYSTEM_COMMAND("tmux send-keys -t %s:run \"export TCSETCMDPREFIX=\\\"\\${TCSETCMDPREFIX} tsetpmove \\\\\\\"%s\\\\\\\";\\\"\" C-m", fps->md->name, fps->parray[pindex].val.string[0]);
+            EXECUTE_SYSTEM_COMMAND("tmux send-keys -t %s:run \"export TCSETCMDPREFIX=\\\"\\${TCSETCMDPREFIX} tsetpmove "
+                                   "\\\\\\\"%s\\\\\\\";\\\"\" C-m",
+                                   fps->md->name, fps->parray[pindex].val.string[0]);
         }
         else
         {
@@ -60,42 +57,33 @@ errno_t functionparameter_RUNstart(
         // set OMP_NUM_THREADS if applicable
         //
         pindex = functionparameter_GetParamIndex(fps, ".procinfo.NBthread");
-        if(pindex > -1) {
+        if (pindex > -1)
+        {
             long NBthread = functionparameter_GetParamValue_INT64(fps, ".conf.NBthread");
-            EXECUTE_SYSTEM_COMMAND("tmux send-keys -t %s:run \"export OMP_NUM_THREADS=%ld\" C-m", fps->md->name, NBthread);
+            EXECUTE_SYSTEM_COMMAND("tmux send-keys -t %s:run \"export OMP_NUM_THREADS=%ld\" C-m", fps->md->name,
+                                   NBthread);
         }
 
-
-
-
         // override output directory if applicable
         //
         pindex = functionparameter_GetParamIndex(fps, ".conf.datadir");
-        if(pindex > -1) {
-            if(snprintf(fps->md->datadir,
-                        FUNCTION_PARAMETER_STRMAXLEN, "%s", fps->parray[pindex].val.string[0]) < 0)
+        if (pindex > -1)
+        {
+            if (snprintf(fps->md->datadir, FUNCTION_PARAMETER_STRMAXLEN, "%s", fps->parray[pindex].val.string[0]) < 0)
             {
                 PRINT_ERROR("snprintf error");
             }
         }
 
         // create output directory if it does not already exit
-        EXECUTE_SYSTEM_COMMAND("tmux send-keys -t %s:run \"mkdir %s\" C-m",
-                               fps->md->name, fps->md->datadir);
-
-
-
-
+        EXECUTE_SYSTEM_COMMAND("tmux send-keys -t %s:run \"mkdir %s\" C-m", fps->md->name, fps->md->datadir);
 
         // Send run command
         //
-        EXECUTE_SYSTEM_COMMAND("tmux send-keys -t %s:run \"fpsrunstart\" C-m",
-                               fps->md->name);
+        EXECUTE_SYSTEM_COMMAND("tmux send-keys -t %s:run \"fpsrunstart\" C-m", fps->md->name);
 
         fps->md->status |= FUNCTION_PARAMETER_STRUCT_STATUS_CMDRUN;
-        fps->md->signal |=
-            FUNCTION_PARAMETER_STRUCT_SIGNAL_UPDATE; // notify GUI loop to update
+        fps->md->signal |= FUNCTION_PARAMETER_STRUCT_SIGNAL_UPDATE; // notify GUI loop to update
     }
     return RETURN_SUCCESS;
 }
-
diff --git a/src/CommandLineInterface/fps_RUNstart.h b/src/CommandLineInterface/fps_RUNstart.h
index 78769f60..918c4bf4 100644
--- a/src/CommandLineInterface/fps_RUNstart.h
+++ b/src/CommandLineInterface/fps_RUNstart.h
@@ -8,8 +8,6 @@
 
 #include "function_parameters.h"
 
-errno_t functionparameter_RUNstart(
-    FUNCTION_PARAMETER_STRUCT *fps
-);
+errno_t functionparameter_RUNstart(FUNCTION_PARAMETER_STRUCT *fps);
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/CommandLineInterface/fps_RUNstop.c b/src/CommandLineInterface/fps_RUNstop.c
index 3b78f699..b8699ff5 100644
--- a/src/CommandLineInterface/fps_RUNstop.c
+++ b/src/CommandLineInterface/fps_RUNstop.c
@@ -3,35 +3,25 @@
  * @brief   FPS run process stop
  */
 
-
-
 #include "CommandLineInterface/CLIcore.h"
 
-
-
 /** @brief FPS stop RUN process
  *
  * Run pre-set function fpsrunstop in tmux ctrl window
  */
-errno_t functionparameter_RUNstop(
-    FUNCTION_PARAMETER_STRUCT *fps
-)
+errno_t functionparameter_RUNstop(FUNCTION_PARAMETER_STRUCT *fps)
 {
     // Move to correct launch directory
     //
-    EXECUTE_SYSTEM_COMMAND("tmux send-keys -t %s:ctrl \"cd %s\" C-m",
-                           fps->md->name, fps->md->workdir);
+    EXECUTE_SYSTEM_COMMAND("tmux send-keys -t %s:ctrl \"cd %s\" C-m", fps->md->name, fps->md->workdir);
 
-    EXECUTE_SYSTEM_COMMAND("tmux send-keys -t %s:ctrl \"fpsrunstop\" C-m",
-                           fps->md->name);
+    EXECUTE_SYSTEM_COMMAND("tmux send-keys -t %s:ctrl \"fpsrunstop\" C-m", fps->md->name);
 
     // Send C-c in case runstop command is not implemented
-    EXECUTE_SYSTEM_COMMAND("tmux send-keys -t %s:run C-c &> /dev/null",
-                           fps->md->name);
+    EXECUTE_SYSTEM_COMMAND("tmux send-keys -t %s:run C-c &> /dev/null", fps->md->name);
 
     fps->md->status &= ~FUNCTION_PARAMETER_STRUCT_STATUS_CMDRUN;
-    fps->md->signal |=
-        FUNCTION_PARAMETER_STRUCT_SIGNAL_UPDATE; // notify GUI loop to update
+    fps->md->signal |= FUNCTION_PARAMETER_STRUCT_SIGNAL_UPDATE; // notify GUI loop to update
 
     return RETURN_SUCCESS;
 }
diff --git a/src/CommandLineInterface/fps_RUNstop.h b/src/CommandLineInterface/fps_RUNstop.h
index 03662a17..0ed1a3b9 100644
--- a/src/CommandLineInterface/fps_RUNstop.h
+++ b/src/CommandLineInterface/fps_RUNstop.h
@@ -8,8 +8,6 @@
 
 #include "function_parameters.h"
 
-errno_t functionparameter_RUNstop(
-    FUNCTION_PARAMETER_STRUCT *fps
-);
+errno_t functionparameter_RUNstop(FUNCTION_PARAMETER_STRUCT *fps);
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/CommandLineInterface/fps_WriteParameterToDisk.c b/src/CommandLineInterface/fps_WriteParameterToDisk.c
index f244fab6..0211e381 100644
--- a/src/CommandLineInterface/fps_WriteParameterToDisk.c
+++ b/src/CommandLineInterface/fps_WriteParameterToDisk.c
@@ -1,18 +1,15 @@
 /**
  * @file fps_WriteParameterToDisk.c
- * 
+ *
  */
- 
- 
-#include <unistd.h>
+
 #include <sys/syscall.h> // needed for tid = syscall(SYS_gettid);
+#include <unistd.h>
 
 #include "CommandLineInterface/CLIcore.h"
 
-
 #include "fps_GetFileName.h"
 
-
 /** @brief Write parameter to disk
  *
  * ## TAG names
@@ -27,17 +24,12 @@
  *
  *
  */
-int functionparameter_WriteParameterToDisk(
-    FUNCTION_PARAMETER_STRUCT *fpsentry,
-    int pindex,
-    char *tagname,
-    char *commentstr
-)
+int functionparameter_WriteParameterToDisk(FUNCTION_PARAMETER_STRUCT *fpsentry, int pindex, char *tagname,
+                                           char *commentstr)
 {
     char fname[200];
     FILE *fp;
 
-
     // create time change tag
     pid_t tid;
     tid = syscall(SYS_gettid);
@@ -52,210 +44,184 @@ int functionparameter_WriteParameterToDisk(
     struct tm *uttime;
     uttime = gmtime(&now);
 
-    sprintf(timestring, "%04d%02d%02d%02d%02d%02d.%09ld %8ld [%6d %6d] %s",
-            1900 + uttime->tm_year, 1 + uttime->tm_mon, uttime->tm_mday, uttime->tm_hour,
-            uttime->tm_min,  uttime->tm_sec, tnow.tv_nsec,
-            fpsentry->parray[pindex].cnt0, getpid(), (int) tid, commentstr);
-
-
+    sprintf(timestring, "%04d%02d%02d%02d%02d%02d.%09ld %8ld [%6d %6d] %s", 1900 + uttime->tm_year, 1 + uttime->tm_mon,
+            uttime->tm_mday, uttime->tm_hour, uttime->tm_min, uttime->tm_sec, tnow.tv_nsec,
+            fpsentry->parray[pindex].cnt0, getpid(), (int)tid, commentstr);
 
-    if(strcmp(tagname, "setval") == 0)   // VALUE
+    if (strcmp(tagname, "setval") == 0) // VALUE
     {
-        functionparameter_GetFileName(fpsentry, &(fpsentry->parray[pindex]), fname,
-                                      tagname);
+        functionparameter_GetFileName(fpsentry, &(fpsentry->parray[pindex]), fname, tagname);
         fp = fopen(fname, "w");
-        switch(fpsentry->parray[pindex].type)
+        switch (fpsentry->parray[pindex].type)
         {
 
-            case FPTYPE_INT64:
-                fprintf(fp, "%10ld  # %s\n", fpsentry->parray[pindex].val.i64[0], timestring);
-                break;
-
-            case FPTYPE_FLOAT64:
-                fprintf(fp, "%18f  # %s\n", fpsentry->parray[pindex].val.f64[0], timestring);
-                break;
-
-            case FPTYPE_FLOAT32:
-                fprintf(fp, "%18f  # %s\n", fpsentry->parray[pindex].val.f32[0], timestring);
-                break;
-
-            case FPTYPE_PID:
-                fprintf(fp, "%18ld  # %s\n", (long) fpsentry->parray[pindex].val.pid[0],
-                        timestring);
-                break;
-
-            case FPTYPE_TIMESPEC:
-                fprintf(fp, "%15ld %09ld  # %s\n",
-                        (long) fpsentry->parray[pindex].val.ts[0].tv_sec,
-                        (long) fpsentry->parray[pindex].val.ts[0].tv_nsec, timestring);
-                break;
-
-            case FPTYPE_FILENAME:
-                fprintf(fp, "%s  # %s\n", fpsentry->parray[pindex].val.string[0], timestring);
-                break;
-
-            case FPTYPE_FITSFILENAME:
-                fprintf(fp, "%s  # %s\n", fpsentry->parray[pindex].val.string[0], timestring);
-                break;
-
-            case FPTYPE_EXECFILENAME:
-                fprintf(fp, "%s  # %s\n", fpsentry->parray[pindex].val.string[0], timestring);
-                break;
-
-            case FPTYPE_DIRNAME:
-                fprintf(fp, "%s  # %s\n", fpsentry->parray[pindex].val.string[0], timestring);
-                break;
-
-            case FPTYPE_STREAMNAME:
-                fprintf(fp, "%s  # %s\n", fpsentry->parray[pindex].val.string[0], timestring);
-                break;
-
-            case FPTYPE_STRING:
-                fprintf(fp, "%s  # %s\n", fpsentry->parray[pindex].val.string[0], timestring);
-                break;
-
-            case FPTYPE_ONOFF:
-                if(fpsentry->parray[pindex].fpflag & FPFLAG_ONOFF)
-                {
-                    fprintf(fp, "1  %10s # %s\n", fpsentry->parray[pindex].val.string[1],
-                            timestring);
-                }
-                else
-                {
-                    fprintf(fp, "0  %10s # %s\n", fpsentry->parray[pindex].val.string[0],
-                            timestring);
-                }
-                break;
-
-            case FPTYPE_FPSNAME:
-                fprintf(fp, "%s  # %s\n", fpsentry->parray[pindex].val.string[0], timestring);
-                break;
-
+        case FPTYPE_INT64:
+            fprintf(fp, "%10ld  # %s\n", fpsentry->parray[pindex].val.i64[0], timestring);
+            break;
+
+        case FPTYPE_FLOAT64:
+            fprintf(fp, "%18f  # %s\n", fpsentry->parray[pindex].val.f64[0], timestring);
+            break;
+
+        case FPTYPE_FLOAT32:
+            fprintf(fp, "%18f  # %s\n", fpsentry->parray[pindex].val.f32[0], timestring);
+            break;
+
+        case FPTYPE_PID:
+            fprintf(fp, "%18ld  # %s\n", (long)fpsentry->parray[pindex].val.pid[0], timestring);
+            break;
+
+        case FPTYPE_TIMESPEC:
+            fprintf(fp, "%15ld %09ld  # %s\n", (long)fpsentry->parray[pindex].val.ts[0].tv_sec,
+                    (long)fpsentry->parray[pindex].val.ts[0].tv_nsec, timestring);
+            break;
+
+        case FPTYPE_FILENAME:
+            fprintf(fp, "%s  # %s\n", fpsentry->parray[pindex].val.string[0], timestring);
+            break;
+
+        case FPTYPE_FITSFILENAME:
+            fprintf(fp, "%s  # %s\n", fpsentry->parray[pindex].val.string[0], timestring);
+            break;
+
+        case FPTYPE_EXECFILENAME:
+            fprintf(fp, "%s  # %s\n", fpsentry->parray[pindex].val.string[0], timestring);
+            break;
+
+        case FPTYPE_DIRNAME:
+            fprintf(fp, "%s  # %s\n", fpsentry->parray[pindex].val.string[0], timestring);
+            break;
+
+        case FPTYPE_STREAMNAME:
+            fprintf(fp, "%s  # %s\n", fpsentry->parray[pindex].val.string[0], timestring);
+            break;
+
+        case FPTYPE_STRING:
+            fprintf(fp, "%s  # %s\n", fpsentry->parray[pindex].val.string[0], timestring);
+            break;
+
+        case FPTYPE_ONOFF:
+            if (fpsentry->parray[pindex].fpflag & FPFLAG_ONOFF)
+            {
+                fprintf(fp, "1  %10s # %s\n", fpsentry->parray[pindex].val.string[1], timestring);
+            }
+            else
+            {
+                fprintf(fp, "0  %10s # %s\n", fpsentry->parray[pindex].val.string[0], timestring);
+            }
+            break;
+
+        case FPTYPE_FPSNAME:
+            fprintf(fp, "%s  # %s\n", fpsentry->parray[pindex].val.string[0], timestring);
+            break;
         }
         fclose(fp);
     }
 
-
-
-    if(strcmp(tagname, "minval") == 0)   // MIN VALUE
+    if (strcmp(tagname, "minval") == 0) // MIN VALUE
     {
-        functionparameter_GetFileName(fpsentry, &(fpsentry->parray[pindex]), fname,
-                                      tagname);
+        functionparameter_GetFileName(fpsentry, &(fpsentry->parray[pindex]), fname, tagname);
 
-        switch(fpsentry->parray[pindex].type)
+        switch (fpsentry->parray[pindex].type)
         {
 
-            case FPTYPE_INT64:
-                fp = fopen(fname, "w");
-                fprintf(fp, "%10ld  # %s\n", fpsentry->parray[pindex].val.i64[1], timestring);
-                fclose(fp);
-                break;
-
-            case FPTYPE_FLOAT64:
-                fp = fopen(fname, "w");
-                fprintf(fp, "%18f  # %s\n", fpsentry->parray[pindex].val.f64[1], timestring);
-                fclose(fp);
-                break;
-
-            case FPTYPE_FLOAT32:
-                fp = fopen(fname, "w");
-                fprintf(fp, "%18f  # %s\n", fpsentry->parray[pindex].val.f32[1], timestring);
-                fclose(fp);
-                break;
+        case FPTYPE_INT64:
+            fp = fopen(fname, "w");
+            fprintf(fp, "%10ld  # %s\n", fpsentry->parray[pindex].val.i64[1], timestring);
+            fclose(fp);
+            break;
+
+        case FPTYPE_FLOAT64:
+            fp = fopen(fname, "w");
+            fprintf(fp, "%18f  # %s\n", fpsentry->parray[pindex].val.f64[1], timestring);
+            fclose(fp);
+            break;
+
+        case FPTYPE_FLOAT32:
+            fp = fopen(fname, "w");
+            fprintf(fp, "%18f  # %s\n", fpsentry->parray[pindex].val.f32[1], timestring);
+            fclose(fp);
+            break;
         }
     }
 
-
-    if(strcmp(tagname, "maxval") == 0)   // MAX VALUE
+    if (strcmp(tagname, "maxval") == 0) // MAX VALUE
     {
-        functionparameter_GetFileName(fpsentry, &(fpsentry->parray[pindex]), fname,
-                                      tagname);
+        functionparameter_GetFileName(fpsentry, &(fpsentry->parray[pindex]), fname, tagname);
 
-        switch(fpsentry->parray[pindex].type)
+        switch (fpsentry->parray[pindex].type)
         {
 
-            case FPTYPE_INT64:
-                fp = fopen(fname, "w");
-                fprintf(fp, "%10ld  # %s\n", fpsentry->parray[pindex].val.i64[2], timestring);
-                fclose(fp);
-                break;
-
-            case FPTYPE_FLOAT64:
-                fp = fopen(fname, "w");
-                fprintf(fp, "%18f  # %s\n", fpsentry->parray[pindex].val.f64[2], timestring);
-                fclose(fp);
-                break;
-
-            case FPTYPE_FLOAT32:
-                fp = fopen(fname, "w");
-                fprintf(fp, "%18f  # %s\n", fpsentry->parray[pindex].val.f32[2], timestring);
-                fclose(fp);
-                break;
+        case FPTYPE_INT64:
+            fp = fopen(fname, "w");
+            fprintf(fp, "%10ld  # %s\n", fpsentry->parray[pindex].val.i64[2], timestring);
+            fclose(fp);
+            break;
+
+        case FPTYPE_FLOAT64:
+            fp = fopen(fname, "w");
+            fprintf(fp, "%18f  # %s\n", fpsentry->parray[pindex].val.f64[2], timestring);
+            fclose(fp);
+            break;
+
+        case FPTYPE_FLOAT32:
+            fp = fopen(fname, "w");
+            fprintf(fp, "%18f  # %s\n", fpsentry->parray[pindex].val.f32[2], timestring);
+            fclose(fp);
+            break;
         }
     }
 
-
-    if(strcmp(tagname, "currval") == 0)   // CURRENT VALUE
+    if (strcmp(tagname, "currval") == 0) // CURRENT VALUE
     {
-        functionparameter_GetFileName(fpsentry, &(fpsentry->parray[pindex]), fname,
-                                      tagname);
+        functionparameter_GetFileName(fpsentry, &(fpsentry->parray[pindex]), fname, tagname);
 
-        switch(fpsentry->parray[pindex].type)
+        switch (fpsentry->parray[pindex].type)
         {
 
-            case FPTYPE_INT64:
-                fp = fopen(fname, "w");
-                fprintf(fp, "%10ld  # %s\n", fpsentry->parray[pindex].val.i64[3], timestring);
-                fclose(fp);
-                break;
-
-            case FPTYPE_FLOAT64:
-                fp = fopen(fname, "w");
-                fprintf(fp, "%18f  # %s\n", fpsentry->parray[pindex].val.f64[3], timestring);
-                fclose(fp);
-                break;
-
-            case FPTYPE_FLOAT32:
-                fp = fopen(fname, "w");
-                fprintf(fp, "%18f  # %s\n", fpsentry->parray[pindex].val.f32[3], timestring);
-                fclose(fp);
-                break;
+        case FPTYPE_INT64:
+            fp = fopen(fname, "w");
+            fprintf(fp, "%10ld  # %s\n", fpsentry->parray[pindex].val.i64[3], timestring);
+            fclose(fp);
+            break;
+
+        case FPTYPE_FLOAT64:
+            fp = fopen(fname, "w");
+            fprintf(fp, "%18f  # %s\n", fpsentry->parray[pindex].val.f64[3], timestring);
+            fclose(fp);
+            break;
+
+        case FPTYPE_FLOAT32:
+            fp = fopen(fname, "w");
+            fprintf(fp, "%18f  # %s\n", fpsentry->parray[pindex].val.f32[3], timestring);
+            fclose(fp);
+            break;
         }
     }
 
-
-
-
-    if(strcmp(tagname, "fpsname") == 0)   // FPS name
+    if (strcmp(tagname, "fpsname") == 0) // FPS name
     {
-        functionparameter_GetFileName(fpsentry, &(fpsentry->parray[pindex]), fname,
-                                      tagname);
+        functionparameter_GetFileName(fpsentry, &(fpsentry->parray[pindex]), fname, tagname);
         fp = fopen(fname, "w");
         fprintf(fp, "%10s    # %s\n", fpsentry->md->name, timestring);
         fclose(fp);
     }
 
-    if(strcmp(tagname, "fpsdir") == 0)   // FPS name
+    if (strcmp(tagname, "fpsdir") == 0) // FPS name
     {
-        functionparameter_GetFileName(fpsentry, &(fpsentry->parray[pindex]), fname,
-                                      tagname);
+        functionparameter_GetFileName(fpsentry, &(fpsentry->parray[pindex]), fname, tagname);
         fp = fopen(fname, "w");
         fprintf(fp, "%10s    # %s\n", fpsentry->md->workdir, timestring);
         fclose(fp);
     }
 
-    if(strcmp(tagname, "status") == 0)   // FPS name
+    if (strcmp(tagname, "status") == 0) // FPS name
     {
-        functionparameter_GetFileName(fpsentry, &(fpsentry->parray[pindex]), fname,
-                                      tagname);
+        functionparameter_GetFileName(fpsentry, &(fpsentry->parray[pindex]), fname, tagname);
         fp = fopen(fname, "w");
         fprintf(fp, "%10ld    # %s\n", fpsentry->parray[pindex].fpflag, timestring);
         fclose(fp);
     }
 
-
-
     return RETURN_SUCCESS;
 }
-
-
diff --git a/src/CommandLineInterface/fps_WriteParameterToDisk.h b/src/CommandLineInterface/fps_WriteParameterToDisk.h
index f840eb64..e606aaf6 100644
--- a/src/CommandLineInterface/fps_WriteParameterToDisk.h
+++ b/src/CommandLineInterface/fps_WriteParameterToDisk.h
@@ -8,11 +8,7 @@
 
 #include "function_parameters.h"
 
-int functionparameter_WriteParameterToDisk(
-    FUNCTION_PARAMETER_STRUCT *fpsentry,
-    int pindex,
-    char *tagname,
-    char *commentstr
-);
+int functionparameter_WriteParameterToDisk(FUNCTION_PARAMETER_STRUCT *fpsentry, int pindex, char *tagname,
+                                           char *commentstr);
 
 #endif
diff --git a/src/CommandLineInterface/fps_add_entry.c b/src/CommandLineInterface/fps_add_entry.c
index 27e15f63..3ca654a5 100644
--- a/src/CommandLineInterface/fps_add_entry.c
+++ b/src/CommandLineInterface/fps_add_entry.c
@@ -3,34 +3,23 @@
  * @brief   add parameter entry to FPS
  */
 
-
-
 #include "CommandLineInterface/CLIcore.h"
 
-
-
 /** @brief Add parameter to database with default settings
  *
  * If entry already exists, do not modify it
  *
  */
 
-errno_t function_parameter_add_entry(
-    FUNCTION_PARAMETER_STRUCT *fps,
-    const char                *keywordstring,
-    const char                *descriptionstring,
-    uint64_t                   type,
-    uint64_t                   fpflag,
-    void                      *valueptr,
-    long                      *pindexptr
-)
+errno_t function_parameter_add_entry(FUNCTION_PARAMETER_STRUCT *fps, const char *keywordstring,
+                                     const char *descriptionstring, uint64_t type, uint64_t fpflag, void *valueptr,
+                                     long *pindexptr)
 {
     DEBUG_TRACE_FSTART("%s %s", keywordstring, descriptionstring);
 
     long pindex = 0;
     char *pch;
-    char tmpstring[FUNCTION_PARAMETER_KEYWORD_STRMAXLEN *
-                                                        FUNCTION_PARAMETER_KEYWORD_MAXLEVEL];
+    char tmpstring[FUNCTION_PARAMETER_KEYWORD_STRMAXLEN * FUNCTION_PARAMETER_KEYWORD_MAXLEVEL];
     FUNCTION_PARAMETER *funcparamarray;
 
     funcparamarray = fps->parray;
@@ -39,15 +28,10 @@ errno_t function_parameter_add_entry(
 
     NBparamMAX = fps->md->NBparamMAX;
 
-
-
-
-
     // process keywordstring
     // if string starts with ".", insert fps name
-    char keywordstringC[FUNCTION_PARAMETER_KEYWORD_STRMAXLEN *
-                                                             FUNCTION_PARAMETER_KEYWORD_MAXLEVEL];
-    if(keywordstring[0] == '.')
+    char keywordstringC[FUNCTION_PARAMETER_KEYWORD_STRMAXLEN * FUNCTION_PARAMETER_KEYWORD_MAXLEVEL];
+    if (keywordstring[0] == '.')
     {
         //printf("--------------- keywstring \"%s\" starts with dot -> adding \"%s\"\n", keywordstring, fps->md->name);
         sprintf(keywordstringC, "%s%s", fps->md->name, keywordstring);
@@ -58,47 +42,36 @@ errno_t function_parameter_add_entry(
         strcpy(keywordstringC, keywordstring);
     }
 
-
-
     // scan for existing keyword
     int scanOK = 0;
     long pindexscan;
-    for(pindexscan = 0; pindexscan < NBparamMAX; pindexscan++)
+    for (pindexscan = 0; pindexscan < NBparamMAX; pindexscan++)
     {
-        if(strcmp(keywordstringC, funcparamarray[pindexscan].keywordfull) == 0)
+        if (strcmp(keywordstringC, funcparamarray[pindexscan].keywordfull) == 0)
         {
             pindex = pindexscan;
             scanOK = 1;
         }
     }
 
-    if(scanOK == 0) // not found
+    if (scanOK == 0) // not found
     {
         // scan for first available entry
         pindex = 0;
-        while((funcparamarray[pindex].fpflag & FPFLAG_ACTIVE) && (pindex < NBparamMAX))
+        while ((funcparamarray[pindex].fpflag & FPFLAG_ACTIVE) && (pindex < NBparamMAX))
         {
             pindex++;
         }
 
-        if(pindex == NBparamMAX)
+        if (pindex == NBparamMAX)
         {
-            printf("ERROR [%s line %d]: NBparamMAX %ld limit reached\n", __FILE__, __LINE__,
-                   NBparamMAX);
+            printf("ERROR [%s line %d]: NBparamMAX %ld limit reached\n", __FILE__, __LINE__, NBparamMAX);
             fflush(stdout);
             exit(0);
         }
 
-
-
-
-
-
-
         funcparamarray[pindex].fpflag = fpflag;
 
-
-
         // break full keyword into keywords
         strncpy(funcparamarray[pindex].keywordfull, keywordstringC,
                 FUNCTION_PARAMETER_KEYWORD_STRMAXLEN * FUNCTION_PARAMETER_KEYWORD_MAXLEVEL - 1);
@@ -106,276 +79,246 @@ errno_t function_parameter_add_entry(
                 FUNCTION_PARAMETER_KEYWORD_STRMAXLEN * FUNCTION_PARAMETER_KEYWORD_MAXLEVEL - 1);
         funcparamarray[pindex].keywordlevel = 0;
         pch = strtok(tmpstring, ".");
-        while(pch != NULL)
+        while (pch != NULL)
         {
-            strncpy(funcparamarray[pindex].keyword[funcparamarray[pindex].keywordlevel],
-                    pch, FUNCTION_PARAMETER_KEYWORD_STRMAXLEN - 1);
+            strncpy(funcparamarray[pindex].keyword[funcparamarray[pindex].keywordlevel], pch,
+                    FUNCTION_PARAMETER_KEYWORD_STRMAXLEN - 1);
             funcparamarray[pindex].keywordlevel++;
             pch = strtok(NULL, ".");
         }
 
-
         // Write description
-        strncpy(funcparamarray[pindex].description, descriptionstring,
-                FUNCTION_PARAMETER_DESCR_STRMAXLEN - 1);
+        strncpy(funcparamarray[pindex].description, descriptionstring, FUNCTION_PARAMETER_DESCR_STRMAXLEN - 1);
 
         // type
         funcparamarray[pindex].type = type;
 
-
-
         // Allocate value
         funcparamarray[pindex].cnt0 = 0; // not allocated
 
         // Default values
-        switch(funcparamarray[pindex].type)
+        switch (funcparamarray[pindex].type)
+        {
+        case FPTYPE_INT32:
+            funcparamarray[pindex].val.i32[0] = 0;
+            funcparamarray[pindex].val.i32[1] = 0;
+            funcparamarray[pindex].val.i32[2] = 0;
+            funcparamarray[pindex].val.i32[3] = 0;
+            break;
+
+        case FPTYPE_UINT32:
+            funcparamarray[pindex].val.ui32[0] = 0;
+            funcparamarray[pindex].val.ui32[1] = 0;
+            funcparamarray[pindex].val.ui32[2] = 0;
+            funcparamarray[pindex].val.ui32[3] = 0;
+            break;
+
+        case FPTYPE_INT64:
+            funcparamarray[pindex].val.i64[0] = 0;
+            funcparamarray[pindex].val.i64[1] = 0;
+            funcparamarray[pindex].val.i64[2] = 0;
+            funcparamarray[pindex].val.i64[3] = 0;
+            break;
+
+        case FPTYPE_UINT64:
+            funcparamarray[pindex].val.ui64[0] = 0;
+            funcparamarray[pindex].val.ui64[1] = 0;
+            funcparamarray[pindex].val.ui64[2] = 0;
+            funcparamarray[pindex].val.ui64[3] = 0;
+            break;
+
+        case FPTYPE_FLOAT64:
+            funcparamarray[pindex].val.f64[0] = 0.0;
+            funcparamarray[pindex].val.f64[1] = 0.0;
+            funcparamarray[pindex].val.f64[2] = 0.0;
+            funcparamarray[pindex].val.f64[3] = 0.0;
+            break;
+
+        case FPTYPE_FLOAT32:
+            funcparamarray[pindex].val.f32[0] = 0.0;
+            funcparamarray[pindex].val.f32[1] = 0.0;
+            funcparamarray[pindex].val.f32[2] = 0.0;
+            funcparamarray[pindex].val.f32[3] = 0.0;
+            break;
+
+        case FPTYPE_PID:
+            funcparamarray[pindex].val.pid[0] = 0;
+            funcparamarray[pindex].val.pid[1] = 0;
+            break;
+
+        case FPTYPE_TIMESPEC:
+            funcparamarray[pindex].val.ts[0].tv_sec = 0;
+            funcparamarray[pindex].val.ts[0].tv_nsec = 0;
+            funcparamarray[pindex].val.ts[1].tv_sec = 0;
+            funcparamarray[pindex].val.ts[1].tv_nsec = 0;
+            break;
+
+        case FPTYPE_FILENAME:
+            SNPRINTF_CHECK(funcparamarray[pindex].val.string[0], FUNCTION_PARAMETER_STRMAXLEN, "NULLFNAME");
+            SNPRINTF_CHECK(funcparamarray[pindex].val.string[1], FUNCTION_PARAMETER_STRMAXLEN, "NULLFNAME");
+            break;
+
+        case FPTYPE_FITSFILENAME:
+            SNPRINTF_CHECK(funcparamarray[pindex].val.string[0], FUNCTION_PARAMETER_STRMAXLEN, "NULLFITS");
+            SNPRINTF_CHECK(funcparamarray[pindex].val.string[1], FUNCTION_PARAMETER_STRMAXLEN, "NULLFITS");
+            break;
+
+        case FPTYPE_EXECFILENAME:
+            SNPRINTF_CHECK(funcparamarray[pindex].val.string[0], FUNCTION_PARAMETER_STRMAXLEN, "NULLEXEC");
+            SNPRINTF_CHECK(funcparamarray[pindex].val.string[1], FUNCTION_PARAMETER_STRMAXLEN, "NULLEXEC");
+            break;
+
+        case FPTYPE_DIRNAME:
+            SNPRINTF_CHECK(funcparamarray[pindex].val.string[0], FUNCTION_PARAMETER_STRMAXLEN, "NULLDIR");
+            SNPRINTF_CHECK(funcparamarray[pindex].val.string[1], FUNCTION_PARAMETER_STRMAXLEN, "NULLDIR");
+            break;
+
+        case FPTYPE_STREAMNAME:
+            SNPRINTF_CHECK(funcparamarray[pindex].val.string[0], FUNCTION_PARAMETER_STRMAXLEN, "NULLSTREAM");
+            SNPRINTF_CHECK(funcparamarray[pindex].val.string[1], FUNCTION_PARAMETER_STRMAXLEN, "NULLSTREAM");
+            break;
+
+        case FPTYPE_STRING:
+            SNPRINTF_CHECK(funcparamarray[pindex].val.string[0], FUNCTION_PARAMETER_STRMAXLEN, "NULLSTRING");
+            SNPRINTF_CHECK(funcparamarray[pindex].val.string[1], FUNCTION_PARAMETER_STRMAXLEN, "NULLSTRING");
+            break;
+
+        case FPTYPE_ONOFF:
+            funcparamarray[pindex].fpflag &= ~FPFLAG_ONOFF; // initialize state to OFF
+            funcparamarray[pindex].val.ui64[0] = 0;
+            break;
+
+        case FPTYPE_FPSNAME:
+            SNPRINTF_CHECK(funcparamarray[pindex].val.string[0], FUNCTION_PARAMETER_STRMAXLEN, "NULL");
+            SNPRINTF_CHECK(funcparamarray[pindex].val.string[1], FUNCTION_PARAMETER_STRMAXLEN, "NULL");
+            break;
+        }
+
+        if (valueptr != NULL) // allocate value requested by function call
         {
-            case FPTYPE_INT32 :
-                funcparamarray[pindex].val.i32[0] = 0;
-                funcparamarray[pindex].val.i32[1] = 0;
-                funcparamarray[pindex].val.i32[2] = 0;
-                funcparamarray[pindex].val.i32[3] = 0;
+            int32_t *valueptr_INT32;
+            uint32_t *valueptr_UINT32;
+            int64_t *valueptr_INT64;
+            uint64_t *valueptr_UINT64;
+            double *valueptr_FLOAT64;
+            float *valueptr_FLOAT32;
+            struct timespec *valueptr_ts;
+
+            switch (funcparamarray[pindex].type)
+            {
+
+            case FPTYPE_INT32:
+                valueptr_INT32 = (int32_t *)valueptr;
+                funcparamarray[pindex].val.i32[0] = valueptr_INT32[0];
+                funcparamarray[pindex].val.i32[1] = valueptr_INT32[1];
+                funcparamarray[pindex].val.i32[2] = valueptr_INT32[2];
+                funcparamarray[pindex].val.i32[3] = valueptr_INT32[3];
+                funcparamarray[pindex].cnt0++;
                 break;
 
-            case FPTYPE_UINT32 :
-                funcparamarray[pindex].val.ui32[0] = 0;
-                funcparamarray[pindex].val.ui32[1] = 0;
-                funcparamarray[pindex].val.ui32[2] = 0;
-                funcparamarray[pindex].val.ui32[3] = 0;
+            case FPTYPE_UINT32:
+                valueptr_UINT32 = (uint32_t *)valueptr;
+                funcparamarray[pindex].val.ui32[0] = valueptr_UINT32[0];
+                funcparamarray[pindex].val.ui32[1] = valueptr_UINT32[1];
+                funcparamarray[pindex].val.ui32[2] = valueptr_UINT32[2];
+                funcparamarray[pindex].val.ui32[3] = valueptr_UINT32[3];
+                funcparamarray[pindex].cnt0++;
                 break;
 
-            case FPTYPE_INT64 :
-                funcparamarray[pindex].val.i64[0] = 0;
-                funcparamarray[pindex].val.i64[1] = 0;
-                funcparamarray[pindex].val.i64[2] = 0;
-                funcparamarray[pindex].val.i64[3] = 0;
+            case FPTYPE_INT64:
+                valueptr_INT64 = (int64_t *)valueptr;
+                funcparamarray[pindex].val.i64[0] = valueptr_INT64[0];
+                funcparamarray[pindex].val.i64[1] = valueptr_INT64[1];
+                funcparamarray[pindex].val.i64[2] = valueptr_INT64[2];
+                funcparamarray[pindex].val.i64[3] = valueptr_INT64[3];
+                funcparamarray[pindex].cnt0++;
                 break;
 
-            case FPTYPE_UINT64 :
-                funcparamarray[pindex].val.ui64[0] = 0;
-                funcparamarray[pindex].val.ui64[1] = 0;
-                funcparamarray[pindex].val.ui64[2] = 0;
-                funcparamarray[pindex].val.ui64[3] = 0;
+            case FPTYPE_UINT64:
+                valueptr_UINT64 = (uint64_t *)valueptr;
+                funcparamarray[pindex].val.ui64[0] = valueptr_UINT64[0];
+                funcparamarray[pindex].val.ui64[1] = valueptr_UINT64[1];
+                funcparamarray[pindex].val.ui64[2] = valueptr_UINT64[2];
+                funcparamarray[pindex].val.ui64[3] = valueptr_UINT64[3];
+                funcparamarray[pindex].cnt0++;
                 break;
 
-            case FPTYPE_FLOAT64 :
-                funcparamarray[pindex].val.f64[0] = 0.0;
-                funcparamarray[pindex].val.f64[1] = 0.0;
-                funcparamarray[pindex].val.f64[2] = 0.0;
-                funcparamarray[pindex].val.f64[3] = 0.0;
+            case FPTYPE_FLOAT64:
+                valueptr_FLOAT64 = (double *)valueptr;
+                funcparamarray[pindex].val.f64[0] = valueptr_FLOAT64[0];
+                funcparamarray[pindex].val.f64[1] = valueptr_FLOAT64[1];
+                funcparamarray[pindex].val.f64[2] = valueptr_FLOAT64[2];
+                funcparamarray[pindex].val.f64[3] = valueptr_FLOAT64[3];
+                funcparamarray[pindex].cnt0++;
                 break;
 
-            case FPTYPE_FLOAT32 :
-                funcparamarray[pindex].val.f32[0] = 0.0;
-                funcparamarray[pindex].val.f32[1] = 0.0;
-                funcparamarray[pindex].val.f32[2] = 0.0;
-                funcparamarray[pindex].val.f32[3] = 0.0;
+            case FPTYPE_FLOAT32:
+                valueptr_FLOAT32 = (float *)valueptr;
+                funcparamarray[pindex].val.f32[0] = valueptr_FLOAT32[0];
+                funcparamarray[pindex].val.f32[1] = valueptr_FLOAT32[1];
+                funcparamarray[pindex].val.f32[2] = valueptr_FLOAT32[2];
+                funcparamarray[pindex].val.f32[3] = valueptr_FLOAT32[3];
+                funcparamarray[pindex].cnt0++;
                 break;
 
-            case FPTYPE_PID :
-                funcparamarray[pindex].val.pid[0] = 0;
-                funcparamarray[pindex].val.pid[1] = 0;
+            case FPTYPE_PID:
+                valueptr_INT64 = (int64_t *)valueptr;
+                funcparamarray[pindex].val.pid[0] = (pid_t)(*valueptr_INT64);
+                funcparamarray[pindex].cnt0++;
                 break;
 
-            case FPTYPE_TIMESPEC :
-                funcparamarray[pindex].val.ts[0].tv_sec  = 0;
-                funcparamarray[pindex].val.ts[0].tv_nsec = 0;
-                funcparamarray[pindex].val.ts[1].tv_sec  = 0;
-                funcparamarray[pindex].val.ts[1].tv_nsec = 0;
+            case FPTYPE_TIMESPEC:
+                valueptr_ts = (struct timespec *)valueptr;
+                funcparamarray[pindex].val.ts[0] = *valueptr_ts;
+                funcparamarray[pindex].cnt0++;
                 break;
 
-            case FPTYPE_FILENAME :
-                SNPRINTF_CHECK(funcparamarray[pindex].val.string[0],
-                               FUNCTION_PARAMETER_STRMAXLEN, "NULLFNAME");
-                SNPRINTF_CHECK(funcparamarray[pindex].val.string[1],
-                               FUNCTION_PARAMETER_STRMAXLEN, "NULLFNAME");
+            case FPTYPE_FILENAME:
+                strncpy(funcparamarray[pindex].val.string[0], (char *)valueptr, FUNCTION_PARAMETER_STRMAXLEN - 1);
+                funcparamarray[pindex].cnt0++;
                 break;
 
-            case FPTYPE_FITSFILENAME :
-                SNPRINTF_CHECK(funcparamarray[pindex].val.string[0],
-                               FUNCTION_PARAMETER_STRMAXLEN, "NULLFITS");
-                SNPRINTF_CHECK(funcparamarray[pindex].val.string[1],
-                               FUNCTION_PARAMETER_STRMAXLEN, "NULLFITS");
+            case FPTYPE_FITSFILENAME:
+                strncpy(funcparamarray[pindex].val.string[0], (char *)valueptr, FUNCTION_PARAMETER_STRMAXLEN - 1);
+                funcparamarray[pindex].cnt0++;
                 break;
 
-            case FPTYPE_EXECFILENAME :
-                SNPRINTF_CHECK(funcparamarray[pindex].val.string[0],
-                               FUNCTION_PARAMETER_STRMAXLEN, "NULLEXEC");
-                SNPRINTF_CHECK(funcparamarray[pindex].val.string[1],
-                               FUNCTION_PARAMETER_STRMAXLEN, "NULLEXEC");
+            case FPTYPE_EXECFILENAME:
+                strncpy(funcparamarray[pindex].val.string[0], (char *)valueptr, FUNCTION_PARAMETER_STRMAXLEN - 1);
+                funcparamarray[pindex].cnt0++;
                 break;
 
-            case FPTYPE_DIRNAME :
-                SNPRINTF_CHECK(funcparamarray[pindex].val.string[0],
-                               FUNCTION_PARAMETER_STRMAXLEN, "NULLDIR");
-                SNPRINTF_CHECK(funcparamarray[pindex].val.string[1],
-                               FUNCTION_PARAMETER_STRMAXLEN, "NULLDIR");
+            case FPTYPE_DIRNAME:
+                strncpy(funcparamarray[pindex].val.string[0], (char *)valueptr, FUNCTION_PARAMETER_STRMAXLEN - 1);
+                funcparamarray[pindex].cnt0++;
                 break;
 
-            case FPTYPE_STREAMNAME :
-                SNPRINTF_CHECK(funcparamarray[pindex].val.string[0],
-                               FUNCTION_PARAMETER_STRMAXLEN, "NULLSTREAM");
-                SNPRINTF_CHECK(funcparamarray[pindex].val.string[1],
-                               FUNCTION_PARAMETER_STRMAXLEN, "NULLSTREAM");
+            case FPTYPE_STREAMNAME:
+                strncpy(funcparamarray[pindex].val.string[0], (char *)valueptr, FUNCTION_PARAMETER_STRMAXLEN - 1);
+                funcparamarray[pindex].cnt0++;
                 break;
 
-            case FPTYPE_STRING :
-                SNPRINTF_CHECK(funcparamarray[pindex].val.string[0],
-                               FUNCTION_PARAMETER_STRMAXLEN, "NULLSTRING");
-                SNPRINTF_CHECK(funcparamarray[pindex].val.string[1],
-                               FUNCTION_PARAMETER_STRMAXLEN, "NULLSTRING");
+            case FPTYPE_STRING:
+                strncpy(funcparamarray[pindex].val.string[0], (char *)valueptr, FUNCTION_PARAMETER_STRMAXLEN - 1);
+                funcparamarray[pindex].cnt0++;
                 break;
 
-            case FPTYPE_ONOFF :
-                funcparamarray[pindex].fpflag &= ~FPFLAG_ONOFF; // initialize state to OFF
+            case FPTYPE_ONOFF:
                 funcparamarray[pindex].val.ui64[0] = 0;
+                funcparamarray[pindex].cnt0++;
                 break;
 
-            case FPTYPE_FPSNAME :
-                SNPRINTF_CHECK(funcparamarray[pindex].val.string[0],
-                               FUNCTION_PARAMETER_STRMAXLEN, "NULL");
-                SNPRINTF_CHECK(funcparamarray[pindex].val.string[1],
-                               FUNCTION_PARAMETER_STRMAXLEN, "NULL");
+            case FPTYPE_FPSNAME:
+                strncpy(funcparamarray[pindex].val.string[0], (char *)valueptr, FUNCTION_PARAMETER_STRMAXLEN - 1);
+                funcparamarray[pindex].cnt0++;
                 break;
-        }
-
-
-
-        if(valueptr != NULL)  // allocate value requested by function call
-        {
-            int32_t  *valueptr_INT32;
-            uint32_t *valueptr_UINT32;
-            int64_t  *valueptr_INT64;
-            uint64_t *valueptr_UINT64;
-            double   *valueptr_FLOAT64;
-            float    *valueptr_FLOAT32;
-            struct timespec *valueptr_ts;
-
-            switch(funcparamarray[pindex].type)
-            {
-
-                case FPTYPE_INT32 :
-                    valueptr_INT32 = (int32_t *) valueptr;
-                    funcparamarray[pindex].val.i32[0] = valueptr_INT32[0];
-                    funcparamarray[pindex].val.i32[1] = valueptr_INT32[1];
-                    funcparamarray[pindex].val.i32[2] = valueptr_INT32[2];
-                    funcparamarray[pindex].val.i32[3] = valueptr_INT32[3];
-                    funcparamarray[pindex].cnt0++;
-                    break;
-
-                case FPTYPE_UINT32 :
-                    valueptr_UINT32 = (uint32_t *) valueptr;
-                    funcparamarray[pindex].val.ui32[0] = valueptr_UINT32[0];
-                    funcparamarray[pindex].val.ui32[1] = valueptr_UINT32[1];
-                    funcparamarray[pindex].val.ui32[2] = valueptr_UINT32[2];
-                    funcparamarray[pindex].val.ui32[3] = valueptr_UINT32[3];
-                    funcparamarray[pindex].cnt0++;
-                    break;
-
-                case FPTYPE_INT64 :
-                    valueptr_INT64 = (int64_t *) valueptr;
-                    funcparamarray[pindex].val.i64[0] = valueptr_INT64[0];
-                    funcparamarray[pindex].val.i64[1] = valueptr_INT64[1];
-                    funcparamarray[pindex].val.i64[2] = valueptr_INT64[2];
-                    funcparamarray[pindex].val.i64[3] = valueptr_INT64[3];
-                    funcparamarray[pindex].cnt0++;
-                    break;
-
-                case FPTYPE_UINT64 :
-                    valueptr_UINT64 = (uint64_t *) valueptr;
-                    funcparamarray[pindex].val.ui64[0] = valueptr_UINT64[0];
-                    funcparamarray[pindex].val.ui64[1] = valueptr_UINT64[1];
-                    funcparamarray[pindex].val.ui64[2] = valueptr_UINT64[2];
-                    funcparamarray[pindex].val.ui64[3] = valueptr_UINT64[3];
-                    funcparamarray[pindex].cnt0++;
-                    break;
-
-                case FPTYPE_FLOAT64 :
-                    valueptr_FLOAT64 = (double *) valueptr;
-                    funcparamarray[pindex].val.f64[0] = valueptr_FLOAT64[0];
-                    funcparamarray[pindex].val.f64[1] = valueptr_FLOAT64[1];
-                    funcparamarray[pindex].val.f64[2] = valueptr_FLOAT64[2];
-                    funcparamarray[pindex].val.f64[3] = valueptr_FLOAT64[3];
-                    funcparamarray[pindex].cnt0++;
-                    break;
-
-                case FPTYPE_FLOAT32 :
-                    valueptr_FLOAT32 = (float *) valueptr;
-                    funcparamarray[pindex].val.f32[0] = valueptr_FLOAT32[0];
-                    funcparamarray[pindex].val.f32[1] = valueptr_FLOAT32[1];
-                    funcparamarray[pindex].val.f32[2] = valueptr_FLOAT32[2];
-                    funcparamarray[pindex].val.f32[3] = valueptr_FLOAT32[3];
-                    funcparamarray[pindex].cnt0++;
-                    break;
-
-                case FPTYPE_PID :
-                    valueptr_INT64 = (int64_t *) valueptr;
-                    funcparamarray[pindex].val.pid[0] = (pid_t)(*valueptr_INT64);
-                    funcparamarray[pindex].cnt0++;
-                    break;
-
-                case FPTYPE_TIMESPEC:
-                    valueptr_ts = (struct timespec *) valueptr;
-                    funcparamarray[pindex].val.ts[0] = *valueptr_ts;
-                    funcparamarray[pindex].cnt0++;
-                    break;
-
-                case FPTYPE_FILENAME :
-                    strncpy(funcparamarray[pindex].val.string[0], (char *) valueptr,
-                            FUNCTION_PARAMETER_STRMAXLEN - 1);
-                    funcparamarray[pindex].cnt0++;
-                    break;
-
-                case FPTYPE_FITSFILENAME :
-                    strncpy(funcparamarray[pindex].val.string[0], (char *) valueptr,
-                            FUNCTION_PARAMETER_STRMAXLEN - 1);
-                    funcparamarray[pindex].cnt0++;
-                    break;
-
-                case FPTYPE_EXECFILENAME :
-                    strncpy(funcparamarray[pindex].val.string[0], (char *) valueptr,
-                            FUNCTION_PARAMETER_STRMAXLEN - 1);
-                    funcparamarray[pindex].cnt0++;
-                    break;
-
-                case FPTYPE_DIRNAME :
-                    strncpy(funcparamarray[pindex].val.string[0], (char *) valueptr,
-                            FUNCTION_PARAMETER_STRMAXLEN - 1);
-                    funcparamarray[pindex].cnt0++;
-                    break;
-
-                case FPTYPE_STREAMNAME :
-                    strncpy(funcparamarray[pindex].val.string[0], (char *) valueptr,
-                            FUNCTION_PARAMETER_STRMAXLEN - 1);
-                    funcparamarray[pindex].cnt0++;
-                    break;
-
-                case FPTYPE_STRING :
-                    strncpy(funcparamarray[pindex].val.string[0], (char *) valueptr,
-                            FUNCTION_PARAMETER_STRMAXLEN - 1);
-                    funcparamarray[pindex].cnt0++;
-                    break;
-
-                case FPTYPE_ONOFF :
-                    funcparamarray[pindex].val.ui64[0] = 0;
-                    funcparamarray[pindex].cnt0++;
-                    break;
-
-                case FPTYPE_FPSNAME :
-                    strncpy(funcparamarray[pindex].val.string[0], (char *) valueptr,
-                            FUNCTION_PARAMETER_STRMAXLEN - 1);
-                    funcparamarray[pindex].cnt0++;
-                    break;
             }
 
             // RVAL = 2;  // default value entered
         }
-
     }
 
-
-
-    if(pindexptr != NULL)
+    if (pindexptr != NULL)
     {
         *pindexptr = pindex;
     }
@@ -384,6 +327,3 @@ errno_t function_parameter_add_entry(
 
     return RETURN_SUCCESS;
 }
-
-
-
diff --git a/src/CommandLineInterface/fps_add_entry.h b/src/CommandLineInterface/fps_add_entry.h
index 478a7b42..fb15e5a2 100644
--- a/src/CommandLineInterface/fps_add_entry.h
+++ b/src/CommandLineInterface/fps_add_entry.h
@@ -4,20 +4,12 @@
  * @brief   add parameter entry to FPS
  */
 
-
 #ifndef FPS_ADD_ENTRY_H
 #define FPS_ADD_ENTRY_H
 
-int function_parameter_add_entry(
-    FUNCTION_PARAMETER_STRUCT *fps,
-    const char                *keywordstring,
-    const char                *descriptionstring,
-    uint64_t             type,
-    uint64_t             fpflag,
-    void                *valueptr,
-    long                *pindexptr
-);
-
+int function_parameter_add_entry(FUNCTION_PARAMETER_STRUCT *fps, const char *keywordstring,
+                                 const char *descriptionstring, uint64_t type, uint64_t fpflag, void *valueptr,
+                                 long *pindexptr);
 
 // =====================================================================
 // INPUT
@@ -30,71 +22,68 @@ int function_parameter_add_entry(
  *
  * (void) statement suppresses compiler unused parameter warning
  */
-#define FPS_ADDPARAM_FLT32_IN(key, pname, pdescr, dflt) \
-long fp_##key = 0; \
-do{ \
-  /*fp_##key =*/\
-  function_parameter_add_entry(&fps, (pname), (pdescr), FPTYPE_FLOAT32, FPFLAG_DEFAULT_INPUT, (dflt), &fp_##key);\
-  (void) fp_##key;\
-} while(0)
-
+#define FPS_ADDPARAM_FLT32_IN(key, pname, pdescr, dflt)                                                                \
+    long fp_##key = 0;                                                                                                 \
+    do                                                                                                                 \
+    {                                                                                                                  \
+        /*fp_##key =*/                                                                                                 \
+        function_parameter_add_entry(&fps, (pname), (pdescr), FPTYPE_FLOAT32, FPFLAG_DEFAULT_INPUT, (dflt),            \
+                                     &fp_##key);                                                                       \
+        (void)fp_##key;                                                                                                \
+    } while (0)
 
 /** @brief Add 64-bit float parameter entry
  */
-#define FPS_ADDPARAM_FLT64_IN(key, pname, pdescr, dflt) \
-long fp_##key = 0; \
-do{ \
-  function_parameter_add_entry(&fps, (pname), (pdescr), FPTYPE_FLOAT64, FPFLAG_DEFAULT_INPUT, (dflt), &fp_##key);\
-  (void) fp_##key;\
-} while(0)
-
-
-
-
+#define FPS_ADDPARAM_FLT64_IN(key, pname, pdescr, dflt)                                                                \
+    long fp_##key = 0;                                                                                                 \
+    do                                                                                                                 \
+    {                                                                                                                  \
+        function_parameter_add_entry(&fps, (pname), (pdescr), FPTYPE_FLOAT64, FPFLAG_DEFAULT_INPUT, (dflt),            \
+                                     &fp_##key);                                                                       \
+        (void)fp_##key;                                                                                                \
+    } while (0)
 
 /** @brief Add INT32 input parameter entry
  */
-#define FPS_ADDPARAM_INT32_IN(key, pname, pdescr, dflt) \
-long fp_##key = 0; \
-do{ \
-  function_parameter_add_entry(&fps, (pname), (pdescr), FPTYPE_INT32, FPFLAG_DEFAULT_INPUT, (dflt), &fp_##key);\
-  (void) fp_##key;\
-} while(0)
-
+#define FPS_ADDPARAM_INT32_IN(key, pname, pdescr, dflt)                                                                \
+    long fp_##key = 0;                                                                                                 \
+    do                                                                                                                 \
+    {                                                                                                                  \
+        function_parameter_add_entry(&fps, (pname), (pdescr), FPTYPE_INT32, FPFLAG_DEFAULT_INPUT, (dflt), &fp_##key);  \
+        (void)fp_##key;                                                                                                \
+    } while (0)
 
 /** @brief Add INT64 input parameter entry
  */
-#define FPS_ADDPARAM_INT64_IN(key, pname, pdescr, dflt) \
-long fp_##key = 0; \
-do{ \
-  function_parameter_add_entry(&fps, (pname), (pdescr), FPTYPE_INT64, FPFLAG_DEFAULT_INPUT, (dflt), &fp_##key);\
-  (void) fp_##key;\
-} while(0)
-
-
-
+#define FPS_ADDPARAM_INT64_IN(key, pname, pdescr, dflt)                                                                \
+    long fp_##key = 0;                                                                                                 \
+    do                                                                                                                 \
+    {                                                                                                                  \
+        function_parameter_add_entry(&fps, (pname), (pdescr), FPTYPE_INT64, FPFLAG_DEFAULT_INPUT, (dflt), &fp_##key);  \
+        (void)fp_##key;                                                                                                \
+    } while (0)
 
 /** @brief Add filename input parameter entry
  */
-#define FPS_ADDPARAM_FILENAME_IN(key, pname, pdescr, dflt) \
-long fp_##key = 0; \
-do{ \
-  function_parameter_add_entry(&fps, (pname), (pdescr), FPTYPE_FILENAME, FPFLAG_DEFAULT_INPUT_STREAM, (dflt), &fp_##key);\
-  (void) fp_##key;\
-} while(0)
-
-
+#define FPS_ADDPARAM_FILENAME_IN(key, pname, pdescr, dflt)                                                             \
+    long fp_##key = 0;                                                                                                 \
+    do                                                                                                                 \
+    {                                                                                                                  \
+        function_parameter_add_entry(&fps, (pname), (pdescr), FPTYPE_FILENAME, FPFLAG_DEFAULT_INPUT_STREAM, (dflt),    \
+                                     &fp_##key);                                                                       \
+        (void)fp_##key;                                                                                                \
+    } while (0)
 
 /** @brief Add stream input parameter entry
  */
-#define FPS_ADDPARAM_STREAM_IN(key, pname, pdescr, dflt) \
-long fp_##key = 0; \
-do{ \
-  function_parameter_add_entry(&fps, (pname), (pdescr), FPTYPE_STREAMNAME, FPFLAG_DEFAULT_INPUT_STREAM, (dflt), &fp_##key);\
-  (void) fp_##key;\
-} while(0)
-
-
+#define FPS_ADDPARAM_STREAM_IN(key, pname, pdescr, dflt)                                                               \
+    long fp_##key = 0;                                                                                                 \
+    do                                                                                                                 \
+    {                                                                                                                  \
+        function_parameter_add_entry(&fps, (pname), (pdescr), FPTYPE_STREAMNAME, FPFLAG_DEFAULT_INPUT_STREAM, (dflt),  \
+                                     &fp_##key);                                                                       \
+        (void)fp_##key;                                                                                                \
+    } while (0)
 
 // =====================================================================
 // ON/OFF
@@ -102,16 +91,13 @@ do{ \
 
 /** @brief Add ON/OFF parameter entry
  */
-#define FPS_ADDPARAM_ONOFF(key, pname, pdescr, dflt) \
-long fp_##key = 0; \
-do{ \
-  function_parameter_add_entry(&fps, (pname), (pdescr), FPTYPE_ONOFF, FPFLAG_DEFAULT_INPUT, (dflt), &fp_##key);\
-  (void) fp_##key;\
-} while(0)
-
-
-
-
+#define FPS_ADDPARAM_ONOFF(key, pname, pdescr, dflt)                                                                   \
+    long fp_##key = 0;                                                                                                 \
+    do                                                                                                                 \
+    {                                                                                                                  \
+        function_parameter_add_entry(&fps, (pname), (pdescr), FPTYPE_ONOFF, FPFLAG_DEFAULT_INPUT, (dflt), &fp_##key);  \
+        (void)fp_##key;                                                                                                \
+    } while (0)
 
 // =====================================================================
 // OUTPUT
@@ -119,57 +105,53 @@ do{ \
 
 /** @brief Add FLT32 output parameter entry
  */
-#define FPS_ADDPARAM_FLT32_OUT(key, pname, pdescr) \
-long fp_##key = 0; \
-do{ \
-  function_parameter_add_entry(&fps, (pname), (pdescr), FPTYPE_FLOAT32, FPFLAG_DEFAULT_OUTPUT, NULL, &fp_##key);\
-  (void) fp_##key;\
-} while(0)
-
+#define FPS_ADDPARAM_FLT32_OUT(key, pname, pdescr)                                                                     \
+    long fp_##key = 0;                                                                                                 \
+    do                                                                                                                 \
+    {                                                                                                                  \
+        function_parameter_add_entry(&fps, (pname), (pdescr), FPTYPE_FLOAT32, FPFLAG_DEFAULT_OUTPUT, NULL, &fp_##key); \
+        (void)fp_##key;                                                                                                \
+    } while (0)
 
 /** @brief Add FLT64 output parameter entry
  */
-#define FPS_ADDPARAM_FLT64_OUT(key, pname, pdescr) \
-long fp_##key = 0; \
-do{ \
-  function_parameter_add_entry(&fps, (pname), (pdescr), FPTYPE_FLOAT64, FPFLAG_DEFAULT_OUTPUT, NULL, &fp_##key);\
-  (void) fp_##key;\
-} while(0)
-
+#define FPS_ADDPARAM_FLT64_OUT(key, pname, pdescr)                                                                     \
+    long fp_##key = 0;                                                                                                 \
+    do                                                                                                                 \
+    {                                                                                                                  \
+        function_parameter_add_entry(&fps, (pname), (pdescr), FPTYPE_FLOAT64, FPFLAG_DEFAULT_OUTPUT, NULL, &fp_##key); \
+        (void)fp_##key;                                                                                                \
+    } while (0)
 
 /** @brief Add IN32 output parameter entry
  */
-#define FPS_ADDPARAM_INT32_OUT(key, pname, pdescr) \
-long fp_##key = 0; \
-do{ \
-  function_parameter_add_entry(&fps, (pname), (pdescr), FPTYPE_INT64, FPFLAG_DEFAULT_OUTPUT, NULL, &fp_##key);\
-  (void) fp_##key;\
-} while(0)
-
-
+#define FPS_ADDPARAM_INT32_OUT(key, pname, pdescr)                                                                     \
+    long fp_##key = 0;                                                                                                 \
+    do                                                                                                                 \
+    {                                                                                                                  \
+        function_parameter_add_entry(&fps, (pname), (pdescr), FPTYPE_INT64, FPFLAG_DEFAULT_OUTPUT, NULL, &fp_##key);   \
+        (void)fp_##key;                                                                                                \
+    } while (0)
 
 /** @brief Add INT64 output parameter entry
  */
-#define FPS_ADDPARAM_INT64_OUT(key, pname, pdescr) \
-long fp_##key = 0; \
-do{ \
-  function_parameter_add_entry(&fps, (pname), (pdescr), FPTYPE_INT64, FPFLAG_DEFAULT_OUTPUT, NULL, &fp_##key);\
-  (void) fp_##key;\
-} while(0)
-
+#define FPS_ADDPARAM_INT64_OUT(key, pname, pdescr)                                                                     \
+    long fp_##key = 0;                                                                                                 \
+    do                                                                                                                 \
+    {                                                                                                                  \
+        function_parameter_add_entry(&fps, (pname), (pdescr), FPTYPE_INT64, FPFLAG_DEFAULT_OUTPUT, NULL, &fp_##key);   \
+        (void)fp_##key;                                                                                                \
+    } while (0)
 
 /** @brief Add stream output parameter entry
  */
-#define FPS_ADDPARAM_STREAM_OUT(key, pname, pdescr) \
-long fp_##key = 0; \
-do{ \
-  function_parameter_add_entry(&fps, (pname), (pdescr), FPTYPE_STREAMNAME, FPFLAG_DEFAULT_OUTPUT_STREAM, NULL, &fp_##key);\
-  (void) fp_##key;\
-} while(0)
-
-
-
-
-
+#define FPS_ADDPARAM_STREAM_OUT(key, pname, pdescr)                                                                    \
+    long fp_##key = 0;                                                                                                 \
+    do                                                                                                                 \
+    {                                                                                                                  \
+        function_parameter_add_entry(&fps, (pname), (pdescr), FPTYPE_STREAMNAME, FPFLAG_DEFAULT_OUTPUT_STREAM, NULL,   \
+                                     &fp_##key);                                                                       \
+        (void)fp_##key;                                                                                                \
+    } while (0)
 
 #endif
diff --git a/src/CommandLineInterface/fps_checkparameter.c b/src/CommandLineInterface/fps_checkparameter.c
index 8536640f..b00c6da5 100644
--- a/src/CommandLineInterface/fps_checkparameter.c
+++ b/src/CommandLineInterface/fps_checkparameter.c
@@ -3,57 +3,46 @@
  * @brief   check FPS entries
  */
 
-
 #include <sys/stat.h> // fstat
 
-
-
 #include "CommandLineInterface/CLIcore.h"
 
-#include "COREMOD_memory/COREMOD_memory.h"
 #include "COREMOD_iofits/COREMOD_iofits.h"
+#include "COREMOD_memory/COREMOD_memory.h"
 
 #include "fps_connect.h"
 #include "fps_disconnect.h"
 #include "fps_outlog.h"
 
-
-
-int functionparameter_CheckParameter(
-    FUNCTION_PARAMETER_STRUCT *fpsentry,
-    int pindex
-)
+int functionparameter_CheckParameter(FUNCTION_PARAMETER_STRUCT *fpsentry, int pindex)
 {
     int err = 0;
 
     // if entry is not active or not used, no error reported
-    if((!(fpsentry->parray[pindex].fpflag & FPFLAG_ACTIVE)))
+    if ((!(fpsentry->parray[pindex].fpflag & FPFLAG_ACTIVE)))
     {
         return 0;
     }
     else
     {
         char msg[STRINGMAXLEN_FPS_LOGMSG];
-        SNPRINTF_CHECK(msg, STRINGMAXLEN_FPS_LOGMSG, "%s",
-                       fpsentry->parray[pindex].keywordfull);
+        SNPRINTF_CHECK(msg, STRINGMAXLEN_FPS_LOGMSG, "%s", fpsentry->parray[pindex].keywordfull);
         functionparameter_outlog("CHECKPARAM", "%s", msg);
     }
 
     // if entry is not used, no error reported
-    if(!(fpsentry->parray[pindex].fpflag & FPFLAG_USED))
+    if (!(fpsentry->parray[pindex].fpflag & FPFLAG_USED))
     {
         return 0;
     }
 
-
-    if(fpsentry->parray[pindex].fpflag & FPFLAG_CHECKINIT)
-        if(fpsentry->parray[pindex].cnt0 == 0)
+    if (fpsentry->parray[pindex].fpflag & FPFLAG_CHECKINIT)
+        if (fpsentry->parray[pindex].cnt0 == 0)
         {
             fpsentry->md->msgpindex[fpsentry->md->msgcnt] = pindex;
-            fpsentry->md->msgcode[fpsentry->md->msgcnt] =  FPS_MSG_FLAG_NOTINITIALIZED |
-                    FPS_MSG_FLAG_ERROR;
-            if(snprintf(fpsentry->md->message[fpsentry->md->msgcnt],
-                        FUNCTION_PARAMETER_STRUCT_MSG_SIZE, "Not initialized") < 0)
+            fpsentry->md->msgcode[fpsentry->md->msgcnt] = FPS_MSG_FLAG_NOTINITIALIZED | FPS_MSG_FLAG_ERROR;
+            if (snprintf(fpsentry->md->message[fpsentry->md->msgcnt], FUNCTION_PARAMETER_STRUCT_MSG_SIZE,
+                         "Not initialized") < 0)
             {
                 PRINT_ERROR("snprintf error");
             }
@@ -62,21 +51,18 @@ int functionparameter_CheckParameter(
             err = 1;
         }
 
-    if(err == 0)
+    if (err == 0)
     {
         // Check min value
-        if(fpsentry->parray[pindex].type == FPTYPE_INT64)
-            if(fpsentry->parray[pindex].fpflag & FPFLAG_MINLIMIT)
-                if(fpsentry->parray[pindex].val.i64[0] < fpsentry->parray[pindex].val.i64[1])
+        if (fpsentry->parray[pindex].type == FPTYPE_INT64)
+            if (fpsentry->parray[pindex].fpflag & FPFLAG_MINLIMIT)
+                if (fpsentry->parray[pindex].val.i64[0] < fpsentry->parray[pindex].val.i64[1])
                 {
                     fpsentry->md->msgpindex[fpsentry->md->msgcnt] = pindex;
-                    fpsentry->md->msgcode[fpsentry->md->msgcnt] =  FPS_MSG_FLAG_BELOWMIN |
-                            FPS_MSG_FLAG_ERROR;
-                    if(snprintf(fpsentry->md->message[fpsentry->md->msgcnt],
-                                FUNCTION_PARAMETER_STRUCT_MSG_SIZE,
-                                "int64 value %ld below min %ld",
-                                fpsentry->parray[pindex].val.i64[0],
-                                fpsentry->parray[pindex].val.i64[1]) < 0)
+                    fpsentry->md->msgcode[fpsentry->md->msgcnt] = FPS_MSG_FLAG_BELOWMIN | FPS_MSG_FLAG_ERROR;
+                    if (snprintf(fpsentry->md->message[fpsentry->md->msgcnt], FUNCTION_PARAMETER_STRUCT_MSG_SIZE,
+                                 "int64 value %ld below min %ld", fpsentry->parray[pindex].val.i64[0],
+                                 fpsentry->parray[pindex].val.i64[1]) < 0)
                     {
                         PRINT_ERROR("snprintf error");
                     }
@@ -85,18 +71,15 @@ int functionparameter_CheckParameter(
                     err = 1;
                 }
 
-        if(fpsentry->parray[pindex].type == FPTYPE_FLOAT64)
-            if(fpsentry->parray[pindex].fpflag & FPFLAG_MINLIMIT)
-                if(fpsentry->parray[pindex].val.f64[0] < fpsentry->parray[pindex].val.f64[1])
+        if (fpsentry->parray[pindex].type == FPTYPE_FLOAT64)
+            if (fpsentry->parray[pindex].fpflag & FPFLAG_MINLIMIT)
+                if (fpsentry->parray[pindex].val.f64[0] < fpsentry->parray[pindex].val.f64[1])
                 {
                     fpsentry->md->msgpindex[fpsentry->md->msgcnt] = pindex;
-                    fpsentry->md->msgcode[fpsentry->md->msgcnt] =  FPS_MSG_FLAG_BELOWMIN |
-                            FPS_MSG_FLAG_ERROR;
-                    if(snprintf(fpsentry->md->message[fpsentry->md->msgcnt],
-                                FUNCTION_PARAMETER_STRUCT_MSG_SIZE,
-                                "float64 value %lf below min %lf",
-                                fpsentry->parray[pindex].val.f64[0],
-                                fpsentry->parray[pindex].val.f64[1]) < 0)
+                    fpsentry->md->msgcode[fpsentry->md->msgcnt] = FPS_MSG_FLAG_BELOWMIN | FPS_MSG_FLAG_ERROR;
+                    if (snprintf(fpsentry->md->message[fpsentry->md->msgcnt], FUNCTION_PARAMETER_STRUCT_MSG_SIZE,
+                                 "float64 value %lf below min %lf", fpsentry->parray[pindex].val.f64[0],
+                                 fpsentry->parray[pindex].val.f64[1]) < 0)
                     {
                         PRINT_ERROR("snprintf error");
                     }
@@ -105,18 +88,15 @@ int functionparameter_CheckParameter(
                     err = 1;
                 }
 
-        if(fpsentry->parray[pindex].type == FPTYPE_FLOAT32)
-            if(fpsentry->parray[pindex].fpflag & FPFLAG_MINLIMIT)
-                if(fpsentry->parray[pindex].val.f32[0] < fpsentry->parray[pindex].val.f32[1])
+        if (fpsentry->parray[pindex].type == FPTYPE_FLOAT32)
+            if (fpsentry->parray[pindex].fpflag & FPFLAG_MINLIMIT)
+                if (fpsentry->parray[pindex].val.f32[0] < fpsentry->parray[pindex].val.f32[1])
                 {
                     fpsentry->md->msgpindex[fpsentry->md->msgcnt] = pindex;
-                    fpsentry->md->msgcode[fpsentry->md->msgcnt] =  FPS_MSG_FLAG_BELOWMIN |
-                            FPS_MSG_FLAG_ERROR;
-                    if(snprintf(fpsentry->md->message[fpsentry->md->msgcnt],
-                                FUNCTION_PARAMETER_STRUCT_MSG_SIZE,
-                                "float32 value %f below min %f",
-                                fpsentry->parray[pindex].val.f32[0],
-                                fpsentry->parray[pindex].val.f32[1]) < 0)
+                    fpsentry->md->msgcode[fpsentry->md->msgcnt] = FPS_MSG_FLAG_BELOWMIN | FPS_MSG_FLAG_ERROR;
+                    if (snprintf(fpsentry->md->message[fpsentry->md->msgcnt], FUNCTION_PARAMETER_STRUCT_MSG_SIZE,
+                                 "float32 value %f below min %f", fpsentry->parray[pindex].val.f32[0],
+                                 fpsentry->parray[pindex].val.f32[1]) < 0)
                     {
                         PRINT_ERROR("snprintf error");
                     }
@@ -126,21 +106,18 @@ int functionparameter_CheckParameter(
                 }
     }
 
-    if(err == 0)
+    if (err == 0)
     {
         // Check max value
-        if(fpsentry->parray[pindex].type == FPTYPE_INT64)
-            if(fpsentry->parray[pindex].fpflag & FPFLAG_MAXLIMIT)
-                if(fpsentry->parray[pindex].val.i64[0] > fpsentry->parray[pindex].val.i64[2])
+        if (fpsentry->parray[pindex].type == FPTYPE_INT64)
+            if (fpsentry->parray[pindex].fpflag & FPFLAG_MAXLIMIT)
+                if (fpsentry->parray[pindex].val.i64[0] > fpsentry->parray[pindex].val.i64[2])
                 {
                     fpsentry->md->msgpindex[fpsentry->md->msgcnt] = pindex;
-                    fpsentry->md->msgcode[fpsentry->md->msgcnt] =  FPS_MSG_FLAG_ABOVEMAX |
-                            FPS_MSG_FLAG_ERROR;
-                    if(snprintf(fpsentry->md->message[fpsentry->md->msgcnt],
-                                FUNCTION_PARAMETER_STRUCT_MSG_SIZE,
-                                "int64 value %ld above max %ld",
-                                fpsentry->parray[pindex].val.i64[0],
-                                fpsentry->parray[pindex].val.i64[2]) < 0)
+                    fpsentry->md->msgcode[fpsentry->md->msgcnt] = FPS_MSG_FLAG_ABOVEMAX | FPS_MSG_FLAG_ERROR;
+                    if (snprintf(fpsentry->md->message[fpsentry->md->msgcnt], FUNCTION_PARAMETER_STRUCT_MSG_SIZE,
+                                 "int64 value %ld above max %ld", fpsentry->parray[pindex].val.i64[0],
+                                 fpsentry->parray[pindex].val.i64[2]) < 0)
                     {
                         PRINT_ERROR("snprintf error");
                     }
@@ -149,19 +126,15 @@ int functionparameter_CheckParameter(
                     err = 1;
                 }
 
-
-        if(fpsentry->parray[pindex].type == FPTYPE_FLOAT64)
-            if(fpsentry->parray[pindex].fpflag & FPFLAG_MAXLIMIT)
-                if(fpsentry->parray[pindex].val.f64[0] > fpsentry->parray[pindex].val.f64[2])
+        if (fpsentry->parray[pindex].type == FPTYPE_FLOAT64)
+            if (fpsentry->parray[pindex].fpflag & FPFLAG_MAXLIMIT)
+                if (fpsentry->parray[pindex].val.f64[0] > fpsentry->parray[pindex].val.f64[2])
                 {
                     fpsentry->md->msgpindex[fpsentry->md->msgcnt] = pindex;
-                    fpsentry->md->msgcode[fpsentry->md->msgcnt] =  FPS_MSG_FLAG_ABOVEMAX |
-                            FPS_MSG_FLAG_ERROR;
-                    if(snprintf(fpsentry->md->message[fpsentry->md->msgcnt],
-                                FUNCTION_PARAMETER_STRUCT_MSG_SIZE,
-                                "float64 value %lf above max %lf",
-                                fpsentry->parray[pindex].val.f64[0],
-                                fpsentry->parray[pindex].val.f64[2]) < 0)
+                    fpsentry->md->msgcode[fpsentry->md->msgcnt] = FPS_MSG_FLAG_ABOVEMAX | FPS_MSG_FLAG_ERROR;
+                    if (snprintf(fpsentry->md->message[fpsentry->md->msgcnt], FUNCTION_PARAMETER_STRUCT_MSG_SIZE,
+                                 "float64 value %lf above max %lf", fpsentry->parray[pindex].val.f64[0],
+                                 fpsentry->parray[pindex].val.f64[2]) < 0)
                     {
                         PRINT_ERROR("snprintf error");
                     }
@@ -170,20 +143,15 @@ int functionparameter_CheckParameter(
                     err = 1;
                 }
 
-
-
-        if(fpsentry->parray[pindex].type == FPTYPE_FLOAT32)
-            if(fpsentry->parray[pindex].fpflag & FPFLAG_MAXLIMIT)
-                if(fpsentry->parray[pindex].val.f32[0] > fpsentry->parray[pindex].val.f32[2])
+        if (fpsentry->parray[pindex].type == FPTYPE_FLOAT32)
+            if (fpsentry->parray[pindex].fpflag & FPFLAG_MAXLIMIT)
+                if (fpsentry->parray[pindex].val.f32[0] > fpsentry->parray[pindex].val.f32[2])
                 {
                     fpsentry->md->msgpindex[fpsentry->md->msgcnt] = pindex;
-                    fpsentry->md->msgcode[fpsentry->md->msgcnt] =  FPS_MSG_FLAG_ABOVEMAX |
-                            FPS_MSG_FLAG_ERROR;
-                    if(snprintf(fpsentry->md->message[fpsentry->md->msgcnt],
-                                FUNCTION_PARAMETER_STRUCT_MSG_SIZE,
-                                "float32 value %f above max %f",
-                                fpsentry->parray[pindex].val.f32[0],
-                                fpsentry->parray[pindex].val.f32[2]) < 0)
+                    fpsentry->md->msgcode[fpsentry->md->msgcnt] = FPS_MSG_FLAG_ABOVEMAX | FPS_MSG_FLAG_ERROR;
+                    if (snprintf(fpsentry->md->message[fpsentry->md->msgcnt], FUNCTION_PARAMETER_STRUCT_MSG_SIZE,
+                                 "float32 value %f above max %f", fpsentry->parray[pindex].val.f32[0],
+                                 fpsentry->parray[pindex].val.f32[2]) < 0)
                     {
                         PRINT_ERROR("snprintf error");
                     }
@@ -193,19 +161,16 @@ int functionparameter_CheckParameter(
                 }
     }
 
-
-    if(fpsentry->parray[pindex].type == FPTYPE_FILENAME)
+    if (fpsentry->parray[pindex].type == FPTYPE_FILENAME)
     {
-        if(fpsentry->parray[pindex].fpflag & FPFLAG_FILE_RUN_REQUIRED)
+        if (fpsentry->parray[pindex].fpflag & FPFLAG_FILE_RUN_REQUIRED)
         {
-            if(file_exists(fpsentry->parray[pindex].val.string[0]) == 0)
+            if (file_exists(fpsentry->parray[pindex].val.string[0]) == 0)
             {
                 fpsentry->md->msgpindex[fpsentry->md->msgcnt] = pindex;
-                fpsentry->md->msgcode[fpsentry->md->msgcnt] =  FPS_MSG_FLAG_ERROR;
-                if(snprintf(fpsentry->md->message[fpsentry->md->msgcnt],
-                            FUNCTION_PARAMETER_STRUCT_MSG_SIZE,
-                            "File %s does not exist",
-                            fpsentry->parray[pindex].val.string[0]) < 0)
+                fpsentry->md->msgcode[fpsentry->md->msgcnt] = FPS_MSG_FLAG_ERROR;
+                if (snprintf(fpsentry->md->message[fpsentry->md->msgcnt], FUNCTION_PARAMETER_STRUCT_MSG_SIZE,
+                             "File %s does not exist", fpsentry->parray[pindex].val.string[0]) < 0)
                 {
                     PRINT_ERROR("snprintf error");
                 }
@@ -216,20 +181,16 @@ int functionparameter_CheckParameter(
         }
     }
 
-
-
-    if(fpsentry->parray[pindex].type == FPTYPE_FITSFILENAME)
+    if (fpsentry->parray[pindex].type == FPTYPE_FITSFILENAME)
     {
-        if(fpsentry->parray[pindex].fpflag & FPFLAG_FILE_RUN_REQUIRED)
+        if (fpsentry->parray[pindex].fpflag & FPFLAG_FILE_RUN_REQUIRED)
         {
-            if(is_fits_file(fpsentry->parray[pindex].val.string[0]) == 0)
+            if (is_fits_file(fpsentry->parray[pindex].val.string[0]) == 0)
             {
                 fpsentry->md->msgpindex[fpsentry->md->msgcnt] = pindex;
-                fpsentry->md->msgcode[fpsentry->md->msgcnt] =  FPS_MSG_FLAG_ERROR;
-                if(snprintf(fpsentry->md->message[fpsentry->md->msgcnt],
-                            FUNCTION_PARAMETER_STRUCT_MSG_SIZE,
-                            "FITS file %s does not exist",
-                            fpsentry->parray[pindex].val.string[0]) < 0)
+                fpsentry->md->msgcode[fpsentry->md->msgcnt] = FPS_MSG_FLAG_ERROR;
+                if (snprintf(fpsentry->md->message[fpsentry->md->msgcnt], FUNCTION_PARAMETER_STRUCT_MSG_SIZE,
+                             "FITS file %s does not exist", fpsentry->parray[pindex].val.string[0]) < 0)
                 {
                     PRINT_ERROR("snprintf error");
                 }
@@ -240,21 +201,17 @@ int functionparameter_CheckParameter(
         }
     }
 
-
-    if(fpsentry->parray[pindex].type == FPTYPE_EXECFILENAME)
+    if (fpsentry->parray[pindex].type == FPTYPE_EXECFILENAME)
     {
-        if(fpsentry->parray[pindex].fpflag & FPFLAG_FILE_RUN_REQUIRED)
+        if (fpsentry->parray[pindex].fpflag & FPFLAG_FILE_RUN_REQUIRED)
         {
             struct stat sb;
-            if(!(stat(fpsentry->parray[pindex].val.string[0], &sb) == 0
-                    && sb.st_mode & S_IXUSR))
+            if (!(stat(fpsentry->parray[pindex].val.string[0], &sb) == 0 && sb.st_mode & S_IXUSR))
             {
                 fpsentry->md->msgpindex[fpsentry->md->msgcnt] = pindex;
-                fpsentry->md->msgcode[fpsentry->md->msgcnt] =  FPS_MSG_FLAG_ERROR;
-                if(snprintf(fpsentry->md->message[fpsentry->md->msgcnt],
-                            FUNCTION_PARAMETER_STRUCT_MSG_SIZE,
-                            "File %s cannot be executed",
-                            fpsentry->parray[pindex].val.string[0]) < 0)
+                fpsentry->md->msgcode[fpsentry->md->msgcnt] = FPS_MSG_FLAG_ERROR;
+                if (snprintf(fpsentry->md->message[fpsentry->md->msgcnt], FUNCTION_PARAMETER_STRUCT_MSG_SIZE,
+                             "File %s cannot be executed", fpsentry->parray[pindex].val.string[0]) < 0)
                 {
                     PRINT_ERROR("snprintf error");
                 }
@@ -265,23 +222,19 @@ int functionparameter_CheckParameter(
         }
     }
 
-
-
     FUNCTION_PARAMETER_STRUCT fpstest;
-    if(fpsentry->parray[pindex].type == FPTYPE_FPSNAME)
+    if (fpsentry->parray[pindex].type == FPTYPE_FPSNAME)
     {
-        if(fpsentry->parray[pindex].fpflag & FPFLAG_FPS_RUN_REQUIRED)
+        if (fpsentry->parray[pindex].fpflag & FPFLAG_FPS_RUN_REQUIRED)
         {
-            long NBparamMAX = function_parameter_struct_connect(
-                                  fpsentry->parray[pindex].val.string[0], &fpstest, FPSCONNECT_SIMPLE);
-            if(NBparamMAX < 1)
+            long NBparamMAX =
+                function_parameter_struct_connect(fpsentry->parray[pindex].val.string[0], &fpstest, FPSCONNECT_SIMPLE);
+            if (NBparamMAX < 1)
             {
                 fpsentry->md->msgpindex[fpsentry->md->msgcnt] = pindex;
-                fpsentry->md->msgcode[fpsentry->md->msgcnt] =  FPS_MSG_FLAG_ERROR;
-                if(snprintf(fpsentry->md->message[fpsentry->md->msgcnt],
-                            FUNCTION_PARAMETER_STRUCT_MSG_SIZE,
-                            "FPS %s: no connection",
-                            fpsentry->parray[pindex].val.string[0]) < 0)
+                fpsentry->md->msgcode[fpsentry->md->msgcnt] = FPS_MSG_FLAG_ERROR;
+                if (snprintf(fpsentry->md->message[fpsentry->md->msgcnt], FUNCTION_PARAMETER_STRUCT_MSG_SIZE,
+                             "FPS %s: no connection", fpsentry->parray[pindex].val.string[0]) < 0)
                 {
                     PRINT_ERROR("snprintf error");
                 }
@@ -296,12 +249,8 @@ int functionparameter_CheckParameter(
         }
     }
 
-
-
-
-
     // STREAM CHECK
-    if((fpsentry->parray[pindex].type & FPTYPE_STREAMNAME))
+    if ((fpsentry->parray[pindex].type & FPTYPE_STREAMNAME))
     {
 
         uint32_t imLOC;
@@ -309,31 +258,26 @@ int functionparameter_CheckParameter(
                                                &(fpsentry->parray[pindex].fpflag), &imLOC);
         fpsentry->parray[pindex].info.stream.streamID = ID;
 
-        if(ID > -1)
+        if (ID > -1)
         {
             fpsentry->parray[pindex].info.stream.stream_sourceLocation = imLOC;
-            fpsentry->parray[pindex].info.stream.stream_atype =
-                data.image[ID].md[0].datatype;
+            fpsentry->parray[pindex].info.stream.stream_atype = data.image[ID].md[0].datatype;
 
-            fpsentry->parray[pindex].info.stream.stream_naxis[0] =
-                data.image[ID].md[0].naxis;
-            fpsentry->parray[pindex].info.stream.stream_xsize[0] =
-                data.image[ID].md[0].size[0];
+            fpsentry->parray[pindex].info.stream.stream_naxis[0] = data.image[ID].md[0].naxis;
+            fpsentry->parray[pindex].info.stream.stream_xsize[0] = data.image[ID].md[0].size[0];
 
-            if(fpsentry->parray[pindex].info.stream.stream_naxis[0] > 1)
+            if (fpsentry->parray[pindex].info.stream.stream_naxis[0] > 1)
             {
-                fpsentry->parray[pindex].info.stream.stream_ysize[0] =
-                    data.image[ID].md[0].size[1];
+                fpsentry->parray[pindex].info.stream.stream_ysize[0] = data.image[ID].md[0].size[1];
             }
             else
             {
                 fpsentry->parray[pindex].info.stream.stream_ysize[0] = 1;
             }
 
-            if(fpsentry->parray[pindex].info.stream.stream_naxis[0] > 2)
+            if (fpsentry->parray[pindex].info.stream.stream_naxis[0] > 2)
             {
-                fpsentry->parray[pindex].info.stream.stream_zsize[0] =
-                    data.image[ID].md[0].size[2];
+                fpsentry->parray[pindex].info.stream.stream_zsize[0] = data.image[ID].md[0].size[2];
             }
             else
             {
@@ -341,21 +285,18 @@ int functionparameter_CheckParameter(
             }
         }
 
-
-
-        if(fpsentry->parray[pindex].fpflag & FPFLAG_STREAM_RUN_REQUIRED)
+        if (fpsentry->parray[pindex].fpflag & FPFLAG_STREAM_RUN_REQUIRED)
         {
             char msg[200];
             sprintf(msg, "Loading stream %s", fpsentry->parray[pindex].val.string[0]);
             functionparameter_outlog("LOADMEMSTREAM", "%s", msg);
 
-            if(imLOC == STREAM_LOAD_SOURCE_NOTFOUND)
+            if (imLOC == STREAM_LOAD_SOURCE_NOTFOUND)
             {
                 fpsentry->md->msgpindex[fpsentry->md->msgcnt] = pindex;
-                fpsentry->md->msgcode[fpsentry->md->msgcnt] =  FPS_MSG_FLAG_ERROR;
-                if(snprintf(fpsentry->md->message[fpsentry->md->msgcnt],
-                            FUNCTION_PARAMETER_STRUCT_MSG_SIZE, "cannot load stream %s",
-                            fpsentry->parray[pindex].val.string[0]) < 0)
+                fpsentry->md->msgcode[fpsentry->md->msgcnt] = FPS_MSG_FLAG_ERROR;
+                if (snprintf(fpsentry->md->message[fpsentry->md->msgcnt], FUNCTION_PARAMETER_STRUCT_MSG_SIZE,
+                             "cannot load stream %s", fpsentry->parray[pindex].val.string[0]) < 0)
                 {
                     PRINT_ERROR("snprintf error");
                 }
@@ -366,8 +307,7 @@ int functionparameter_CheckParameter(
         }
     }
 
-
-    if(err == 1)
+    if (err == 1)
     {
         fpsentry->parray[pindex].fpflag |= FPFLAG_ERROR;
     }
@@ -376,18 +316,10 @@ int functionparameter_CheckParameter(
         fpsentry->parray[pindex].fpflag &= ~FPFLAG_ERROR;
     }
 
-
-
     return err;
 }
 
-
-
-
-
-int functionparameter_CheckParametersAll(
-    FUNCTION_PARAMETER_STRUCT *fpsentry
-)
+int functionparameter_CheckParametersAll(FUNCTION_PARAMETER_STRUCT *fpsentry)
 {
     long NBparamMAX;
     long pindex;
@@ -397,8 +329,6 @@ int functionparameter_CheckParametersAll(
     sprintf(msg, "%s", fpsentry->md->name);
     functionparameter_outlog("CHECKPARAMALL", "%s", msg);
 
-
-
     strcpy(fpsentry->md->message[0], "\0");
     NBparamMAX = fpsentry->md->NBparamMAX;
 
@@ -406,17 +336,15 @@ int functionparameter_CheckParametersAll(
     fpsentry->md->msgcnt = 0;
     fpsentry->md->conferrcnt = 0;
     //    printf("Checking %d parameter entries\n", NBparam);
-    for(pindex = 0; pindex < NBparamMAX; pindex++)
+    for (pindex = 0; pindex < NBparamMAX; pindex++)
     {
         errcnt += functionparameter_CheckParameter(fpsentry, pindex);
     }
 
-
     // number of configuration errors - should be zero for run process to start
     fpsentry->md->conferrcnt = errcnt;
 
-
-    if(errcnt == 0)
+    if (errcnt == 0)
     {
         fpsentry->md->status |= FUNCTION_PARAMETER_STRUCT_STATUS_CHECKOK;
     }
@@ -425,15 +353,14 @@ int functionparameter_CheckParametersAll(
         fpsentry->md->status &= ~FUNCTION_PARAMETER_STRUCT_STATUS_CHECKOK;
     }
 
-
     // compute write status
 
-    for(pindex = 0; pindex < NBparamMAX; pindex++)
+    for (pindex = 0; pindex < NBparamMAX; pindex++)
     {
         int writeOK; // do we have write permission ?
 
         // by default, adopt FPFLAG_WRITE flag
-        if(fpsentry->parray[pindex].fpflag & FPFLAG_WRITE)
+        if (fpsentry->parray[pindex].fpflag & FPFLAG_WRITE)
         {
             writeOK = 1;
         }
@@ -443,9 +370,9 @@ int functionparameter_CheckParametersAll(
         }
 
         // if CONF running
-        if(fpsentry->md->status & FUNCTION_PARAMETER_STRUCT_STATUS_CONF)
+        if (fpsentry->md->status & FUNCTION_PARAMETER_STRUCT_STATUS_CONF)
         {
-            if(fpsentry->parray[pindex].fpflag & FPFLAG_WRITECONF)
+            if (fpsentry->parray[pindex].fpflag & FPFLAG_WRITECONF)
             {
                 writeOK = 1;
             }
@@ -456,9 +383,9 @@ int functionparameter_CheckParametersAll(
         }
 
         // if RUN running
-        if(fpsentry->md->status & FUNCTION_PARAMETER_STRUCT_STATUS_RUN)
+        if (fpsentry->md->status & FUNCTION_PARAMETER_STRUCT_STATUS_RUN)
         {
-            if(fpsentry->parray[pindex].fpflag & FPFLAG_WRITERUN)
+            if (fpsentry->parray[pindex].fpflag & FPFLAG_WRITERUN)
             {
                 writeOK = 1;
             }
@@ -468,7 +395,7 @@ int functionparameter_CheckParametersAll(
             }
         }
 
-        if(writeOK == 0)
+        if (writeOK == 0)
         {
             fpsentry->parray[pindex].fpflag &= ~FPFLAG_WRITESTATUS;
         }
@@ -480,6 +407,5 @@ int functionparameter_CheckParametersAll(
 
     fpsentry->md->signal &= ~FUNCTION_PARAMETER_STRUCT_SIGNAL_CHECKED;
 
-
     return 0;
 }
diff --git a/src/CommandLineInterface/fps_checkparameter.h b/src/CommandLineInterface/fps_checkparameter.h
index b97d1332..edbd6788 100644
--- a/src/CommandLineInterface/fps_checkparameter.h
+++ b/src/CommandLineInterface/fps_checkparameter.h
@@ -7,17 +7,8 @@
 #ifndef FPS_CHECKPARAMETERS_H
 #define FPS_CHECKPARAMETERS_H
 
+int functionparameter_CheckParameter(FUNCTION_PARAMETER_STRUCT *fpsentry, int pindex);
 
-int functionparameter_CheckParameter(
-    FUNCTION_PARAMETER_STRUCT *fpsentry,
-    int pindex
-);
+int functionparameter_CheckParametersAll(FUNCTION_PARAMETER_STRUCT *fpsentry);
 
-
-
-
-int functionparameter_CheckParametersAll(
-    FUNCTION_PARAMETER_STRUCT *fpsentry
-);
-
-#endif
\ No newline at end of file
+#endif
diff --git a/src/CommandLineInterface/fps_connect.c b/src/CommandLineInterface/fps_connect.c
index af181b7e..b5ce1612 100644
--- a/src/CommandLineInterface/fps_connect.c
+++ b/src/CommandLineInterface/fps_connect.c
@@ -3,20 +3,15 @@
  * @brief   connect to FPS
  */
 
-
-
-#include <fcntl.h> // for open
+#include <fcntl.h>    // for open
 #include <sys/mman.h> // mmap
 #include <sys/stat.h> // fstat
 
-
 #include "CommandLineInterface/CLIcore.h"
 #include "CommandLineInterface/timeutils.h"
-#include "fps_shmdirname.h"
-#include "fps_loadstream.h"
 #include "fps_GetParamIndex.h"
-
-
+#include "fps_loadstream.h"
+#include "fps_shmdirname.h"
 
 /** @brief Connect to function parameter structure
  *
@@ -30,16 +25,12 @@
  * FPSCONNECT_RUN    : connect as RUN process
  *
  */
-long function_parameter_struct_connect(
-    const char *name,
-    FUNCTION_PARAMETER_STRUCT *fps,
-    int fpsconnectmode
-)
+long function_parameter_struct_connect(const char *name, FUNCTION_PARAMETER_STRUCT *fps, int fpsconnectmode)
 {
-    int   stringmaxlen = 500;
-    char  SM_fname[stringmaxlen];
-    int   SM_fd; // shared memory file descriptor
-    long  NBparamMAX;
+    int stringmaxlen = 500;
+    char SM_fname[stringmaxlen];
+    int SM_fd; // shared memory file descriptor
+    long NBparamMAX;
     //    long NBparamActive;
     char *mapv;
 
@@ -47,41 +38,35 @@ long function_parameter_struct_connect(
 
     DEBUG_TRACEPOINT("Connect to fps %s\n", name);
 
-    if(fps->SMfd > -1)
+    if (fps->SMfd > -1)
     {
-        printf("[%s %s %d] ERROR: file descriptor already allocated : %d\n", __FILE__,
-               __func__, __LINE__, fps->SMfd);
+        printf("[%s %s %d] ERROR: file descriptor already allocated : %d\n", __FILE__, __func__, __LINE__, fps->SMfd);
         //	exit(0);
     }
 
-
     function_parameter_struct_shmdirname(shmdname);
 
-    if(snprintf(SM_fname, sizeof(SM_fname), "%s/%s.fps.shm", shmdname, name) < 0)
+    if (snprintf(SM_fname, sizeof(SM_fname), "%s/%s.fps.shm", shmdname, name) < 0)
     {
         PRINT_ERROR("snprintf error");
     }
     DEBUG_TRACEPOINT("File : %s\n", SM_fname);
     SM_fd = open(SM_fname, O_RDWR);
-    if(SM_fd == -1)
+    if (SM_fd == -1)
     {
-        printf("cannot connect to %s\n",
-               SM_fname);
-        return(-1);
+        printf("cannot connect to %s\n", SM_fname);
+        return (-1);
     }
     else
     {
         fps->SMfd = SM_fd;
     }
 
-
     struct stat file_stat;
     fstat(SM_fd, &file_stat);
 
-
-    fps->md = (FUNCTION_PARAMETER_STRUCT_MD *) mmap(0, file_stat.st_size,
-              PROT_READ | PROT_WRITE, MAP_SHARED, SM_fd, 0);
-    if(fps->md == MAP_FAILED)
+    fps->md = (FUNCTION_PARAMETER_STRUCT_MD *)mmap(0, file_stat.st_size, PROT_READ | PROT_WRITE, MAP_SHARED, SM_fd, 0);
+    if (fps->md == MAP_FAILED)
     {
         close(SM_fd);
         perror("Error mmapping the file");
@@ -90,57 +75,52 @@ long function_parameter_struct_connect(
         exit(EXIT_FAILURE);
     }
 
-    if(fpsconnectmode == FPSCONNECT_CONF)
+    if (fpsconnectmode == FPSCONNECT_CONF)
     {
-        fps->md->confpid = getpid();    // write process PID into FPS
+        fps->md->confpid = getpid(); // write process PID into FPS
         clock_gettime(CLOCK_REALTIME, &fps->md->confpidstarttime);
     }
 
-    if(fpsconnectmode == FPSCONNECT_RUN)
+    if (fpsconnectmode == FPSCONNECT_RUN)
     {
-        fps->md->runpid = getpid();    // write process PID into FPS
+        fps->md->runpid = getpid(); // write process PID into FPS
         clock_gettime(CLOCK_REALTIME, &fps->md->runpidstarttime);
     }
 
-
-
-    mapv = (char *) fps->md;
+    mapv = (char *)fps->md;
     mapv += sizeof(FUNCTION_PARAMETER_STRUCT_MD);
-    fps->parray = (FUNCTION_PARAMETER *) mapv;
+    fps->parray = (FUNCTION_PARAMETER *)mapv;
 
     //	NBparam = (int) (file_stat.st_size / sizeof(FUNCTION_PARAMETER));
     NBparamMAX = fps->md->NBparamMAX;
-    printf("    Connected to %s, %ld entries\n", SM_fname,
-           NBparamMAX);
+    printf("    Connected to %s, %ld entries\n", SM_fname, NBparamMAX);
     fflush(stdout);
 
-
     // decompose full name into pname and indices
     int NBi = 0;
     char tmpstring[stringmaxlen];
     char tmpstring1[stringmaxlen];
     char *pch;
 
-
     strncpy(tmpstring, name, stringmaxlen - 1);
     NBi = -1;
     pch = strtok(tmpstring, "-");
-    while(pch != NULL)
+    while (pch != NULL)
     {
         strncpy(tmpstring1, pch, stringmaxlen - 1);
 
-        if(NBi == -1)
+        if (NBi == -1)
         {
             //            strncpy(fps->md->pname, tmpstring1, stringmaxlen);
-            if(snprintf(fps->md->pname, FPS_PNAME_STRMAXLEN, "%s", tmpstring1) < 0)
+            if (snprintf(fps->md->pname, FPS_PNAME_STRMAXLEN, "%s", tmpstring1) < 0)
             {
                 PRINT_ERROR("snprintf error");
             }
         }
 
-        if((NBi >= 0) && (NBi < 10))
+        if ((NBi >= 0) && (NBi < 10))
         {
-            if(snprintf(fps->md->nameindexW[NBi], 16, "%s", tmpstring1) < 0)
+            if (snprintf(fps->md->nameindexW[NBi], 16, "%s", tmpstring1) < 0)
             {
                 PRINT_ERROR("snprintf error");
             }
@@ -151,45 +131,37 @@ long function_parameter_struct_connect(
         pch = strtok(NULL, "-");
     }
 
-
     fps->md->NBnameindex = NBi;
 
-
     // count active parameters
     int pactivecnt = 0;
-    for(int pindex = 0; pindex < NBparamMAX; pindex++)
+    for (int pindex = 0; pindex < NBparamMAX; pindex++)
     {
-        if(fps->parray[pindex].fpflag & FPFLAG_ACTIVE)
+        if (fps->parray[pindex].fpflag & FPFLAG_ACTIVE)
         {
-            pactivecnt ++;
+            pactivecnt++;
         }
     }
     fps->NBparamActive = pactivecnt;
 
-
-
     //function_parameter_printlist(fps->parray, NBparamMAX);
 
-
-    if((fpsconnectmode == FPSCONNECT_CONF) || (fpsconnectmode == FPSCONNECT_RUN))
+    if ((fpsconnectmode == FPSCONNECT_CONF) || (fpsconnectmode == FPSCONNECT_RUN))
     {
         // load streams
         int pindex;
-        for(pindex = 0; pindex < NBparamMAX; pindex++)
+        for (pindex = 0; pindex < NBparamMAX; pindex++)
         {
-            if((fps->parray[pindex].fpflag & FPFLAG_ACTIVE)
-                    && (fps->parray[pindex].fpflag & FPFLAG_USED)
-                    && (fps->parray[pindex].type & FPTYPE_STREAMNAME))
+            if ((fps->parray[pindex].fpflag & FPFLAG_ACTIVE) && (fps->parray[pindex].fpflag & FPFLAG_USED) &&
+                (fps->parray[pindex].type & FPTYPE_STREAMNAME))
             {
                 functionparameter_LoadStream(fps, pindex, fpsconnectmode);
             }
         }
     }
 
-
-
     // if available, get process settings from FPS entries
-    if(fpsconnectmode == FPSCONNECT_RUN)
+    if (fpsconnectmode == FPSCONNECT_RUN)
     {
         // update time
         //
@@ -197,12 +169,11 @@ long function_parameter_struct_connect(
         //
         {
             int pindex = functionparameter_GetParamIndex(fps, ".conf.timestring");
-            if(pindex > -1)
+            if (pindex > -1)
             {
                 char timestring[100];
                 mkUTtimestring_microsec(timestring, fps->md->runpidstarttime);
-                if(snprintf(fps->parray[pindex].val.string[0],
-                            FUNCTION_PARAMETER_STRMAXLEN, "%s", timestring) < 0)
+                if (snprintf(fps->parray[pindex].val.string[0], FUNCTION_PARAMETER_STRMAXLEN, "%s", timestring) < 0)
                 {
                     PRINT_ERROR("snprintf error");
                 }
@@ -212,11 +183,11 @@ long function_parameter_struct_connect(
         {
             // check if processinfo is enabled
             int pindex = functionparameter_GetParamIndex(fps, ".procinfo.enabled");
-            if(pindex > -1)
+            if (pindex > -1)
             {
-                if(fps->parray[pindex].type == FPTYPE_ONOFF)
+                if (fps->parray[pindex].type == FPTYPE_ONOFF)
                 {
-                    if(fps->parray[pindex].fpflag & FPFLAG_ONOFF)
+                    if (fps->parray[pindex].fpflag & FPFLAG_ONOFF)
                     {
                         fps->cmdset.flags |= CLICMDFLAG_PROCINFO;
                     }
@@ -228,26 +199,24 @@ long function_parameter_struct_connect(
             }
         }
 
-
         {
             // procinfo_loopcntMax
             int pindex = functionparameter_GetParamIndex(fps, ".procinfo.loopcntMax");
-            if(pindex > -1)
+            if (pindex > -1)
             {
-                if(fps->parray[pindex].type == FPTYPE_INT64)
+                if (fps->parray[pindex].type == FPTYPE_INT64)
                 {
                     fps->cmdset.procinfo_loopcntMax = fps->parray[pindex].val.i64[0];
                 }
             }
         }
 
-
         {
             // RT_priority
             int pindex = functionparameter_GetParamIndex(fps, ".procinfo.RTprio");
-            if(pindex > -1)
+            if (pindex > -1)
             {
-                if(fps->parray[pindex].type == FPTYPE_INT64)
+                if (fps->parray[pindex].type == FPTYPE_INT64)
                 {
                     fps->cmdset.RT_priority = fps->parray[pindex].val.i64[0];
                 }
@@ -257,9 +226,9 @@ long function_parameter_struct_connect(
         {
             // triggerstreamname
             int pindex = functionparameter_GetParamIndex(fps, ".procinfo.triggersname");
-            if(pindex > -1)
+            if (pindex > -1)
             {
-                if(fps->parray[pindex].type == FPTYPE_STREAMNAME)
+                if (fps->parray[pindex].type == FPTYPE_STREAMNAME)
                 {
                     strcpy(fps->cmdset.triggerstreamname, fps->parray[pindex].val.string[0]);
                 }
@@ -269,9 +238,9 @@ long function_parameter_struct_connect(
         {
             // triggermode
             int pindex = functionparameter_GetParamIndex(fps, ".procinfo.triggermode");
-            if(pindex > -1)
+            if (pindex > -1)
             {
-                if(fps->parray[pindex].type == FPTYPE_INT64)
+                if (fps->parray[pindex].type == FPTYPE_INT64)
                 {
                     fps->cmdset.triggermode = fps->parray[pindex].val.i64[0];
                 }
@@ -280,11 +249,10 @@ long function_parameter_struct_connect(
 
         {
             // semindexrequested
-            int pindex = functionparameter_GetParamIndex(fps,
-                         ".procinfo.semindexrequested");
-            if(pindex > -1)
+            int pindex = functionparameter_GetParamIndex(fps, ".procinfo.semindexrequested");
+            if (pindex > -1)
             {
-                if(fps->parray[pindex].type == FPTYPE_INT64)
+                if (fps->parray[pindex].type == FPTYPE_INT64)
                 {
                     fps->cmdset.semindexrequested = fps->parray[pindex].val.i64[0];
                 }
@@ -294,11 +262,11 @@ long function_parameter_struct_connect(
         {
             // triggerdelay
             int pindex = functionparameter_GetParamIndex(fps, ".procinfo.triggerdelay");
-            if(pindex > -1)
+            if (pindex > -1)
             {
-                if(fps->parray[pindex].type == FPTYPE_TIMESPEC)
+                if (fps->parray[pindex].type == FPTYPE_TIMESPEC)
                 {
-                    fps->cmdset.triggerdelay.tv_sec  = fps->parray[pindex].val.ts[0].tv_sec;
+                    fps->cmdset.triggerdelay.tv_sec = fps->parray[pindex].val.ts[0].tv_sec;
                     fps->cmdset.triggerdelay.tv_nsec = fps->parray[pindex].val.ts[0].tv_nsec;
                 }
             }
@@ -307,19 +275,16 @@ long function_parameter_struct_connect(
         {
             // triggertimeout
             int pindex = functionparameter_GetParamIndex(fps, ".procinfo.triggertimeout");
-            if(pindex > -1)
+            if (pindex > -1)
             {
-                if(fps->parray[pindex].type == FPTYPE_TIMESPEC)
+                if (fps->parray[pindex].type == FPTYPE_TIMESPEC)
                 {
-                    fps->cmdset.triggertimeout.tv_sec  = fps->parray[pindex].val.ts[0].tv_sec;
+                    fps->cmdset.triggertimeout.tv_sec = fps->parray[pindex].val.ts[0].tv_sec;
                     fps->cmdset.triggertimeout.tv_nsec = fps->parray[pindex].val.ts[0].tv_nsec;
                 }
             }
         }
-
     }
 
-    return(NBparamMAX);
+    return (NBparamMAX);
 }
-
-
diff --git a/src/CommandLineInterface/fps_connect.h b/src/CommandLineInterface/fps_connect.h
index 85f53ab6..8f92c8b8 100644
--- a/src/CommandLineInterface/fps_connect.h
+++ b/src/CommandLineInterface/fps_connect.h
@@ -3,15 +3,9 @@
  * @brief   connect to FPS
  */
 
-
 #ifndef FPS_CONNECT_H
 #define FPS_CONNECT_H
 
+long function_parameter_struct_connect(const char *name, FUNCTION_PARAMETER_STRUCT *fps, int fpsconnectmode);
 
-long function_parameter_struct_connect(
-    const char *name,
-    FUNCTION_PARAMETER_STRUCT *fps,
-    int fpsconnectmode
-);
-
-#endif
\ No newline at end of file
+#endif
diff --git a/src/CommandLineInterface/fps_connectExternalFPS.c b/src/CommandLineInterface/fps_connectExternalFPS.c
index bc5a070f..a3c945be 100644
--- a/src/CommandLineInterface/fps_connectExternalFPS.c
+++ b/src/CommandLineInterface/fps_connectExternalFPS.c
@@ -3,33 +3,25 @@
  * @brief   connect to external FPS
  */
 
-
 #include "CommandLineInterface/CLIcore.h"
 
 #include "fps_connect.h"
 
-
-
-int functionparameter_ConnectExternalFPS(
-    FUNCTION_PARAMETER_STRUCT *FPS,
-    int pindex,
-    FUNCTION_PARAMETER_STRUCT *FPSext
-)
+int functionparameter_ConnectExternalFPS(FUNCTION_PARAMETER_STRUCT *FPS, int pindex, FUNCTION_PARAMETER_STRUCT *FPSext)
 {
-    FPS->parray[pindex].info.fps.FPSNBparamMAX = function_parameter_struct_connect(
-                FPS->parray[pindex].val.string[0], FPSext, FPSCONNECT_SIMPLE);
+    FPS->parray[pindex].info.fps.FPSNBparamMAX =
+        function_parameter_struct_connect(FPS->parray[pindex].val.string[0], FPSext, FPSCONNECT_SIMPLE);
 
     FPS->parray[pindex].info.fps.FPSNBparamActive = 0;
     FPS->parray[pindex].info.fps.FPSNBparamUsed = 0;
     int pindexext;
-    for(pindexext = 0; pindexext < FPS->parray[pindex].info.fps.FPSNBparamMAX;
-            pindexext++)
+    for (pindexext = 0; pindexext < FPS->parray[pindex].info.fps.FPSNBparamMAX; pindexext++)
     {
-        if(FPSext->parray[pindexext].fpflag & FPFLAG_ACTIVE)
+        if (FPSext->parray[pindexext].fpflag & FPFLAG_ACTIVE)
         {
             FPS->parray[pindex].info.fps.FPSNBparamActive++;
         }
-        if(FPSext->parray[pindexext].fpflag & FPFLAG_USED)
+        if (FPSext->parray[pindexext].fpflag & FPFLAG_USED)
         {
             FPS->parray[pindex].info.fps.FPSNBparamUsed++;
         }
@@ -37,4 +29,3 @@ int functionparameter_ConnectExternalFPS(
 
     return 0;
 }
-
diff --git a/src/CommandLineInterface/fps_connectExternalFPS.h b/src/CommandLineInterface/fps_connectExternalFPS.h
index 8769dc45..d48a0f43 100644
--- a/src/CommandLineInterface/fps_connectExternalFPS.h
+++ b/src/CommandLineInterface/fps_connectExternalFPS.h
@@ -3,14 +3,9 @@
  * @brief   connect to external FPS
  */
 
-
 #ifndef FPS_CONNECTEXTERNALFPS_H
 #define FPS_CONNECTEXTERNALFPS_H
 
-int functionparameter_ConnectExternalFPS(
-    FUNCTION_PARAMETER_STRUCT *FPS,
-    int pindex,
-    FUNCTION_PARAMETER_STRUCT *FPSext
-);
+int functionparameter_ConnectExternalFPS(FUNCTION_PARAMETER_STRUCT *FPS, int pindex, FUNCTION_PARAMETER_STRUCT *FPSext);
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/CommandLineInterface/fps_disconnect.c b/src/CommandLineInterface/fps_disconnect.c
index 48e96118..812fcde2 100644
--- a/src/CommandLineInterface/fps_disconnect.c
+++ b/src/CommandLineInterface/fps_disconnect.c
@@ -5,27 +5,20 @@
 
 #include <sys/mman.h> // munmap
 
-
 #include "CommandLineInterface/CLIcore.h"
 
-
-
-
-int function_parameter_struct_disconnect(
-    FUNCTION_PARAMETER_STRUCT *funcparamstruct
-)
+int function_parameter_struct_disconnect(FUNCTION_PARAMETER_STRUCT *funcparamstruct)
 {
     int NBparamMAX;
 
     NBparamMAX = funcparamstruct->md->NBparamMAX;
     //funcparamstruct->md->NBparam = 0;
     funcparamstruct->parray = NULL;
-    
-    munmap(funcparamstruct->md,
-           sizeof(FUNCTION_PARAMETER_STRUCT_MD) + sizeof(FUNCTION_PARAMETER)*NBparamMAX);
-    
+
+    munmap(funcparamstruct->md, sizeof(FUNCTION_PARAMETER_STRUCT_MD) + sizeof(FUNCTION_PARAMETER) * NBparamMAX);
+
     close(funcparamstruct->SMfd);
-    
+
     funcparamstruct->SMfd = -1;
 
     return RETURN_SUCCESS;
diff --git a/src/CommandLineInterface/fps_disconnect.h b/src/CommandLineInterface/fps_disconnect.h
index 51d862ad..fec29da2 100644
--- a/src/CommandLineInterface/fps_disconnect.h
+++ b/src/CommandLineInterface/fps_disconnect.h
@@ -8,8 +8,6 @@
 
 #include "function_parameters.h"
 
-int function_parameter_struct_disconnect(
-    FUNCTION_PARAMETER_STRUCT *funcparamstruct
-);
+int function_parameter_struct_disconnect(FUNCTION_PARAMETER_STRUCT *funcparamstruct);
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/CommandLineInterface/fps_execFPScmd.c b/src/CommandLineInterface/fps_execFPScmd.c
index 307ac7a3..d2709d85 100644
--- a/src/CommandLineInterface/fps_execFPScmd.c
+++ b/src/CommandLineInterface/fps_execFPScmd.c
@@ -18,52 +18,52 @@ errno_t function_parameter_execFPScmd()
 {
     long fpsID;
 
-    if(data.FPS_CMDCODE == FPSCMDCODE_FPSINIT)   // Initialize FPS
+    if (data.FPS_CMDCODE == FPSCMDCODE_FPSINIT) // Initialize FPS
     {
         data.FPS_CONFfunc(); // call conf function
         return RETURN_SUCCESS;
     }
 
-    if(data.FPS_CMDCODE == FPSCMDCODE_CONFSTART)    // Start CONF process
+    if (data.FPS_CMDCODE == FPSCMDCODE_CONFSTART) // Start CONF process
     {
         data.FPS_CONFfunc(); // call conf function
         return RETURN_SUCCESS;
     }
 
-    if(data.FPS_CMDCODE == FPSCMDCODE_CONFSTOP)   // Stop CONF process
+    if (data.FPS_CMDCODE == FPSCMDCODE_CONFSTOP) // Stop CONF process
     {
         data.FPS_CONFfunc(); // call conf function
         return RETURN_SUCCESS;
     }
 
-    if(data.FPS_CMDCODE == FPSCMDCODE_RUNSTART)   // Start RUN process
+    if (data.FPS_CMDCODE == FPSCMDCODE_RUNSTART) // Start RUN process
     {
         data.FPS_RUNfunc(); // call run function
         return RETURN_SUCCESS;
     }
 
-    if(data.FPS_CMDCODE == FPSCMDCODE_RUNSTOP)   // Stop RUN process
+    if (data.FPS_CMDCODE == FPSCMDCODE_RUNSTOP) // Stop RUN process
     {
         data.FPS_CONFfunc(); // call conf function
         return RETURN_SUCCESS;
     }
 
-    if(data.FPS_CMDCODE == FPSCMDCODE_TMUXSTART)   // Start tmux session
+    if (data.FPS_CMDCODE == FPSCMDCODE_TMUXSTART) // Start tmux session
     {
         // load if not already in memory
         fpsID = function_parameter_structure_load(data.FPS_name);
-        if(fpsID != -1)
+        if (fpsID != -1)
         {
             functionparameter_FPS_tmux_init(&data.fpsarray[fpsID]);
         }
         return RETURN_SUCCESS;
     }
 
-    if(data.FPS_CMDCODE == FPSCMDCODE_TMUXSTOP)   // Stop tmux session
+    if (data.FPS_CMDCODE == FPSCMDCODE_TMUXSTOP) // Stop tmux session
     {
         // load if not already in memory
         fpsID = function_parameter_structure_load(data.FPS_name);
-        if(fpsID != -1)
+        if (fpsID != -1)
         {
             functionparameter_FPS_tmux_kill(&data.fpsarray[fpsID]);
         }
diff --git a/src/CommandLineInterface/fps_execFPScmd.h b/src/CommandLineInterface/fps_execFPScmd.h
index 4a21eace..224037bb 100644
--- a/src/CommandLineInterface/fps_execFPScmd.h
+++ b/src/CommandLineInterface/fps_execFPScmd.h
@@ -8,4 +8,4 @@
 
 errno_t function_parameter_execFPScmd();
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/CommandLineInterface/fps_getFPSargs.c b/src/CommandLineInterface/fps_getFPSargs.c
index 736bb98c..b1e17cdf 100644
--- a/src/CommandLineInterface/fps_getFPSargs.c
+++ b/src/CommandLineInterface/fps_getFPSargs.c
@@ -5,9 +5,6 @@
 
 #include "CommandLineInterface/CLIcore.h"
 
-
-
-
 /** @brief get FPS arguments from command line function call
  *
  * Write data.FPS_name and data.FPS_CMDCODE
@@ -17,9 +14,7 @@
  * Construct FPS_name from subsequent arguments
  *
  */
-errno_t function_parameter_getFPSargs_from_CLIfunc(
-    char     *fpsname_default
-)
+errno_t function_parameter_getFPSargs_from_CLIfunc(char *fpsname_default)
 {
     // Check if function will be executed through FPS interface
 
@@ -30,52 +25,51 @@ errno_t function_parameter_getFPSargs_from_CLIfunc(
     DEBUG_TRACEPOINT("pre-processing CLI arg");
 
     int argpreprocess = 1; // by default, pre-process argument
-    switch(data.cmdargtoken[1].type)
+    switch (data.cmdargtoken[1].type)
     {
-        case CLIARG_FLOAT:
-            argpreprocess = 0;
-            break;
+    case CLIARG_FLOAT:
+        argpreprocess = 0;
+        break;
 
-        case CLIARG_FLOAT32:
-            argpreprocess = 0;
-            break;
+    case CLIARG_FLOAT32:
+        argpreprocess = 0;
+        break;
 
-        case CLIARG_FLOAT64:
-            argpreprocess = 0;
-            break;
+    case CLIARG_FLOAT64:
+        argpreprocess = 0;
+        break;
 
-        case CLIARG_LONG:
-            argpreprocess = 0;
-            break;
+    case CLIARG_LONG:
+        argpreprocess = 0;
+        break;
 
-        case CLIARG_INT32:
-            argpreprocess = 0;
-            break;
+    case CLIARG_INT32:
+        argpreprocess = 0;
+        break;
 
-        case CLIARG_UINT32:
-            argpreprocess = 0;
-            break;
+    case CLIARG_UINT32:
+        argpreprocess = 0;
+        break;
 
-        case CLIARG_INT64:
-            argpreprocess = 0;
-            break;
+    case CLIARG_INT64:
+        argpreprocess = 0;
+        break;
 
-        case CLIARG_UINT64:
-            argpreprocess = 0;
-            break;
+    case CLIARG_UINT64:
+        argpreprocess = 0;
+        break;
     }
 
-    if(argpreprocess == 1)
+    if (argpreprocess == 1)
     {
         // modify function attribute
 
-        if(strcmp(data.cmdargtoken[1].val.string, "..procinfo") == 0)
+        if (strcmp(data.cmdargtoken[1].val.string, "..procinfo") == 0)
         {
-            if(data.cmdargtoken[2].val.numl == 0)
+            if (data.cmdargtoken[2].val.numl == 0)
             {
                 printf("Command %ld: updating PROCINFO mode OFF\n", data.cmdindex);
                 data.cmd[data.cmdindex].cmdsettings.flags &= ~CLICMDFLAG_PROCINFO;
-
             }
             else
             {
@@ -86,67 +80,58 @@ errno_t function_parameter_getFPSargs_from_CLIfunc(
             return RETURN_SUCCESS;
         }
 
-        if(strcmp(data.cmdargtoken[1].val.string, "..RTprio") == 0)
+        if (strcmp(data.cmdargtoken[1].val.string, "..RTprio") == 0)
         {
-            printf("Command %ld: updating RTprio to value %ld\n", data.cmdindex,
-                   data.cmdargtoken[2].val.numl);
-            data.cmd[data.cmdindex].cmdsettings.RT_priority =
-                data.cmdargtoken[2].val.numl;
+            printf("Command %ld: updating RTprio to value %ld\n", data.cmdindex, data.cmdargtoken[2].val.numl);
+            data.cmd[data.cmdindex].cmdsettings.RT_priority = data.cmdargtoken[2].val.numl;
             data.FPS_CMDCODE = FPSCMDCODE_IGNORE;
             return RETURN_SUCCESS;
         }
 
-        if(strcmp(data.cmdargtoken[1].val.string, "..loopcntMax") == 0)
+        if (strcmp(data.cmdargtoken[1].val.string, "..loopcntMax") == 0)
         {
-            printf("Command %ld: updating loopcntMax to value %ld\n", data.cmdindex,
-                   data.cmdargtoken[2].val.numl);
-            data.cmd[data.cmdindex].cmdsettings.procinfo_loopcntMax =
-                data.cmdargtoken[2].val.numl;
+            printf("Command %ld: updating loopcntMax to value %ld\n", data.cmdindex, data.cmdargtoken[2].val.numl);
+            data.cmd[data.cmdindex].cmdsettings.procinfo_loopcntMax = data.cmdargtoken[2].val.numl;
             data.FPS_CMDCODE = FPSCMDCODE_IGNORE;
             return RETURN_SUCCESS;
         }
 
-        if(strcmp(data.cmdargtoken[1].val.string, "..triggermode") == 0)
+        if (strcmp(data.cmdargtoken[1].val.string, "..triggermode") == 0)
         {
-            printf("Command %ld: updating triggermode to value %ld\n", data.cmdindex,
-                   data.cmdargtoken[2].val.numl);
-            data.cmd[data.cmdindex].cmdsettings.triggermode =
-                data.cmdargtoken[2].val.numl;
+            printf("Command %ld: updating triggermode to value %ld\n", data.cmdindex, data.cmdargtoken[2].val.numl);
+            data.cmd[data.cmdindex].cmdsettings.triggermode = data.cmdargtoken[2].val.numl;
             data.FPS_CMDCODE = FPSCMDCODE_IGNORE;
             return RETURN_SUCCESS;
         }
 
-
-        if(strcmp(data.cmdargtoken[1].val.string, "..triggersname") == 0)
+        if (strcmp(data.cmdargtoken[1].val.string, "..triggersname") == 0)
         {
             printf("Command %ld: updating triggerstreamname to value %s\n", data.cmdindex,
                    data.cmdargtoken[2].val.string);
-            strcpy(data.cmd[data.cmdindex].cmdsettings.triggerstreamname,
-                   data.cmdargtoken[2].val.string);
+            strcpy(data.cmd[data.cmdindex].cmdsettings.triggerstreamname, data.cmdargtoken[2].val.string);
             data.FPS_CMDCODE = FPSCMDCODE_IGNORE;
             return RETURN_SUCCESS;
         }
 
-
-        if(strcmp(data.cmdargtoken[1].val.string, "..triggerdelay") == 0)
+        if (strcmp(data.cmdargtoken[1].val.string, "..triggerdelay") == 0)
         {
             double x = 0.0;
-            switch(data.cmdargtoken[2].type)
+            switch (data.cmdargtoken[2].type)
             {
-                case CMDARGTOKEN_TYPE_FLOAT :
-                    x = data.cmdargtoken[2].val.numf;
-                    break;
+            case CMDARGTOKEN_TYPE_FLOAT:
+                x = data.cmdargtoken[2].val.numf;
+                break;
 
-                case CMDARGTOKEN_TYPE_LONG :
-                    x = data.cmdargtoken[2].val.numl;
-                    break;
+            case CMDARGTOKEN_TYPE_LONG:
+                x = data.cmdargtoken[2].val.numl;
+                break;
 
-                default :
-                    printf("wrong argument type, should be float or int -> setting to zero\n");
+            default:
+                printf("wrong argument type, should be float or int -> setting to zero\n");
             }
             printf("Command %ld: updating triggerdelay to value %f\n", data.cmdindex, x);
             x += 0.5e-9;
-            long x_sec = (long) x;
+            long x_sec = (long)x;
             long x_nsec = (x - x_sec) * 1000000000L;
 
             data.cmd[data.cmdindex].cmdsettings.triggerdelay.tv_sec = x_sec;
@@ -155,13 +140,12 @@ errno_t function_parameter_getFPSargs_from_CLIfunc(
             return RETURN_SUCCESS;
         }
 
-        if(strcmp(data.cmdargtoken[1].val.string, "..triggertimeout") == 0)
+        if (strcmp(data.cmdargtoken[1].val.string, "..triggertimeout") == 0)
         {
-            printf("Command %ld: updating triggertimeout to value %f\n", data.cmdindex,
-                   data.cmdargtoken[2].val.numf);
+            printf("Command %ld: updating triggertimeout to value %f\n", data.cmdindex, data.cmdargtoken[2].val.numf);
             double x = data.cmdargtoken[2].val.numf;
             x += 0.5e-9;
-            long x_sec = (long) x;
+            long x_sec = (long)x;
             long x_nsec = (x - x_sec) * 1000000000L;
 
             data.cmd[data.cmdindex].cmdsettings.triggertimeout.tv_sec = x_sec;
@@ -170,117 +154,104 @@ errno_t function_parameter_getFPSargs_from_CLIfunc(
             return RETURN_SUCCESS;
         }
 
-
-
         // check that first arg is a string
         // if it isn't, the non-FPS implementation should be called
 
         // check if recognized FPSCMDCODE
-        if(strcmp(data.cmdargtoken[1].val.string,
-                  "_FPSINIT_") == 0)    // Initialize FPS
+        if (strcmp(data.cmdargtoken[1].val.string,
+                   "_FPSINIT_") == 0) // Initialize FPS
         {
             data.FPS_CMDCODE = FPSCMDCODE_FPSINIT;
         }
-        else if(strcmp(data.cmdargtoken[1].val.string,
-                       "_CONFSTART_") == 0)     // Start conf process
+        else if (strcmp(data.cmdargtoken[1].val.string,
+                        "_CONFSTART_") == 0) // Start conf process
         {
             data.FPS_CMDCODE = FPSCMDCODE_CONFSTART;
         }
-        else if(strcmp(data.cmdargtoken[1].val.string,
-                       "_CONFSTOP_") == 0)   // Stop conf process
+        else if (strcmp(data.cmdargtoken[1].val.string,
+                        "_CONFSTOP_") == 0) // Stop conf process
         {
             data.FPS_CMDCODE = FPSCMDCODE_CONFSTOP;
         }
-        else if(strcmp(data.cmdargtoken[1].val.string,
-                       "_RUNSTART_") == 0)   // Run process
+        else if (strcmp(data.cmdargtoken[1].val.string,
+                        "_RUNSTART_") == 0) // Run process
         {
             data.FPS_CMDCODE = FPSCMDCODE_RUNSTART;
         }
-        else if(strcmp(data.cmdargtoken[1].val.string,
-                       "_RUNSTOP_") == 0)   // Stop process
+        else if (strcmp(data.cmdargtoken[1].val.string,
+                        "_RUNSTOP_") == 0) // Stop process
         {
             data.FPS_CMDCODE = FPSCMDCODE_RUNSTOP;
         }
-        else if(strcmp(data.cmdargtoken[1].val.string,
-                       "_TMUXSTART_") == 0)   // Start tmux session
+        else if (strcmp(data.cmdargtoken[1].val.string,
+                        "_TMUXSTART_") == 0) // Start tmux session
         {
             data.FPS_CMDCODE = FPSCMDCODE_TMUXSTART;
         }
-        else if(strcmp(data.cmdargtoken[1].val.string,
-                       "_TMUXSTOP_") == 0)   // Stop tmux session
+        else if (strcmp(data.cmdargtoken[1].val.string,
+                        "_TMUXSTOP_") == 0) // Stop tmux session
         {
             data.FPS_CMDCODE = FPSCMDCODE_TMUXSTOP;
         }
     }
 
-
     // if recognized FPSCMDCODE, use FPS implementation
-    if((data.FPS_CMDCODE != 0) && (data.FPS_CMDCODE != FPSCMDCODE_IGNORE))
+    if ((data.FPS_CMDCODE != 0) && (data.FPS_CMDCODE != FPSCMDCODE_IGNORE))
     {
         // ===============================
         //     SET FPS INTERFACE NAME
         // ===============================
 
         // if main CLI process has been named with -n option, then use the process name to construct fpsname
-        if(data.processnameflag == 1)
+        if (data.processnameflag == 1)
         {
             // Automatically set fps name to be process name up to first instance of character '.'
             strcpy(data.FPS_name, data.processname0);
         }
-        else   // otherwise, construct name as follows
+        else // otherwise, construct name as follows
         {
             // Adopt default name for fpsname
-            int slen = snprintf(data.FPS_name,
-                                FUNCTION_PARAMETER_STRMAXLEN,
-                                "%s",
-                                fpsname_default);
-            if(slen < 1)
+            int slen = snprintf(data.FPS_name, FUNCTION_PARAMETER_STRMAXLEN, "%s", fpsname_default);
+            if (slen < 1)
             {
                 PRINT_ERROR("snprintf wrote <1 char");
                 abort(); // can't handle this error any other way
             }
-            if(slen >= FUNCTION_PARAMETER_STRMAXLEN)
+            if (slen >= FUNCTION_PARAMETER_STRMAXLEN)
             {
                 PRINT_ERROR("snprintf string truncation.\n"
                             "Full string  : %s\n"
                             "Truncated to : %s",
-                            fpsname_default,
-                            data.FPS_name);
+                            fpsname_default, data.FPS_name);
                 abort(); // can't handle this error any other way
             }
 
-
             // By convention, if there are optional arguments,
             // they should be appended to the default fps name
             //
             int argindex = 2; // start at arg #2
-            while(strlen(data.cmdargtoken[argindex].val.string) > 0)
+            while (strlen(data.cmdargtoken[argindex].val.string) > 0)
             {
                 char fpsname1[FUNCTION_PARAMETER_STRMAXLEN];
 
-                int slen = snprintf(fpsname1,
-                                    FUNCTION_PARAMETER_STRMAXLEN,
-                                    "%s-%s",
-                                    data.FPS_name,
+                int slen = snprintf(fpsname1, FUNCTION_PARAMETER_STRMAXLEN, "%s-%s", data.FPS_name,
                                     data.cmdargtoken[argindex].val.string);
-                if(slen < 1)
+                if (slen < 1)
                 {
                     PRINT_ERROR("snprintf wrote <1 char");
                     abort(); // can't handle this error any other way
                 }
-                if(slen >= FUNCTION_PARAMETER_STRMAXLEN)
+                if (slen >= FUNCTION_PARAMETER_STRMAXLEN)
                 {
                     PRINT_ERROR("snprintf string truncation.\n"
                                 "Full string  : %s-%s\n"
                                 "Truncated to : %s",
-                                data.FPS_name,
-                                data.cmdargtoken[argindex].val.string,
-                                fpsname1);
+                                data.FPS_name, data.cmdargtoken[argindex].val.string, fpsname1);
                     abort(); // can't handle this error any other way
                 }
 
                 strncpy(data.FPS_name, fpsname1, FUNCTION_PARAMETER_STRMAXLEN - 1);
-                argindex ++;
+                argindex++;
             }
         }
         //printf(">>>>> %s >>>>>>> FPS name : %s\n", fpsname_default, data.FPS_name);
diff --git a/src/CommandLineInterface/fps_getFPSargs.h b/src/CommandLineInterface/fps_getFPSargs.h
index ba635581..22a5a443 100644
--- a/src/CommandLineInterface/fps_getFPSargs.h
+++ b/src/CommandLineInterface/fps_getFPSargs.h
@@ -6,8 +6,6 @@
 #ifndef FPS_GETFPSARGS_H
 #define FPS_GETFPSARGS_H
 
-errno_t function_parameter_getFPSargs_from_CLIfunc(
-    char     *fpsname_default
-);
+errno_t function_parameter_getFPSargs_from_CLIfunc(char *fpsname_default);
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/CommandLineInterface/fps_load.c b/src/CommandLineInterface/fps_load.c
index f74bd022..e3e29491 100644
--- a/src/CommandLineInterface/fps_load.c
+++ b/src/CommandLineInterface/fps_load.c
@@ -3,40 +3,31 @@
  * @brief   Load FPS
  */
 
-
-
-#include "CommandLineInterface/CLIcore.h"
 #include "COREMOD_memory/COREMOD_memory.h"
+#include "CommandLineInterface/CLIcore.h"
 
 #include "fps_connect.h"
 
-
-
-long function_parameter_structure_load(
-    char *fpsname
-)
+long function_parameter_structure_load(char *fpsname)
 {
     long fpsID;
 
-
     DEBUG_TRACEPOINT("loading FPS %s", fpsname);
 
     fpsID = fps_ID(fpsname);
 
-
-    if(fpsID == -1)
+    if (fpsID == -1)
     {
         // not found, searching
 
-
         // next fpsID available
         fpsID = 0;
 
         int foundflag = 0;
 
-        while((foundflag == 0) && (fpsID < data.NB_MAX_FPS))
+        while ((foundflag == 0) && (fpsID < data.NB_MAX_FPS))
         {
-            if(data.fpsarray[fpsID].SMfd < 0)
+            if (data.fpsarray[fpsID].SMfd < 0)
             {
                 foundflag = 1;
             }
@@ -46,11 +37,11 @@ long function_parameter_structure_load(
             }
         }
 
-        if(foundflag == 1)
+        if (foundflag == 1)
         {
-            data.fpsarray[fpsID].NBparam = function_parameter_struct_connect(fpsname,
-                                      &data.fpsarray[fpsID], FPSCONNECT_SIMPLE);
-            if(data.fpsarray[fpsID].NBparam < 1)
+            data.fpsarray[fpsID].NBparam =
+                function_parameter_struct_connect(fpsname, &data.fpsarray[fpsID], FPSCONNECT_SIMPLE);
+            if (data.fpsarray[fpsID].NBparam < 1)
             {
                 printf("--- cannot load FPS %s\n", fpsname);
                 fpsID = -1;
@@ -72,4 +63,3 @@ long function_parameter_structure_load(
 
     return fpsID;
 }
-
diff --git a/src/CommandLineInterface/fps_load.h b/src/CommandLineInterface/fps_load.h
index 53b01282..ec266b7b 100644
--- a/src/CommandLineInterface/fps_load.h
+++ b/src/CommandLineInterface/fps_load.h
@@ -6,8 +6,6 @@
 #ifndef FPS_LOAD_H
 #define FPS_LOAD_H
 
-long function_parameter_structure_load(
-	char *fpsname
-);
+long function_parameter_structure_load(char *fpsname);
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/CommandLineInterface/fps_loadstream.c b/src/CommandLineInterface/fps_loadstream.c
index 3057e99c..6d9f1cf4 100644
--- a/src/CommandLineInterface/fps_loadstream.c
+++ b/src/CommandLineInterface/fps_loadstream.c
@@ -3,35 +3,26 @@
  * @brief   Load image stream
  */
 
-
 #include "CommandLineInterface/CLIcore.h"
 
 #include "COREMOD_iofits/COREMOD_iofits.h"
 
-
-imageID functionparameter_LoadStream(
-    FUNCTION_PARAMETER_STRUCT *fps,
-    int                        pindex,
-    int                        fpsconnectmode
-)
+imageID functionparameter_LoadStream(FUNCTION_PARAMETER_STRUCT *fps, int pindex, int fpsconnectmode)
 {
     imageID ID = -1;
-    uint32_t     imLOC;
-
-
-    printf("\n\n====================== Loading stream \"%s\" = %s\n",
-           fps->parray[pindex].keywordfull, fps->parray[pindex].val.string[0]);
+    uint32_t imLOC;
 
-    ID = COREMOD_IOFITS_LoadMemStream(fps->parray[pindex].val.string[0],
-                                      &(fps->parray[pindex].fpflag), &imLOC);
+    printf("\n\n====================== Loading stream \"%s\" = %s\n", fps->parray[pindex].keywordfull,
+           fps->parray[pindex].val.string[0]);
 
+    ID = COREMOD_IOFITS_LoadMemStream(fps->parray[pindex].val.string[0], &(fps->parray[pindex].fpflag), &imLOC);
 
-    if(fpsconnectmode == FPSCONNECT_CONF)
+    if (fpsconnectmode == FPSCONNECT_CONF)
     {
-        if(fps->parray[pindex].fpflag & FPFLAG_STREAM_CONF_REQUIRED)
+        if (fps->parray[pindex].fpflag & FPFLAG_STREAM_CONF_REQUIRED)
         {
             printf("    FPFLAG_STREAM_CONF_REQUIRED\n");
-            if(ID == -1)
+            if (ID == -1)
             {
                 printf("FAILURE: FPSCONNECT_CONF Required stream %s could not be loaded\n",
                        fps->parray[pindex].val.string[0]);
@@ -40,12 +31,12 @@ imageID functionparameter_LoadStream(
         }
     }
 
-    if(fpsconnectmode == FPSCONNECT_RUN)
+    if (fpsconnectmode == FPSCONNECT_RUN)
     {
-        if(fps->parray[pindex].fpflag & FPFLAG_STREAM_RUN_REQUIRED)
+        if (fps->parray[pindex].fpflag & FPFLAG_STREAM_RUN_REQUIRED)
         {
             printf("    FPFLAG_STREAM_RUN_REQUIRED\n");
-            if(ID == -1)
+            if (ID == -1)
             {
                 printf("FAILURE: FPSCONNECT_RUN Required stream %s could not be loaded\n",
                        fps->parray[pindex].val.string[0]);
@@ -54,10 +45,7 @@ imageID functionparameter_LoadStream(
         }
     }
 
-
     // TODO: Add testing for fps
 
-
-
     return ID;
 }
diff --git a/src/CommandLineInterface/fps_loadstream.h b/src/CommandLineInterface/fps_loadstream.h
index 7294fe0f..181785b1 100644
--- a/src/CommandLineInterface/fps_loadstream.h
+++ b/src/CommandLineInterface/fps_loadstream.h
@@ -8,10 +8,6 @@
 
 #include "function_parameters.h"
 
-imageID functionparameter_LoadStream(
-    FUNCTION_PARAMETER_STRUCT *fps,
-    int                        pindex,
-    int                        fpsconnectmode
-);
+imageID functionparameter_LoadStream(FUNCTION_PARAMETER_STRUCT *fps, int pindex, int fpsconnectmode);
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/CommandLineInterface/fps_outlog.c b/src/CommandLineInterface/fps_outlog.c
index 38c83778..7092ee08 100644
--- a/src/CommandLineInterface/fps_outlog.c
+++ b/src/CommandLineInterface/fps_outlog.c
@@ -3,17 +3,11 @@
  * @brief   output log functions for FPS
  */
 
-
 #include <stdarg.h>
 #include <unistd.h> // access()
 
 #include "CommandLineInterface/CLIcore.h"
 
-
-
-
-
-
 /** @brief Get FPS log filename
  *
  * logfname should be char [STRINGMAXLEN_FULLFILENAME]
@@ -24,22 +18,13 @@ errno_t getFPSlogfname(char *logfname)
     char shmdname[STRINGMAXLEN_SHMDIRNAME];
     function_parameter_struct_shmdirname(shmdname);
 
-    WRITE_FULLFILENAME(logfname, "%s/fpslog.%ld.%07d.%s", shmdname,
-                       data.FPS_TIMESTAMP, getpid(), data.FPS_PROCESS_TYPE);
+    WRITE_FULLFILENAME(logfname, "%s/fpslog.%ld.%07d.%s", shmdname, data.FPS_TIMESTAMP, getpid(),
+                       data.FPS_PROCESS_TYPE);
 
     return RETURN_SUCCESS;
 }
 
-
-
-
-
-
-errno_t functionparameter_outlog_file(
-    char *keyw,
-    char *msgstring,
-    FILE *fpout
-)
+errno_t functionparameter_outlog_file(char *keyw, char *msgstring, FILE *fpout)
 {
     // Get GMT time
     struct timespec tnow;
@@ -51,16 +36,8 @@ errno_t functionparameter_outlog_file(
     uttime = gmtime(&now);
 
     char timestring[30];
-    sprintf(
-        timestring,
-        "%04d%02d%02dT%02d%02d%02d.%09ld",
-        1900 + uttime->tm_year,
-        1 + uttime->tm_mon,
-        uttime->tm_mday,
-        uttime->tm_hour,
-        uttime->tm_min,
-        uttime->tm_sec,
-        tnow.tv_nsec);
+    sprintf(timestring, "%04d%02d%02dT%02d%02d%02d.%09ld", 1900 + uttime->tm_year, 1 + uttime->tm_mon, uttime->tm_mday,
+            uttime->tm_hour, uttime->tm_min, uttime->tm_sec, tnow.tv_nsec);
 
     fprintf(fpout, "%s %-12s %s\n", timestring, keyw, msgstring);
     fflush(fpout);
@@ -68,13 +45,6 @@ errno_t functionparameter_outlog_file(
     return RETURN_SUCCESS;
 }
 
-
-
-
-
-
-
-
 /**
  * @brief Add log entry to fps log
  *
@@ -83,10 +53,7 @@ errno_t functionparameter_outlog_file(
  * @param ...      Parameters
  * @return errno_t Error code
  */
-errno_t functionparameter_outlog(
-    char *keyw,
-    const char *fmt, ...
-)
+errno_t functionparameter_outlog(char *keyw, const char *fmt, ...)
 {
     // identify logfile and open file
 
@@ -94,12 +61,12 @@ errno_t functionparameter_outlog(
     static FILE *fpout;
     static char logfname[STRINGMAXLEN_FULLFILENAME];
 
-    if(LogOutOpen == 0)   // file not open
+    if (LogOutOpen == 0) // file not open
     {
         getFPSlogfname(logfname);
 
         fpout = fopen(logfname, "a");
-        if(fpout == NULL)
+        if (fpout == NULL)
         {
             printf("ERROR: cannot open file\n");
             exit(EXIT_FAILURE);
@@ -107,7 +74,6 @@ errno_t functionparameter_outlog(
         LogOutOpen = 1;
     }
 
-
     // Get GMT time and create timestring
 
     struct timespec tnow;
@@ -119,18 +85,8 @@ errno_t functionparameter_outlog(
     uttime = gmtime(&now);
 
     char timestring[30];
-    sprintf(
-        timestring,
-        "%04d%02d%02dT%02d%02d%02d.%09ld",
-        1900 + uttime->tm_year,
-        1 + uttime->tm_mon,
-        uttime->tm_mday,
-        uttime->tm_hour,
-        uttime->tm_min,
-        uttime->tm_sec,
-        tnow.tv_nsec);
-
-
+    sprintf(timestring, "%04d%02d%02dT%02d%02d%02d.%09ld", 1900 + uttime->tm_year, 1 + uttime->tm_mon, uttime->tm_mday,
+            uttime->tm_hour, uttime->tm_min, uttime->tm_sec, tnow.tv_nsec);
 
     fprintf(fpout, "%s %-12s ", timestring, keyw);
 
@@ -145,13 +101,12 @@ errno_t functionparameter_outlog(
 
     va_end(args);
 
-
-    if(strcmp(keyw, "LOGFILECLOSE") == 0)
+    if (strcmp(keyw, "LOGFILECLOSE") == 0)
     {
         // Normal exit
         // close log file and remove it from filesystem
 
-        if(LogOutOpen == 1)
+        if (LogOutOpen == 1)
         {
             fclose(fpout);
             LogOutOpen = 0;
@@ -162,10 +117,6 @@ errno_t functionparameter_outlog(
     return RETURN_SUCCESS;
 }
 
-
-
-
-
 /** @brief Establish sym link for convenience
  *
  * This is a one-time function when running FPS init.\n
@@ -179,29 +130,21 @@ errno_t functionparameter_outlog_namelink()
     char logfname[STRINGMAXLEN_FULLFILENAME];
     getFPSlogfname(logfname);
 
-
     char linkfname[STRINGMAXLEN_FULLFILENAME];
-    WRITE_FULLFILENAME(linkfname, "%s/fpslog.%s", shmdname,
-                       data.FPS_PROCESS_TYPE);
+    WRITE_FULLFILENAME(linkfname, "%s/fpslog.%s", shmdname, data.FPS_PROCESS_TYPE);
 
-    if(access(linkfname, F_OK) == 0) // link already exists, remove
+    if (access(linkfname, F_OK) == 0) // link already exists, remove
     {
         printf("outlog file %s exists -> updating symlink\n", linkfname);
         remove(linkfname);
     }
 
-
-    if(symlink(logfname, linkfname) == -1)
+    if (symlink(logfname, linkfname) == -1)
     {
         int errnum = errno;
         fprintf(stderr, "Error symlink: %s\n", strerror(errnum));
         PRINT_ERROR("symlink error %s %s", logfname, linkfname);
     }
 
-
-
     return RETURN_SUCCESS;
 }
-
-
-
diff --git a/src/CommandLineInterface/fps_outlog.h b/src/CommandLineInterface/fps_outlog.h
index e469a793..ac2ff36a 100644
--- a/src/CommandLineInterface/fps_outlog.h
+++ b/src/CommandLineInterface/fps_outlog.h
@@ -14,4 +14,4 @@ errno_t functionparameter_outlog(char *keyw, const char *fmt, ...);
 
 errno_t functionparameter_outlog_namelink();
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/CommandLineInterface/fps_paramvalue.c b/src/CommandLineInterface/fps_paramvalue.c
index b826271d..7202d248 100644
--- a/src/CommandLineInterface/fps_paramvalue.c
+++ b/src/CommandLineInterface/fps_paramvalue.c
@@ -3,29 +3,18 @@
  * @brief   set and get parameter values
  */
 
-
-
 #include "CommandLineInterface/CLIcore.h"
 
-
+#include "fps_GetParamIndex.h"
 #include "fps_connect.h"
 #include "fps_disconnect.h"
 #include "fps_paramvalue.h"
-#include "fps_GetParamIndex.h"
-
-
-
-
 
 /**
  * @brief  Get pointer to value and FPS index
  *
  */
-int64_t *functionparameter_GetParamPtr_generic(
-    FUNCTION_PARAMETER_STRUCT *fps,
-    const char *paramname,
-    long *paramindex
-)
+int64_t *functionparameter_GetParamPtr_generic(FUNCTION_PARAMETER_STRUCT *fps, const char *paramname, long *paramindex)
 {
     int64_t *ptr;
 
@@ -34,7 +23,7 @@ int64_t *functionparameter_GetParamPtr_generic(
     // type is arbitrary
     ptr = &fps->parray[fpsi].val.i64[0];
 
-    if(paramindex != NULL)
+    if (paramindex != NULL)
     {
         *paramindex = fpsi;
     }
@@ -42,23 +31,9 @@ int64_t *functionparameter_GetParamPtr_generic(
     return ptr;
 }
 
-
-
-
-
-
-
-
-
-
-
 // INT64
 
-
-int64_t functionparameter_GetParamValue_INT64(
-    FUNCTION_PARAMETER_STRUCT *fps,
-    const char *paramname
-)
+int64_t functionparameter_GetParamValue_INT64(FUNCTION_PARAMETER_STRUCT *fps, const char *paramname)
 {
     int64_t value;
 
@@ -69,12 +44,7 @@ int64_t functionparameter_GetParamValue_INT64(
     return value;
 }
 
-
-errno_t functionparameter_SetParamValue_INT64(
-    FUNCTION_PARAMETER_STRUCT *fps,
-    const char *paramname,
-    int64_t value
-)
+errno_t functionparameter_SetParamValue_INT64(FUNCTION_PARAMETER_STRUCT *fps, const char *paramname, int64_t value)
 {
     int fpsi = functionparameter_GetParamIndex(fps, paramname);
     fps->parray[fpsi].val.i64[0] = value;
@@ -83,29 +53,22 @@ errno_t functionparameter_SetParamValue_INT64(
     return EXIT_SUCCESS;
 }
 
-
 //
 // stand-alone function to set parameter value
 //
-errno_t function_parameter_SetValue_int64(
-    char *keywordfull,
-    int64_t val
-)
+errno_t function_parameter_SetValue_int64(char *keywordfull, int64_t val)
 {
     FUNCTION_PARAMETER_STRUCT fps;
-    char tmpstring[FUNCTION_PARAMETER_KEYWORD_STRMAXLEN *
-                                                        FUNCTION_PARAMETER_KEYWORD_MAXLEVEL];
+    char tmpstring[FUNCTION_PARAMETER_KEYWORD_STRMAXLEN * FUNCTION_PARAMETER_KEYWORD_MAXLEVEL];
     char keyword[FUNCTION_PARAMETER_KEYWORD_MAXLEVEL][FUNCTION_PARAMETER_KEYWORD_STRMAXLEN];
     int keywordlevel = 0;
     char *pch;
 
-
     // break full keyword into keywords
-    strncpy(tmpstring, keywordfull,
-            FUNCTION_PARAMETER_KEYWORD_STRMAXLEN * FUNCTION_PARAMETER_KEYWORD_MAXLEVEL - 1);
+    strncpy(tmpstring, keywordfull, FUNCTION_PARAMETER_KEYWORD_STRMAXLEN * FUNCTION_PARAMETER_KEYWORD_MAXLEVEL - 1);
     keywordlevel = 0;
     pch = strtok(tmpstring, ".");
-    while(pch != NULL)
+    while (pch != NULL)
     {
         strncpy(keyword[keywordlevel], pch, FUNCTION_PARAMETER_KEYWORD_STRMAXLEN - 1);
         keywordlevel++;
@@ -116,7 +79,6 @@ errno_t function_parameter_SetValue_int64(
 
     int pindex = functionparameter_GetParamIndex(&fps, keywordfull);
 
-
     fps.parray[pindex].val.i64[0] = val;
 
     function_parameter_struct_disconnect(&fps);
@@ -124,11 +86,7 @@ errno_t function_parameter_SetValue_int64(
     return RETURN_SUCCESS;
 }
 
-
-int64_t *functionparameter_GetParamPtr_INT64(
-    FUNCTION_PARAMETER_STRUCT *fps,
-    const char *paramname
-)
+int64_t *functionparameter_GetParamPtr_INT64(FUNCTION_PARAMETER_STRUCT *fps, const char *paramname)
 {
     int64_t *ptr;
 
@@ -138,19 +96,7 @@ int64_t *functionparameter_GetParamPtr_INT64(
     return ptr;
 }
 
-
-
-
-
-
-
-
-
-
-uint64_t functionparameter_GetParamValue_UINT64(
-    FUNCTION_PARAMETER_STRUCT *fps,
-    const char *paramname
-)
+uint64_t functionparameter_GetParamValue_UINT64(FUNCTION_PARAMETER_STRUCT *fps, const char *paramname)
 {
     uint64_t value;
 
@@ -161,12 +107,7 @@ uint64_t functionparameter_GetParamValue_UINT64(
     return value;
 }
 
-
-errno_t functionparameter_SetParamValue_UINT64(
-    FUNCTION_PARAMETER_STRUCT *fps,
-    const char *paramname,
-    uint64_t value
-)
+errno_t functionparameter_SetParamValue_UINT64(FUNCTION_PARAMETER_STRUCT *fps, const char *paramname, uint64_t value)
 {
     int fpsi = functionparameter_GetParamIndex(fps, paramname);
     fps->parray[fpsi].val.ui64[0] = value;
@@ -175,11 +116,7 @@ errno_t functionparameter_SetParamValue_UINT64(
     return EXIT_SUCCESS;
 }
 
-
-uint64_t *functionparameter_GetParamPtr_UINT64(
-    FUNCTION_PARAMETER_STRUCT *fps,
-    const char *paramname
-)
+uint64_t *functionparameter_GetParamPtr_UINT64(FUNCTION_PARAMETER_STRUCT *fps, const char *paramname)
 {
     uint64_t *ptr;
 
@@ -189,21 +126,7 @@ uint64_t *functionparameter_GetParamPtr_UINT64(
     return ptr;
 }
 
-
-
-
-
-
-
-
-
-
-
-
-int32_t functionparameter_GetParamValue_INT32(
-    FUNCTION_PARAMETER_STRUCT *fps,
-    const char *paramname
-)
+int32_t functionparameter_GetParamValue_INT32(FUNCTION_PARAMETER_STRUCT *fps, const char *paramname)
 {
     int32_t value;
 
@@ -214,12 +137,7 @@ int32_t functionparameter_GetParamValue_INT32(
     return value;
 }
 
-
-errno_t functionparameter_SetParamValue_INT32(
-    FUNCTION_PARAMETER_STRUCT *fps,
-    const char *paramname,
-    int32_t value
-)
+errno_t functionparameter_SetParamValue_INT32(FUNCTION_PARAMETER_STRUCT *fps, const char *paramname, int32_t value)
 {
     int fpsi = functionparameter_GetParamIndex(fps, paramname);
     fps->parray[fpsi].val.i32[0] = value;
@@ -228,11 +146,7 @@ errno_t functionparameter_SetParamValue_INT32(
     return EXIT_SUCCESS;
 }
 
-
-int32_t *functionparameter_GetParamPtr_INT32(
-    FUNCTION_PARAMETER_STRUCT *fps,
-    const char *paramname
-)
+int32_t *functionparameter_GetParamPtr_INT32(FUNCTION_PARAMETER_STRUCT *fps, const char *paramname)
 {
     int32_t *ptr;
 
@@ -242,25 +156,7 @@ int32_t *functionparameter_GetParamPtr_INT32(
     return ptr;
 }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-uint32_t functionparameter_GetParamValue_UINT32(
-    FUNCTION_PARAMETER_STRUCT *fps,
-    const char *paramname
-)
+uint32_t functionparameter_GetParamValue_UINT32(FUNCTION_PARAMETER_STRUCT *fps, const char *paramname)
 {
     long value;
 
@@ -271,12 +167,7 @@ uint32_t functionparameter_GetParamValue_UINT32(
     return value;
 }
 
-
-errno_t functionparameter_SetParamValue_UINT32(
-    FUNCTION_PARAMETER_STRUCT *fps,
-    const char *paramname,
-    uint32_t value
-)
+errno_t functionparameter_SetParamValue_UINT32(FUNCTION_PARAMETER_STRUCT *fps, const char *paramname, uint32_t value)
 {
     int fpsi = functionparameter_GetParamIndex(fps, paramname);
     fps->parray[fpsi].val.ui32[0] = value;
@@ -285,11 +176,7 @@ errno_t functionparameter_SetParamValue_UINT32(
     return EXIT_SUCCESS;
 }
 
-
-uint32_t *functionparameter_GetParamPtr_UINT32(
-    FUNCTION_PARAMETER_STRUCT *fps,
-    const char *paramname
-)
+uint32_t *functionparameter_GetParamPtr_UINT32(FUNCTION_PARAMETER_STRUCT *fps, const char *paramname)
 {
     uint32_t *ptr;
 
@@ -299,22 +186,7 @@ uint32_t *functionparameter_GetParamPtr_UINT32(
     return ptr;
 }
 
-
-
-
-
-
-
-
-
-
-
-
-
-double functionparameter_GetParamValue_FLOAT64(
-    FUNCTION_PARAMETER_STRUCT *fps,
-    const char *paramname
-)
+double functionparameter_GetParamValue_FLOAT64(FUNCTION_PARAMETER_STRUCT *fps, const char *paramname)
 {
     double value;
 
@@ -325,11 +197,7 @@ double functionparameter_GetParamValue_FLOAT64(
     return value;
 }
 
-errno_t functionparameter_SetParamValue_FLOAT64(
-    FUNCTION_PARAMETER_STRUCT *fps,
-    const char *paramname,
-    double value
-)
+errno_t functionparameter_SetParamValue_FLOAT64(FUNCTION_PARAMETER_STRUCT *fps, const char *paramname, double value)
 {
     int fpsi = functionparameter_GetParamIndex(fps, paramname);
     fps->parray[fpsi].val.f64[0] = value;
@@ -338,11 +206,7 @@ errno_t functionparameter_SetParamValue_FLOAT64(
     return EXIT_SUCCESS;
 }
 
-
-double *functionparameter_GetParamPtr_FLOAT64(
-    FUNCTION_PARAMETER_STRUCT *fps,
-    const char *paramname
-)
+double *functionparameter_GetParamPtr_FLOAT64(FUNCTION_PARAMETER_STRUCT *fps, const char *paramname)
 {
     double *ptr;
 
@@ -352,18 +216,7 @@ double *functionparameter_GetParamPtr_FLOAT64(
     return ptr;
 }
 
-
-
-
-
-
-
-
-
-float functionparameter_GetParamValue_FLOAT32(
-    FUNCTION_PARAMETER_STRUCT *fps,
-    const char *paramname
-)
+float functionparameter_GetParamValue_FLOAT32(FUNCTION_PARAMETER_STRUCT *fps, const char *paramname)
 {
     float value;
 
@@ -374,11 +227,7 @@ float functionparameter_GetParamValue_FLOAT32(
     return value;
 }
 
-int functionparameter_SetParamValue_FLOAT32(
-    FUNCTION_PARAMETER_STRUCT *fps,
-    const char *paramname,
-    float value
-)
+int functionparameter_SetParamValue_FLOAT32(FUNCTION_PARAMETER_STRUCT *fps, const char *paramname, float value)
 {
     int fpsi = functionparameter_GetParamIndex(fps, paramname);
     fps->parray[fpsi].val.f32[0] = value;
@@ -387,10 +236,7 @@ int functionparameter_SetParamValue_FLOAT32(
     return EXIT_SUCCESS;
 }
 
-float *functionparameter_GetParamPtr_FLOAT32(
-    FUNCTION_PARAMETER_STRUCT *fps,
-    const char *paramname
-)
+float *functionparameter_GetParamPtr_FLOAT32(FUNCTION_PARAMETER_STRUCT *fps, const char *paramname)
 {
     float *ptr;
 
@@ -400,18 +246,7 @@ float *functionparameter_GetParamPtr_FLOAT32(
     return ptr;
 }
 
-
-
-
-
-
-
-
-
-float functionparameter_GetParamValue_TIMESPEC(
-    FUNCTION_PARAMETER_STRUCT *fps,
-    const char *paramname
-)
+float functionparameter_GetParamValue_TIMESPEC(FUNCTION_PARAMETER_STRUCT *fps, const char *paramname)
 {
     long value_sec;
     long value_nsec;
@@ -426,15 +261,11 @@ float functionparameter_GetParamValue_TIMESPEC(
     return value;
 }
 
-int functionparameter_SetParamValue_TIMESPEC(
-    FUNCTION_PARAMETER_STRUCT *fps,
-    const char *paramname,
-    float value
-)
+int functionparameter_SetParamValue_TIMESPEC(FUNCTION_PARAMETER_STRUCT *fps, const char *paramname, float value)
 {
     int fpsi = functionparameter_GetParamIndex(fps, paramname);
 
-    long valuesec = (long) value;
+    long valuesec = (long)value;
     long valuensec = (long)(1.0e9 * (value - valuesec));
     fps->parray[fpsi].val.ts[0].tv_sec = valuesec;
     fps->parray[fpsi].val.ts[0].tv_nsec = valuensec;
@@ -444,10 +275,7 @@ int functionparameter_SetParamValue_TIMESPEC(
     return EXIT_SUCCESS;
 }
 
-struct timespec *functionparameter_GetParamPtr_TIMESPEC(
-    FUNCTION_PARAMETER_STRUCT *fps,
-    const char *paramname
-)
+struct timespec *functionparameter_GetParamPtr_TIMESPEC(FUNCTION_PARAMETER_STRUCT *fps, const char *paramname)
 {
     struct timespec *ptr;
 
@@ -457,48 +285,28 @@ struct timespec *functionparameter_GetParamPtr_TIMESPEC(
     return ptr;
 }
 
-
-
-
-
-
-
-
-char *functionparameter_GetParamPtr_STRING(
-    FUNCTION_PARAMETER_STRUCT *fps,
-    const char *paramname
-)
+char *functionparameter_GetParamPtr_STRING(FUNCTION_PARAMETER_STRUCT *fps, const char *paramname)
 {
     int fpsi = functionparameter_GetParamIndex(fps, paramname);
     return fps->parray[fpsi].val.string[0];
 }
 
-int functionparameter_SetParamValue_STRING(
-    FUNCTION_PARAMETER_STRUCT *fps,
-    const char *paramname,
-    const char *stringvalue
-)
+int functionparameter_SetParamValue_STRING(FUNCTION_PARAMETER_STRUCT *fps, const char *paramname,
+                                           const char *stringvalue)
 {
     int fpsi = functionparameter_GetParamIndex(fps, paramname);
 
-    strncpy(fps->parray[fpsi].val.string[0], stringvalue,
-            FUNCTION_PARAMETER_STRMAXLEN - 1);
+    strncpy(fps->parray[fpsi].val.string[0], stringvalue, FUNCTION_PARAMETER_STRMAXLEN - 1);
     fps->parray[fpsi].cnt0++;
 
     return EXIT_SUCCESS;
 }
 
-
-
-
-int functionparameter_GetParamValue_ONOFF(
-    FUNCTION_PARAMETER_STRUCT *fps,
-    const char *paramname
-)
+int functionparameter_GetParamValue_ONOFF(FUNCTION_PARAMETER_STRUCT *fps, const char *paramname)
 {
     int fpsi = functionparameter_GetParamIndex(fps, paramname);
 
-    if(fps->parray[fpsi].fpflag & FPFLAG_ONOFF)
+    if (fps->parray[fpsi].fpflag & FPFLAG_ONOFF)
     {
         return 1;
     }
@@ -508,17 +316,11 @@ int functionparameter_GetParamValue_ONOFF(
     }
 }
 
-
-
-int functionparameter_SetParamValue_ONOFF(
-    FUNCTION_PARAMETER_STRUCT *fps,
-    const char *paramname,
-    int ONOFFvalue
-)
+int functionparameter_SetParamValue_ONOFF(FUNCTION_PARAMETER_STRUCT *fps, const char *paramname, int ONOFFvalue)
 {
     int fpsi = functionparameter_GetParamIndex(fps, paramname);
 
-    if(ONOFFvalue == 1)
+    if (ONOFFvalue == 1)
     {
         fps->parray[fpsi].fpflag |= FPFLAG_ONOFF;
         fps->parray[fpsi].val.i64[0] = 1;
@@ -534,12 +336,7 @@ int functionparameter_SetParamValue_ONOFF(
     return EXIT_SUCCESS;
 }
 
-
-
-uint64_t *functionparameter_GetParamPtr_fpflag(
-    FUNCTION_PARAMETER_STRUCT *fps,
-    const char *paramname
-)
+uint64_t *functionparameter_GetParamPtr_fpflag(FUNCTION_PARAMETER_STRUCT *fps, const char *paramname)
 {
     uint64_t *ptr;
 
diff --git a/src/CommandLineInterface/fps_paramvalue.h b/src/CommandLineInterface/fps_paramvalue.h
index bf0b588d..435d7f3a 100644
--- a/src/CommandLineInterface/fps_paramvalue.h
+++ b/src/CommandLineInterface/fps_paramvalue.h
@@ -6,282 +6,145 @@
 #ifndef FPS_PARAMVALUE_H
 #define FPS_PARAMVALUE_H
 
-
-
-int64_t *functionparameter_GetParamPtr_generic(
-    FUNCTION_PARAMETER_STRUCT *fps,
-    const char *paramname,
-    long *paramindex
-);
-
-
+int64_t *functionparameter_GetParamPtr_generic(FUNCTION_PARAMETER_STRUCT *fps, const char *paramname, long *paramindex);
 
 // =====================================================================
 // INT32
 // =====================================================================
 
-errno_t functionparameter_SetParamValue_INT32(
-    FUNCTION_PARAMETER_STRUCT *fps,
-    const char *paramname,
-    int32_t value
-);
+errno_t functionparameter_SetParamValue_INT32(FUNCTION_PARAMETER_STRUCT *fps, const char *paramname, int32_t value);
 
-int32_t functionparameter_GetParamValue_INT32(
-    FUNCTION_PARAMETER_STRUCT *fps,
-    const char *paramname
-);
-
-int32_t *functionparameter_GetParamPtr_INT32(
-    FUNCTION_PARAMETER_STRUCT *fps,
-    const char *paramname
-);
+int32_t functionparameter_GetParamValue_INT32(FUNCTION_PARAMETER_STRUCT *fps, const char *paramname);
 
+int32_t *functionparameter_GetParamPtr_INT32(FUNCTION_PARAMETER_STRUCT *fps, const char *paramname);
 
 // Creates variable "_varname"
 //
-#define FPS_GETPARAM_INT32(varname, pname) \
-int32_t _##varname = 0; \
-do{ \
-   _##varname = functionparameter_GetParamValue_INT32(&fps, pname);\
-  (void) _##varname;\
-} while(0)
-
-
+#define FPS_GETPARAM_INT32(varname, pname)                                                                             \
+    int32_t _##varname = 0;                                                                                            \
+    do                                                                                                                 \
+    {                                                                                                                  \
+        _##varname = functionparameter_GetParamValue_INT32(&fps, pname);                                               \
+        (void)_##varname;                                                                                              \
+    } while (0)
 
 // =====================================================================
 // UINT32
 // =====================================================================
 
-errno_t functionparameter_SetParamValue_UINT32(
-    FUNCTION_PARAMETER_STRUCT *fps,
-    const char *paramname,
-    uint32_t value
-);
+errno_t functionparameter_SetParamValue_UINT32(FUNCTION_PARAMETER_STRUCT *fps, const char *paramname, uint32_t value);
 
-uint32_t functionparameter_GetParamValue_UINT32(
-    FUNCTION_PARAMETER_STRUCT *fps,
-    const char *paramname
-);
-
-uint32_t *functionparameter_GetParamPtr_UINT32(
-    FUNCTION_PARAMETER_STRUCT *fps,
-    const char *paramname
-);
+uint32_t functionparameter_GetParamValue_UINT32(FUNCTION_PARAMETER_STRUCT *fps, const char *paramname);
 
+uint32_t *functionparameter_GetParamPtr_UINT32(FUNCTION_PARAMETER_STRUCT *fps, const char *paramname);
 
 // Creates variable "_varname"
 //
-#define FPS_GETPARAM_UINT32(varname, pname) \
-int32_t _##varname = 0; \
-do{ \
-   _##varname = functionparameter_GetParamValue_UINT32(&fps, pname);\
-  (void) _##varname;\
-} while(0)
-
-
-
-
-
-
+#define FPS_GETPARAM_UINT32(varname, pname)                                                                            \
+    int32_t _##varname = 0;                                                                                            \
+    do                                                                                                                 \
+    {                                                                                                                  \
+        _##varname = functionparameter_GetParamValue_UINT32(&fps, pname);                                              \
+        (void)_##varname;                                                                                              \
+    } while (0)
 
 // =====================================================================
 // INT64
 // =====================================================================
 
-errno_t functionparameter_SetParamValue_INT64(
-    FUNCTION_PARAMETER_STRUCT *fps,
-    const char *paramname,
-    int64_t value
-);
-
-int64_t functionparameter_GetParamValue_INT64(
-    FUNCTION_PARAMETER_STRUCT *fps,
-    const char *paramname
-);
+errno_t functionparameter_SetParamValue_INT64(FUNCTION_PARAMETER_STRUCT *fps, const char *paramname, int64_t value);
 
-int64_t *functionparameter_GetParamPtr_INT64(
-    FUNCTION_PARAMETER_STRUCT *fps,
-    const char *paramname
-);
+int64_t functionparameter_GetParamValue_INT64(FUNCTION_PARAMETER_STRUCT *fps, const char *paramname);
 
+int64_t *functionparameter_GetParamPtr_INT64(FUNCTION_PARAMETER_STRUCT *fps, const char *paramname);
 
 // Creates variable "_varname"
 //
-#define FPS_GETPARAM_INT64(varname, pname) \
-int64_t _##varname = 0; \
-do{ \
-   _##varname = functionparameter_GetParamValue_INT64(&fps, pname);\
-  (void) _##varname;\
-} while(0)
-
-
+#define FPS_GETPARAM_INT64(varname, pname)                                                                             \
+    int64_t _##varname = 0;                                                                                            \
+    do                                                                                                                 \
+    {                                                                                                                  \
+        _##varname = functionparameter_GetParamValue_INT64(&fps, pname);                                               \
+        (void)_##varname;                                                                                              \
+    } while (0)
 
 // =====================================================================
 // UINT64
 // =====================================================================
 
-errno_t functionparameter_SetParamValue_UINT64(
-    FUNCTION_PARAMETER_STRUCT *fps,
-    const char *paramname,
-    uint64_t value
-);
+errno_t functionparameter_SetParamValue_UINT64(FUNCTION_PARAMETER_STRUCT *fps, const char *paramname, uint64_t value);
 
-uint64_t functionparameter_GetParamValue_UINT64(
-    FUNCTION_PARAMETER_STRUCT *fps,
-    const char *paramname
-);
-
-uint64_t *functionparameter_GetParamPtr_UINT64(
-    FUNCTION_PARAMETER_STRUCT *fps,
-    const char *paramname
-);
+uint64_t functionparameter_GetParamValue_UINT64(FUNCTION_PARAMETER_STRUCT *fps, const char *paramname);
 
+uint64_t *functionparameter_GetParamPtr_UINT64(FUNCTION_PARAMETER_STRUCT *fps, const char *paramname);
 
 // Creates variable "_varname"
 //
-#define FPS_GETPARAM_UINT64(varname, pname) \
-int64_t _##varname = 0; \
-do{ \
-   _##varname = functionparameter_GetParamValue_UINT64(&fps, pname);\
-  (void) _##varname;\
-} while(0)
-
-
-
-
+#define FPS_GETPARAM_UINT64(varname, pname)                                                                            \
+    int64_t _##varname = 0;                                                                                            \
+    do                                                                                                                 \
+    {                                                                                                                  \
+        _##varname = functionparameter_GetParamValue_UINT64(&fps, pname);                                              \
+        (void)_##varname;                                                                                              \
+    } while (0)
 
 // =====================================================================
 // FLOAT32
 // =====================================================================
 
-float functionparameter_GetParamValue_FLOAT32(
-    FUNCTION_PARAMETER_STRUCT *fps,
-    const char *paramname
-);
-
+float functionparameter_GetParamValue_FLOAT32(FUNCTION_PARAMETER_STRUCT *fps, const char *paramname);
 
-errno_t functionparameter_SetParamValue_FLOAT32(
-    FUNCTION_PARAMETER_STRUCT *fps,
-    const char *paramname,
-    float value
-);
-
-
-float *functionparameter_GetParamPtr_FLOAT32(
-    FUNCTION_PARAMETER_STRUCT *fps,
-    const char *paramname
-);
+errno_t functionparameter_SetParamValue_FLOAT32(FUNCTION_PARAMETER_STRUCT *fps, const char *paramname, float value);
 
+float *functionparameter_GetParamPtr_FLOAT32(FUNCTION_PARAMETER_STRUCT *fps, const char *paramname);
 
 // Creates variable "_varname"
 //
-#define FPS_GETPARAM_FLOAT32(varname, pname) \
-float _##varname = 0; \
-do{ \
-   _##varname = functionparameter_GetParamValue_FLOAT32(&fps, pname);\
-  (void) _##varname;\
-} while(0)
-
-
-
-
-
+#define FPS_GETPARAM_FLOAT32(varname, pname)                                                                           \
+    float _##varname = 0;                                                                                              \
+    do                                                                                                                 \
+    {                                                                                                                  \
+        _##varname = functionparameter_GetParamValue_FLOAT32(&fps, pname);                                             \
+        (void)_##varname;                                                                                              \
+    } while (0)
 
 // =====================================================================
 // FLOAT64
 // =====================================================================
 
-double functionparameter_GetParamValue_FLOAT64(
-    FUNCTION_PARAMETER_STRUCT *fps,
-    const char *paramname
-);
-
-
-errno_t functionparameter_SetParamValue_FLOAT64(
-    FUNCTION_PARAMETER_STRUCT *fps,
-    const char *paramname,
-    double value
-);
-
-
-double *functionparameter_GetParamPtr_FLOAT64(
-    FUNCTION_PARAMETER_STRUCT *fps,
-    const char *paramname
-);
-
-
+double functionparameter_GetParamValue_FLOAT64(FUNCTION_PARAMETER_STRUCT *fps, const char *paramname);
 
+errno_t functionparameter_SetParamValue_FLOAT64(FUNCTION_PARAMETER_STRUCT *fps, const char *paramname, double value);
 
+double *functionparameter_GetParamPtr_FLOAT64(FUNCTION_PARAMETER_STRUCT *fps, const char *paramname);
 
 // =====================================================================
 // TIMESPEC
 // =====================================================================
 
-float functionparameter_GetParamValue_TIMESPEC(
-    FUNCTION_PARAMETER_STRUCT *fps,
-    const char *paramname
-);
-
-int functionparameter_SetParamValue_TIMESPEC(
-    FUNCTION_PARAMETER_STRUCT *fps,
-    const char *paramname,
-    float value
-);
-
-struct timespec *functionparameter_GetParamPtr_TIMESPEC(
-    FUNCTION_PARAMETER_STRUCT *fps,
-    const char *paramname
-);
-
-
+float functionparameter_GetParamValue_TIMESPEC(FUNCTION_PARAMETER_STRUCT *fps, const char *paramname);
 
+int functionparameter_SetParamValue_TIMESPEC(FUNCTION_PARAMETER_STRUCT *fps, const char *paramname, float value);
 
+struct timespec *functionparameter_GetParamPtr_TIMESPEC(FUNCTION_PARAMETER_STRUCT *fps, const char *paramname);
 
 // =====================================================================
 // STRING
 // =====================================================================
 
-char *functionparameter_GetParamPtr_STRING(
-    FUNCTION_PARAMETER_STRUCT *fps,
-    const char *paramname
-);
-
-
-errno_t functionparameter_SetParamValue_STRING(
-    FUNCTION_PARAMETER_STRUCT *fps,
-    const char *paramname,
-    const char *stringvalue
-);
-
+char *functionparameter_GetParamPtr_STRING(FUNCTION_PARAMETER_STRUCT *fps, const char *paramname);
 
+errno_t functionparameter_SetParamValue_STRING(FUNCTION_PARAMETER_STRUCT *fps, const char *paramname,
+                                               const char *stringvalue);
 
 // =====================================================================
 // ON/OFF
 // =====================================================================
 
+int functionparameter_GetParamValue_ONOFF(FUNCTION_PARAMETER_STRUCT *fps, const char *paramname);
 
-int functionparameter_GetParamValue_ONOFF(
-    FUNCTION_PARAMETER_STRUCT *fps,
-    const char *paramname
-);
-
-
-errno_t functionparameter_SetParamValue_ONOFF(
-    FUNCTION_PARAMETER_STRUCT *fps,
-    const char *paramname,
-    int ONOFFvalue
-);
-
-
-
-
-uint64_t *functionparameter_GetParamPtr_fpflag(
-    FUNCTION_PARAMETER_STRUCT *fps,
-    const char *paramname
-);
-
-
-
+errno_t functionparameter_SetParamValue_ONOFF(FUNCTION_PARAMETER_STRUCT *fps, const char *paramname, int ONOFFvalue);
 
+uint64_t *functionparameter_GetParamPtr_fpflag(FUNCTION_PARAMETER_STRUCT *fps, const char *paramname);
 
 #endif
diff --git a/src/CommandLineInterface/fps_printlist.c b/src/CommandLineInterface/fps_printlist.c
index 79d05f23..ffddf4a4 100644
--- a/src/CommandLineInterface/fps_printlist.c
+++ b/src/CommandLineInterface/fps_printlist.c
@@ -1,27 +1,19 @@
 /**
  * @file    fps_printlist.c
- * @brief   print list of parameters 
+ * @brief   print list of parameters
  */
 
-
-
-
 #include "CommandLineInterface/CLIcore.h"
 
-
-
-int function_parameter_printlist(
-    FUNCTION_PARAMETER  *funcparamarray,
-    long NBparamMAX
-)
+int function_parameter_printlist(FUNCTION_PARAMETER *funcparamarray, long NBparamMAX)
 {
     long pindex = 0;
     long pcnt = 0;
 
     printf("\n");
-    for(pindex = 0; pindex < NBparamMAX; pindex++)
+    for (pindex = 0; pindex < NBparamMAX; pindex++)
     {
-        if(funcparamarray[pindex].fpflag & FPFLAG_ACTIVE)
+        if (funcparamarray[pindex].fpflag & FPFLAG_ACTIVE)
         {
             printf("Parameter %4ld : %s\n", pindex, funcparamarray[pindex].keywordfull);
             /*for(int kl=0; kl< funcparamarray[pindex].keywordlevel; kl++)
@@ -30,68 +22,68 @@ int function_parameter_printlist(
             printf("    %s\n", funcparamarray[pindex].description);
 
             // STATUS FLAGS
-            printf("    STATUS FLAGS (0x%02hhx) :", (int) funcparamarray[pindex].fpflag);
-            if(funcparamarray[pindex].fpflag & FPFLAG_ACTIVE)
+            printf("    STATUS FLAGS (0x%02hhx) :", (int)funcparamarray[pindex].fpflag);
+            if (funcparamarray[pindex].fpflag & FPFLAG_ACTIVE)
             {
                 printf(" ACTIVE");
             }
-            if(funcparamarray[pindex].fpflag & FPFLAG_USED)
+            if (funcparamarray[pindex].fpflag & FPFLAG_USED)
             {
                 printf(" USED");
             }
-            if(funcparamarray[pindex].fpflag & FPFLAG_VISIBLE)
+            if (funcparamarray[pindex].fpflag & FPFLAG_VISIBLE)
             {
                 printf(" VISIBLE");
             }
-            if(funcparamarray[pindex].fpflag & FPFLAG_WRITE)
+            if (funcparamarray[pindex].fpflag & FPFLAG_WRITE)
             {
                 printf(" WRITE");
             }
-            if(funcparamarray[pindex].fpflag & FPFLAG_WRITECONF)
+            if (funcparamarray[pindex].fpflag & FPFLAG_WRITECONF)
             {
                 printf(" WRITECONF");
             }
-            if(funcparamarray[pindex].fpflag & FPFLAG_WRITERUN)
+            if (funcparamarray[pindex].fpflag & FPFLAG_WRITERUN)
             {
                 printf(" WRITERUN");
             }
-            if(funcparamarray[pindex].fpflag & FPFLAG_LOG)
+            if (funcparamarray[pindex].fpflag & FPFLAG_LOG)
             {
                 printf(" LOG");
             }
-            if(funcparamarray[pindex].fpflag & FPFLAG_SAVEONCHANGE)
+            if (funcparamarray[pindex].fpflag & FPFLAG_SAVEONCHANGE)
             {
                 printf(" SAVEONCHANGE");
             }
-            if(funcparamarray[pindex].fpflag & FPFLAG_SAVEONCLOSE)
+            if (funcparamarray[pindex].fpflag & FPFLAG_SAVEONCLOSE)
             {
                 printf(" SAVEONCLOSE");
             }
-            if(funcparamarray[pindex].fpflag & FPFLAG_MINLIMIT)
+            if (funcparamarray[pindex].fpflag & FPFLAG_MINLIMIT)
             {
                 printf(" MINLIMIT");
             }
-            if(funcparamarray[pindex].fpflag & FPFLAG_MAXLIMIT)
+            if (funcparamarray[pindex].fpflag & FPFLAG_MAXLIMIT)
             {
                 printf(" MAXLIMIT");
             }
-            if(funcparamarray[pindex].fpflag & FPFLAG_CHECKSTREAM)
+            if (funcparamarray[pindex].fpflag & FPFLAG_CHECKSTREAM)
             {
                 printf(" CHECKSTREAM");
             }
-            if(funcparamarray[pindex].fpflag & FPFLAG_IMPORTED)
+            if (funcparamarray[pindex].fpflag & FPFLAG_IMPORTED)
             {
                 printf(" IMPORTED");
             }
-            if(funcparamarray[pindex].fpflag & FPFLAG_FEEDBACK)
+            if (funcparamarray[pindex].fpflag & FPFLAG_FEEDBACK)
             {
                 printf(" FEEDBACK");
             }
-            if(funcparamarray[pindex].fpflag & FPFLAG_ERROR)
+            if (funcparamarray[pindex].fpflag & FPFLAG_ERROR)
             {
                 printf(" ERROR");
             }
-            if(funcparamarray[pindex].fpflag & FPFLAG_ONOFF)
+            if (funcparamarray[pindex].fpflag & FPFLAG_ONOFF)
             {
                 printf(" ONOFF");
             }
@@ -99,60 +91,59 @@ int function_parameter_printlist(
 
             // DATA TYPE
             //			printf("    TYPE : 0x%02hhx\n", (int) funcparamarray[pindex].type);
-            if(funcparamarray[pindex].type & FPTYPE_UNDEF)
+            if (funcparamarray[pindex].type & FPTYPE_UNDEF)
             {
                 printf("    TYPE = UNDEF\n");
             }
-            if(funcparamarray[pindex].type & FPTYPE_INT64)
+            if (funcparamarray[pindex].type & FPTYPE_INT64)
             {
                 printf("    TYPE  = INT64\n");
-                printf("    VALUE = %ld\n", (long) funcparamarray[pindex].val.i64[0]);
+                printf("    VALUE = %ld\n", (long)funcparamarray[pindex].val.i64[0]);
             }
-            if(funcparamarray[pindex].type & FPTYPE_FLOAT64)
+            if (funcparamarray[pindex].type & FPTYPE_FLOAT64)
             {
                 printf("    TYPE = FLOAT64\n");
             }
-            if(funcparamarray[pindex].type & FPTYPE_PID)
+            if (funcparamarray[pindex].type & FPTYPE_PID)
             {
                 printf("    TYPE = PID\n");
             }
-            if(funcparamarray[pindex].type & FPTYPE_TIMESPEC)
+            if (funcparamarray[pindex].type & FPTYPE_TIMESPEC)
             {
                 printf("    TYPE = TIMESPEC\n");
             }
-            if(funcparamarray[pindex].type & FPTYPE_FILENAME)
+            if (funcparamarray[pindex].type & FPTYPE_FILENAME)
             {
                 printf("    TYPE = FILENAME\n");
             }
-            if(funcparamarray[pindex].type & FPTYPE_DIRNAME)
+            if (funcparamarray[pindex].type & FPTYPE_DIRNAME)
             {
                 printf("    TYPE = DIRNAME\n");
             }
-            if(funcparamarray[pindex].type & FPTYPE_STREAMNAME)
+            if (funcparamarray[pindex].type & FPTYPE_STREAMNAME)
             {
                 printf("    TYPE = STREAMNAME\n");
             }
-            if(funcparamarray[pindex].type & FPTYPE_STRING)
+            if (funcparamarray[pindex].type & FPTYPE_STRING)
             {
                 printf("    TYPE = STRING\n");
             }
-            if(funcparamarray[pindex].type & FPTYPE_ONOFF)
+            if (funcparamarray[pindex].type & FPTYPE_ONOFF)
             {
                 printf("    TYPE = ONOFF\n");
             }
-            if(funcparamarray[pindex].type & FPTYPE_FPSNAME)
+            if (funcparamarray[pindex].type & FPTYPE_FPSNAME)
             {
                 printf("    TYPE = FPSNAME\n");
             }
 
-            pcnt ++;
+            pcnt++;
         }
     }
     printf("\n");
     printf("%ld/%ld active parameters\n", pcnt, NBparamMAX);
-    
+
     printf("\n");
 
     return 0;
 }
-
diff --git a/src/CommandLineInterface/fps_printparameter_valuestring.c b/src/CommandLineInterface/fps_printparameter_valuestring.c
index 58892e3f..8467a0d4 100644
--- a/src/CommandLineInterface/fps_printparameter_valuestring.c
+++ b/src/CommandLineInterface/fps_printparameter_valuestring.c
@@ -3,67 +3,34 @@
  * @brief   print parameter value string
  */
 
-
 #include "CommandLineInterface/CLIcore.h"
 
-
-errno_t functionparameter_PrintParameter_ValueString(
-    FUNCTION_PARAMETER *fpsentry,
-    char *outstring,
-    int stringmaxlen
-)
+errno_t functionparameter_PrintParameter_ValueString(FUNCTION_PARAMETER *fpsentry, char *outstring, int stringmaxlen)
 {
-	int cmdOK = 0;
-
+    int cmdOK = 0;
 
-    switch(fpsentry->type)
+    switch (fpsentry->type)
     {
     case FPTYPE_INT64:
-        SNPRINTF_CHECK(
-            outstring,
-            stringmaxlen,
-            "%-40s INT64      %ld %ld %ld %ld",
-            fpsentry->keywordfull,
-            fpsentry->val.i64[0],
-            fpsentry->val.i64[1],
-            fpsentry->val.i64[2],
-            fpsentry->val.i64[3]);
+        SNPRINTF_CHECK(outstring, stringmaxlen, "%-40s INT64      %ld %ld %ld %ld", fpsentry->keywordfull,
+                       fpsentry->val.i64[0], fpsentry->val.i64[1], fpsentry->val.i64[2], fpsentry->val.i64[3]);
         cmdOK = 1;
         break;
 
     case FPTYPE_FLOAT64:
-        SNPRINTF_CHECK(
-            outstring,
-            stringmaxlen,
-            "%-40s FLOAT64    %f %f %f %f",
-            fpsentry->keywordfull,
-            fpsentry->val.f64[0],
-            fpsentry->val.f64[1],
-            fpsentry->val.f64[2],
-            fpsentry->val.f64[3]);
+        SNPRINTF_CHECK(outstring, stringmaxlen, "%-40s FLOAT64    %f %f %f %f", fpsentry->keywordfull,
+                       fpsentry->val.f64[0], fpsentry->val.f64[1], fpsentry->val.f64[2], fpsentry->val.f64[3]);
         cmdOK = 1;
         break;
 
     case FPTYPE_FLOAT32:
-        SNPRINTF_CHECK(
-            outstring,
-            stringmaxlen,
-            "%-40s FLOAT32    %f %f %f %f",
-            fpsentry->keywordfull,
-            fpsentry->val.f32[0],
-            fpsentry->val.f32[1],
-            fpsentry->val.f32[2],
-            fpsentry->val.f32[3]);
+        SNPRINTF_CHECK(outstring, stringmaxlen, "%-40s FLOAT32    %f %f %f %f", fpsentry->keywordfull,
+                       fpsentry->val.f32[0], fpsentry->val.f32[1], fpsentry->val.f32[2], fpsentry->val.f32[3]);
         cmdOK = 1;
         break;
 
     case FPTYPE_PID:
-        SNPRINTF_CHECK(
-            outstring,
-            stringmaxlen,
-            "%-40s PID        %ld",
-            fpsentry->keywordfull,
-            fpsentry->val.i64[0]);
+        SNPRINTF_CHECK(outstring, stringmaxlen, "%-40s PID        %ld", fpsentry->keywordfull, fpsentry->val.i64[0]);
         cmdOK = 1;
         break;
 
@@ -72,96 +39,61 @@ errno_t functionparameter_PrintParameter_ValueString(
         break;
 
     case FPTYPE_FILENAME:
-        SNPRINTF_CHECK(
-            outstring,
-            stringmaxlen,
-            "%-40s FILENAME   %s",
-            fpsentry->keywordfull,
-            fpsentry->val.string[0]);
+        SNPRINTF_CHECK(outstring, stringmaxlen, "%-40s FILENAME   %s", fpsentry->keywordfull, fpsentry->val.string[0]);
         cmdOK = 1;
         break;
 
     case FPTYPE_FITSFILENAME:
-        SNPRINTF_CHECK(
-            outstring,
-            stringmaxlen,
-            "%-40s FITSFILENAME   %s",
-            fpsentry->keywordfull,
-            fpsentry->val.string[0]);
+        SNPRINTF_CHECK(outstring, stringmaxlen, "%-40s FITSFILENAME   %s", fpsentry->keywordfull,
+                       fpsentry->val.string[0]);
         cmdOK = 1;
         break;
 
     case FPTYPE_EXECFILENAME:
-        SNPRINTF_CHECK(
-            outstring,
-            stringmaxlen,
-            "%-40s EXECFILENAME   %s",
-            fpsentry->keywordfull,
-            fpsentry->val.string[0]);
+        SNPRINTF_CHECK(outstring, stringmaxlen, "%-40s EXECFILENAME   %s", fpsentry->keywordfull,
+                       fpsentry->val.string[0]);
         cmdOK = 1;
         break;
 
     case FPTYPE_DIRNAME:
-        SNPRINTF_CHECK(
-            outstring,
-            stringmaxlen,
-            "%-40s DIRNAME    %s",
-            fpsentry->keywordfull,
-            fpsentry->val.string[0]);
+        SNPRINTF_CHECK(outstring, stringmaxlen, "%-40s DIRNAME    %s", fpsentry->keywordfull, fpsentry->val.string[0]);
         cmdOK = 1;
         break;
 
     case FPTYPE_STREAMNAME:
-        SNPRINTF_CHECK(
-            outstring,
-            stringmaxlen,
-            "%-40s STREAMNAME %s",
-            fpsentry->keywordfull,
-            fpsentry->val.string[0]);
+        SNPRINTF_CHECK(outstring, stringmaxlen, "%-40s STREAMNAME %s", fpsentry->keywordfull, fpsentry->val.string[0]);
         cmdOK = 1;
         break;
 
     case FPTYPE_STRING:
-        SNPRINTF_CHECK(
-            outstring,
-            stringmaxlen,
-            "%-40s STRING     %s",
-            fpsentry->keywordfull,
-            fpsentry->val.string[0]);
+        SNPRINTF_CHECK(outstring, stringmaxlen, "%-40s STRING     %s", fpsentry->keywordfull, fpsentry->val.string[0]);
         cmdOK = 1;
         break;
 
     case FPTYPE_ONOFF:
-        if(fpsentry->fpflag & FPFLAG_ONOFF)
+        if (fpsentry->fpflag & FPFLAG_ONOFF)
         {
-            SNPRINTF_CHECK(outstring, stringmaxlen, "%-40s ONOFF      ON",
-                           fpsentry->keywordfull);
+            SNPRINTF_CHECK(outstring, stringmaxlen, "%-40s ONOFF      ON", fpsentry->keywordfull);
         }
         else
         {
-            SNPRINTF_CHECK(outstring, stringmaxlen, "%-40s ONOFF      OFF",
-                           fpsentry->keywordfull);
+            SNPRINTF_CHECK(outstring, stringmaxlen, "%-40s ONOFF      OFF", fpsentry->keywordfull);
         }
         cmdOK = 1;
         break;
 
-
     case FPTYPE_FPSNAME:
-        SNPRINTF_CHECK(outstring, stringmaxlen, "%-40s FPSNAME   %s",
-                       fpsentry->keywordfull, fpsentry->val.string[0]);
+        SNPRINTF_CHECK(outstring, stringmaxlen, "%-40s FPSNAME   %s", fpsentry->keywordfull, fpsentry->val.string[0]);
         cmdOK = 1;
         break;
-
     }
 
-
-	if(cmdOK==1)
-	{
-		return RETURN_SUCCESS;
-	}
-	else
-	{
-		return RETURN_FAILURE;
-	}
-
+    if (cmdOK == 1)
+    {
+        return RETURN_SUCCESS;
+    }
+    else
+    {
+        return RETURN_FAILURE;
+    }
 }
diff --git a/src/CommandLineInterface/fps_printparameter_valuestring.h b/src/CommandLineInterface/fps_printparameter_valuestring.h
index 247bf3b2..5f7225e8 100644
--- a/src/CommandLineInterface/fps_printparameter_valuestring.h
+++ b/src/CommandLineInterface/fps_printparameter_valuestring.h
@@ -8,10 +8,6 @@
 
 #include "function_parameters.h"
 
-errno_t functionparameter_PrintParameter_ValueString(
-    FUNCTION_PARAMETER *fpsentry,
-    char *outstring,
-    int stringmaxlen
-);
+errno_t functionparameter_PrintParameter_ValueString(FUNCTION_PARAMETER *fpsentry, char *outstring, int stringmaxlen);
 
 #endif
diff --git a/src/CommandLineInterface/fps_process_fpsCMDarray.c b/src/CommandLineInterface/fps_process_fpsCMDarray.c
index c77afa5f..d5d6418c 100644
--- a/src/CommandLineInterface/fps_process_fpsCMDarray.c
+++ b/src/CommandLineInterface/fps_process_fpsCMDarray.c
@@ -6,11 +6,8 @@
 
 #include "CommandLineInterface/CLIcore.h"
 
-
 #include "fps_processcmdline.h"
 
-
-
 /** @brief Find the next task to execute
  *
  * Tasks are arranged in execution queues.
@@ -36,13 +33,9 @@
  * - Return to queue 0 when done working in other queues
  */
 
-int function_parameter_process_fpsCMDarray(
-    FPSCTRL_TASK_ENTRY         *fpsctrltasklist,
-    FPSCTRL_TASK_QUEUE         *fpsctrlqueuelist,
-    KEYWORD_TREE_NODE          *keywnode,
-    FPSCTRL_PROCESS_VARS       *fpsCTRLvar,
-    FUNCTION_PARAMETER_STRUCT  *fps
-)
+int function_parameter_process_fpsCMDarray(FPSCTRL_TASK_ENTRY *fpsctrltasklist, FPSCTRL_TASK_QUEUE *fpsctrlqueuelist,
+                                           KEYWORD_TREE_NODE *keywnode, FPSCTRL_PROCESS_VARS *fpsCTRLvar,
+                                           FUNCTION_PARAMETER_STRUCT *fps)
 {
     // queue has no task
     int QUEUE_NOTASK = -1;
@@ -53,48 +46,39 @@ int function_parameter_process_fpsCMDarray(
     // queue is ready for next scan
     int QUEUE_SCANREADY = -3;
 
-
-
     // the scheduler handles multiple queues
     // in each queue, we look for a task to run, and run it if conditions are met
 
-
     int NBtaskLaunched = 0;
 
-
-
-
     // For each queue, lets find which task is ready
     // results are written in array
     // if no task ready in queue, value = QUEUE_NOTASK
     //
     int queue_nexttask[NB_FPSCTRL_TASKQUEUE_MAX];
 
-
-    for( uint32_t qi = 0; qi < NB_FPSCTRL_TASKQUEUE_MAX; qi ++)
+    for (uint32_t qi = 0; qi < NB_FPSCTRL_TASKQUEUE_MAX; qi++)
     {
         queue_nexttask[qi] = QUEUE_SCANREADY;
 
-
-        while ( queue_nexttask[qi] == QUEUE_SCANREADY )
+        while (queue_nexttask[qi] == QUEUE_SCANREADY)
         {
             // find next command to execute
             uint64_t inputindexmin = UINT_MAX;
             int cmdindexExec;
             int cmdOK = 0;
 
-
             queue_nexttask[qi] = QUEUE_NOTASK;
             //
             // Find task with smallest inputindex within this queue
             // This is the one to be executed
             //
-            for( int cmdindex = 0; cmdindex < NB_FPSCTRL_TASK_MAX; cmdindex++ )
+            for (int cmdindex = 0; cmdindex < NB_FPSCTRL_TASK_MAX; cmdindex++)
             {
-                if((fpsctrltasklist[cmdindex].status & FPSTASK_STATUS_ACTIVE)
-                        && (fpsctrltasklist[cmdindex].queue == qi))
+                if ((fpsctrltasklist[cmdindex].status & FPSTASK_STATUS_ACTIVE) &&
+                    (fpsctrltasklist[cmdindex].queue == qi))
                 {
-                    if(fpsctrltasklist[cmdindex].inputindex < inputindexmin)
+                    if (fpsctrltasklist[cmdindex].inputindex < inputindexmin)
                     {
                         inputindexmin = fpsctrltasklist[cmdindex].inputindex;
                         cmdindexExec = cmdindex;
@@ -103,43 +87,40 @@ int function_parameter_process_fpsCMDarray(
                 }
             }
 
-
-            if(cmdOK == 1) // A potential task to be executed has been found
+            if (cmdOK == 1) // A potential task to be executed has been found
             {
-                if(!(fpsctrltasklist[cmdindexExec].status &
-                        FPSTASK_STATUS_RUNNING))     // if task not running, launch it
+                if (!(fpsctrltasklist[cmdindexExec].status & FPSTASK_STATUS_RUNNING)) // if task not running, launch it
                 {
                     queue_nexttask[qi] = cmdindexExec;
-
                 }
                 else
                 {
                     // if it's already running, lets check if it is completed
                     int task_completed = 1; // default
 
-                    if(fpsctrltasklist[cmdindexExec].flag &
-                            FPSTASK_FLAG_WAITONRUN)   // are we waiting for run to be completed ?
+                    if (fpsctrltasklist[cmdindexExec].flag &
+                        FPSTASK_FLAG_WAITONRUN) // are we waiting for run to be completed ?
                     {
-                        if((fps[fpsctrltasklist[cmdindexExec].fpsindex].md->status &
-                                FUNCTION_PARAMETER_STRUCT_STATUS_CMDRUN))
+                        if ((fps[fpsctrltasklist[cmdindexExec].fpsindex].md->status &
+                             FUNCTION_PARAMETER_STRUCT_STATUS_CMDRUN))
                         {
                             task_completed = 0; // must wait
                             queue_nexttask[qi] = QUEUE_WAIT;
                         }
                     }
 
-                    if(fpsctrltasklist[cmdindexExec].flag &
-                            FPSTASK_FLAG_WAITONCONF)   // are we waiting for conf update to be completed ?
+                    if (fpsctrltasklist[cmdindexExec].flag &
+                        FPSTASK_FLAG_WAITONCONF) // are we waiting for conf update to be completed ?
                     {
-                        if(fps[fpsctrltasklist[cmdindexExec].fpsindex].md->status &
-                                FUNCTION_PARAMETER_STRUCT_SIGNAL_CHECKED)
+                        if (fps[fpsctrltasklist[cmdindexExec].fpsindex].md->status &
+                            FUNCTION_PARAMETER_STRUCT_SIGNAL_CHECKED)
                         {
                             task_completed = 0; // must wait
                             queue_nexttask[qi] = QUEUE_WAIT;
                         }
                     }
 
-                    if(task_completed == 1)
+                    if (task_completed == 1)
                     {
                         // update status - no longer running
                         fpsctrltasklist[cmdindexExec].status &= ~FPSTASK_STATUS_RUNNING;
@@ -155,51 +136,50 @@ int function_parameter_process_fpsCMDarray(
                     }
                 }
             } // end if(cmdOK==1)
-        } // end while QUEUE_SCANREADY
-
-
+        }     // end while QUEUE_SCANREADY
     }
 
-
     // Remove old tasks
     //
     double *completion_age; // completion time
-    long    oldest_index = 0;
-    struct  timespec tnow;
-    double  tnowd;
+    long oldest_index = 0;
+    struct timespec tnow;
+    double tnowd;
 
-    completion_age = (double*) malloc(sizeof(double)*NB_FPSCTRL_TASK_MAX);
-    if(completion_age == NULL) {
+    completion_age = (double *)malloc(sizeof(double) * NB_FPSCTRL_TASK_MAX);
+    if (completion_age == NULL)
+    {
         PRINT_ERROR("malloc returns NULL pointer");
         abort();
     }
 
     clock_gettime(CLOCK_REALTIME, &tnow);
-    tnowd = 1.0*tnow.tv_sec + 1.0e-9*tnow.tv_nsec;
+    tnowd = 1.0 * tnow.tv_sec + 1.0e-9 * tnow.tv_nsec;
 
     long taskcnt = NB_FPSCTRL_TASK_MAX;
 
-    while( taskcnt > NB_FPSCTRL_TASK_MAX - NB_FPSCTRL_TASK_PURGESIZE )
+    while (taskcnt > NB_FPSCTRL_TASK_MAX - NB_FPSCTRL_TASK_PURGESIZE)
     {
         taskcnt = 0;
-        double  oldest_age = 0.0;
-        for( int cmdindex = 0; cmdindex < NB_FPSCTRL_TASK_MAX; cmdindex++ )
+        double oldest_age = 0.0;
+        for (int cmdindex = 0; cmdindex < NB_FPSCTRL_TASK_MAX; cmdindex++)
         {
             // how many tasks are candidates for removal (completed) ?
-            if( fpsctrltasklist[cmdindex].status & FPSTASK_STATUS_COMPLETED )
+            if (fpsctrltasklist[cmdindex].status & FPSTASK_STATUS_COMPLETED)
             {
 
-                completion_age[taskcnt] = tnowd-(1.0*fpsctrltasklist[cmdindex].completiontime.tv_sec + 1.0e-9*fpsctrltasklist[cmdindex].completiontime.tv_nsec);
+                completion_age[taskcnt] = tnowd - (1.0 * fpsctrltasklist[cmdindex].completiontime.tv_sec +
+                                                   1.0e-9 * fpsctrltasklist[cmdindex].completiontime.tv_nsec);
 
-                if(completion_age[taskcnt] > oldest_age)
+                if (completion_age[taskcnt] > oldest_age)
                 {
-                    oldest_age   = completion_age[taskcnt];
+                    oldest_age = completion_age[taskcnt];
                     oldest_index = cmdindex;
                 }
-                taskcnt ++;
+                taskcnt++;
             }
         }
-        if(taskcnt > NB_FPSCTRL_TASK_MAX - NB_FPSCTRL_TASK_PURGESIZE)
+        if (taskcnt > NB_FPSCTRL_TASK_MAX - NB_FPSCTRL_TASK_PURGESIZE)
         {
             fpsctrltasklist[oldest_index].status = 0;
         }
@@ -207,20 +187,15 @@ int function_parameter_process_fpsCMDarray(
 
     free(completion_age);
 
-
-
-
-
-
     // find out which task to run among the ones pre-selected above
 
     int nexttask_priority = -1;
     int nexttask_cmdindex = -1;
-    for( uint32_t qi = 0; qi < NB_FPSCTRL_TASKQUEUE_MAX; qi ++)
+    for (uint32_t qi = 0; qi < NB_FPSCTRL_TASKQUEUE_MAX; qi++)
     {
-        if( (queue_nexttask[qi] != QUEUE_NOTASK ) && (queue_nexttask[qi] != QUEUE_WAIT ) )
+        if ((queue_nexttask[qi] != QUEUE_NOTASK) && (queue_nexttask[qi] != QUEUE_WAIT))
         {
-            if( fpsctrlqueuelist[qi].priority > nexttask_priority )
+            if (fpsctrlqueuelist[qi].priority > nexttask_priority)
             {
                 nexttask_priority = fpsctrlqueuelist[qi].priority;
                 nexttask_cmdindex = queue_nexttask[qi];
@@ -228,19 +203,16 @@ int function_parameter_process_fpsCMDarray(
         }
     }
 
-
-
-    if( nexttask_cmdindex != -1 )
+    if (nexttask_cmdindex != -1)
     {
-        if(nexttask_priority > 0 )
-        {   // execute task
+        if (nexttask_priority > 0)
+        { // execute task
             int cmdindexExec = nexttask_cmdindex;
 
             uint64_t taskstatus = 0;
 
-            fpsctrltasklist[cmdindexExec].fpsindex =
-                functionparameter_FPSprocess_cmdline(fpsctrltasklist[cmdindexExec].cmdstring,
-                        fpsctrlqueuelist, keywnode, fpsCTRLvar, fps, &taskstatus);
+            fpsctrltasklist[cmdindexExec].fpsindex = functionparameter_FPSprocess_cmdline(
+                fpsctrltasklist[cmdindexExec].cmdstring, fpsctrlqueuelist, keywnode, fpsCTRLvar, fps, &taskstatus);
             NBtaskLaunched++;
 
             // update status form cmdline interpreter
@@ -254,8 +226,5 @@ int function_parameter_process_fpsCMDarray(
         }
     }
 
-
     return NBtaskLaunched;
 }
-
-
diff --git a/src/CommandLineInterface/fps_process_fpsCMDarray.h b/src/CommandLineInterface/fps_process_fpsCMDarray.h
index 7274e5ed..036f8c42 100644
--- a/src/CommandLineInterface/fps_process_fpsCMDarray.h
+++ b/src/CommandLineInterface/fps_process_fpsCMDarray.h
@@ -7,12 +7,8 @@
 
 #include "function_parameters.h"
 
-int function_parameter_process_fpsCMDarray(
-    FPSCTRL_TASK_ENTRY         *fpsctrltasklist,
-    FPSCTRL_TASK_QUEUE         *fpsctrlqueuelist,
-    KEYWORD_TREE_NODE          *keywnode,
-    FPSCTRL_PROCESS_VARS       *fpsCTRLvar,
-    FUNCTION_PARAMETER_STRUCT  *fps
-);
+int function_parameter_process_fpsCMDarray(FPSCTRL_TASK_ENTRY *fpsctrltasklist, FPSCTRL_TASK_QUEUE *fpsctrlqueuelist,
+                                           KEYWORD_TREE_NODE *keywnode, FPSCTRL_PROCESS_VARS *fpsCTRLvar,
+                                           FUNCTION_PARAMETER_STRUCT *fps);
 
 #endif
diff --git a/src/CommandLineInterface/fps_processcmdline.c b/src/CommandLineInterface/fps_processcmdline.c
index b5e5f91a..356f8ad8 100644
--- a/src/CommandLineInterface/fps_processcmdline.c
+++ b/src/CommandLineInterface/fps_processcmdline.c
@@ -3,10 +3,8 @@
  * @brief   FPS process command line
  */
 
-
 #include <stdlib.h>
 
-
 #include "CommandLineInterface/CLIcore.h"
 
 #include "fps_scan.h"
@@ -25,10 +23,8 @@
 #include "fps_paramvalue.h"
 #include "fps_save2disk.h"
 
-#include "fps_printparameter_valuestring.h"
 #include "fps_WriteParameterToDisk.h"
-
-
+#include "fps_printparameter_valuestring.h"
 
 /** @brief process command line
  *
@@ -59,84 +55,66 @@
  *
  */
 
-
-int functionparameter_FPSprocess_cmdline(
-    char *FPScmdline,
-    FPSCTRL_TASK_QUEUE *fpsctrlqueuelist,
-    KEYWORD_TREE_NODE *keywnode,
-    FPSCTRL_PROCESS_VARS *fpsCTRLvar,
-    FUNCTION_PARAMETER_STRUCT *fps,
-    uint64_t *taskstatus
-)
+int functionparameter_FPSprocess_cmdline(char *FPScmdline, FPSCTRL_TASK_QUEUE *fpsctrlqueuelist,
+                                         KEYWORD_TREE_NODE *keywnode, FPSCTRL_PROCESS_VARS *fpsCTRLvar,
+                                         FUNCTION_PARAMETER_STRUCT *fps, uint64_t *taskstatus)
 {
-    int  fpsindex;
+    int fpsindex;
     long pindex;
 
     // break FPScmdline in words
     // [FPScommand] [FPSentryname]
     //
     char *pch;
-    int   nbword = 0;
-    char  FPScommand[100];
+    int nbword = 0;
+    char FPScommand[100];
 
-    int   cmdOK = 2;    // 0 : failed, 1: OK
-    int   cmdFOUND = 0; // toggles to 1 when command has been found
+    int cmdOK = 2;    // 0 : failed, 1: OK
+    int cmdFOUND = 0; // toggles to 1 when command has been found
 
     // first arg is always an FPS entry name
-    char  FPSentryname[FUNCTION_PARAMETER_KEYWORD_STRMAXLEN *
-                                                            FUNCTION_PARAMETER_KEYWORD_MAXLEVEL];
-    char  FPScmdarg1[FUNCTION_PARAMETER_STRMAXLEN];
-
-
-
-    char  FPSarg0[FUNCTION_PARAMETER_KEYWORD_STRMAXLEN *
-                                                       FUNCTION_PARAMETER_KEYWORD_MAXLEVEL];
-    char  FPSarg1[FUNCTION_PARAMETER_STRMAXLEN];
-    char  FPSarg2[FUNCTION_PARAMETER_STRMAXLEN];
-    char  FPSarg3[FUNCTION_PARAMETER_STRMAXLEN];
-
-
+    char FPSentryname[FUNCTION_PARAMETER_KEYWORD_STRMAXLEN * FUNCTION_PARAMETER_KEYWORD_MAXLEVEL];
+    char FPScmdarg1[FUNCTION_PARAMETER_STRMAXLEN];
 
+    char FPSarg0[FUNCTION_PARAMETER_KEYWORD_STRMAXLEN * FUNCTION_PARAMETER_KEYWORD_MAXLEVEL];
+    char FPSarg1[FUNCTION_PARAMETER_STRMAXLEN];
+    char FPSarg2[FUNCTION_PARAMETER_STRMAXLEN];
+    char FPSarg3[FUNCTION_PARAMETER_STRMAXLEN];
 
     char msgstring[STRINGMAXLEN_FPS_LOGMSG];
     char errmsgstring[STRINGMAXLEN_FPS_LOGMSG];
     char inputcmd[STRINGMAXLEN_FPS_CMDLINE];
 
-
     int inputcmdOK = 0; // 1 if command should be processed
 
-
     static int testcnt; // test counter to be incremented by cntinc command
 
-
-    if(strlen(FPScmdline) > 0)   // only send command if non-empty
+    if (strlen(FPScmdline) > 0) // only send command if non-empty
     {
         SNPRINTF_CHECK(inputcmd, STRINGMAXLEN_FPS_CMDLINE, "%s", FPScmdline);
         inputcmdOK = 1;
     }
 
     // don't process lines starting with # (comment)
-    if(inputcmdOK == 1)
+    if (inputcmdOK == 1)
     {
-        if(inputcmd[0] == '#')
+        if (inputcmd[0] == '#')
         {
             inputcmdOK = 0;
         }
     }
 
-    if(inputcmdOK == 0)
+    if (inputcmdOK == 0)
     {
         return (-1);
     }
 
-
-
     functionparameter_outlog("CMDRCV", "[%s]", inputcmd);
     *taskstatus |= FPSTASK_STATUS_RECEIVED;
 
     DEBUG_TRACEPOINT(" ");
 
-    if(strlen(inputcmd) > 1)
+    if (strlen(inputcmd) > 1)
     {
         pch = strtok(inputcmd, " \t");
         sprintf(FPScommand, "%s", pch);
@@ -146,11 +124,8 @@ int functionparameter_FPSprocess_cmdline(
         pch = NULL;
     }
 
-
     DEBUG_TRACEPOINT(" ");
 
-
-
     // Break command line into words
     //
     // output words are:
@@ -161,95 +136,80 @@ int functionparameter_FPSprocess_cmdline(
     // FPSarg2
     // FPSarg3
 
-    while(pch != NULL)
+    while (pch != NULL)
     {
 
         nbword++;
         pch = strtok(NULL, " \t");
 
-        if(nbword == 1)   // first arg (0)
+        if (nbword == 1) // first arg (0)
         {
             char *pos;
             sprintf(FPSarg0, "%s", pch);
-            if((pos = strchr(FPSarg0, '\n')) != NULL)
+            if ((pos = strchr(FPSarg0, '\n')) != NULL)
             {
                 *pos = '\0';
             }
-
         }
 
-        if(nbword == 2)
+        if (nbword == 2)
         {
             char *pos;
-            if(snprintf(FPSarg1, FUNCTION_PARAMETER_STRMAXLEN, "%s",
-                        pch) >= FUNCTION_PARAMETER_STRMAXLEN)
+            if (snprintf(FPSarg1, FUNCTION_PARAMETER_STRMAXLEN, "%s", pch) >= FUNCTION_PARAMETER_STRMAXLEN)
             {
                 printf("WARNING: string truncated\n");
                 printf("STRING: %s\n", pch);
             }
-            if((pos = strchr(FPSarg1, '\n')) != NULL)
+            if ((pos = strchr(FPSarg1, '\n')) != NULL)
             {
                 *pos = '\0';
             }
         }
 
-        if(nbword == 3)
+        if (nbword == 3)
         {
             char *pos;
-            if(snprintf(FPSarg2, FUNCTION_PARAMETER_STRMAXLEN, "%s",
-                        pch) >= FUNCTION_PARAMETER_STRMAXLEN)
+            if (snprintf(FPSarg2, FUNCTION_PARAMETER_STRMAXLEN, "%s", pch) >= FUNCTION_PARAMETER_STRMAXLEN)
             {
                 printf("WARNING: string truncated\n");
                 printf("STRING: %s\n", pch);
             }
-            if((pos = strchr(FPSarg2, '\n')) != NULL)
+            if ((pos = strchr(FPSarg2, '\n')) != NULL)
             {
                 *pos = '\0';
             }
         }
 
-        if(nbword == 4)
+        if (nbword == 4)
         {
             char *pos;
-            if(snprintf(FPSarg3, FUNCTION_PARAMETER_STRMAXLEN, "%s",
-                        pch) >= FUNCTION_PARAMETER_STRMAXLEN)
+            if (snprintf(FPSarg3, FUNCTION_PARAMETER_STRMAXLEN, "%s", pch) >= FUNCTION_PARAMETER_STRMAXLEN)
             {
                 printf("WARNING: string truncated\n");
                 printf("STRING: %s\n", pch);
             }
-            if((pos = strchr(FPSarg3, '\n')) != NULL)
+            if ((pos = strchr(FPSarg3, '\n')) != NULL)
             {
                 *pos = '\0';
             }
         }
-
     }
 
-
-
     DEBUG_TRACEPOINT(" ");
 
-
-    if(nbword == 0)
+    if (nbword == 0)
     {
-        cmdFOUND = 1;   // do nothing, proceed
+        cmdFOUND = 1; // do nothing, proceed
         cmdOK = 2;
     }
 
-
-
-
-
-
     // Handle commands for which FPSarg0 is NOT an FPS entry
 
-
     // exit
-    if((cmdFOUND == 0)
-            && (strcmp(FPScommand, "exit") == 0))
+    if ((cmdFOUND == 0) && (strcmp(FPScommand, "exit") == 0))
     {
         cmdFOUND = 1;
-        if(nbword != 1)
+        if (nbword != 1)
         {
             functionparameter_outlog("ERROR", "COMMAND exit takes NBARGS = 0");
             *taskstatus |= FPSTASK_STATUS_ERR_NBARG;
@@ -263,11 +223,10 @@ int functionparameter_FPSprocess_cmdline(
     }
 
     // exit
-    if((cmdFOUND == 0)
-            && (strcmp(FPScommand, "rescan") == 0))
+    if ((cmdFOUND == 0) && (strcmp(FPScommand, "rescan") == 0))
     {
         cmdFOUND = 1;
-        if(nbword != 1)
+        if (nbword != 1)
         {
             functionparameter_outlog("ERROR", "COMMAND rescan takes NBARGS = 0");
             *taskstatus |= FPSTASK_STATUS_ERR_NBARG;
@@ -275,27 +234,17 @@ int functionparameter_FPSprocess_cmdline(
         }
         else
         {
-            functionparameter_scan_fps(
-                fpsCTRLvar->mode,
-                fpsCTRLvar->fpsnamemask,
-                fps,
-                keywnode,
-                &fpsCTRLvar->NBkwn,
-                &fpsCTRLvar->NBfps,
-                &fpsCTRLvar->NBindex, 0);
+            functionparameter_scan_fps(fpsCTRLvar->mode, fpsCTRLvar->fpsnamemask, fps, keywnode, &fpsCTRLvar->NBkwn,
+                                       &fpsCTRLvar->NBfps, &fpsCTRLvar->NBindex, 0);
             functionparameter_outlog("INFO", "RESCAN");
         }
     }
 
-
-
-
     // cntinc
-    if((cmdFOUND == 0)
-            && (strcmp(FPScommand, "cntinc") == 0))
+    if ((cmdFOUND == 0) && (strcmp(FPScommand, "cntinc") == 0))
     {
         cmdFOUND = 1;
-        if(nbword != 2)
+        if (nbword != 2)
         {
             functionparameter_outlog("ERROR", "COMMAND cntinc takes NBARGS = 1");
             *taskstatus |= FPSTASK_STATUS_ERR_NBARG;
@@ -303,24 +252,16 @@ int functionparameter_FPSprocess_cmdline(
         }
         else
         {
-            testcnt ++;
-            functionparameter_outlog("INFO", "TEST [%d] counter = %d", atoi(FPSarg0),
-                                     testcnt);
+            testcnt++;
+            functionparameter_outlog("INFO", "TEST [%d] counter = %d", atoi(FPSarg0), testcnt);
         }
     }
 
-
-
-
-
-
-
     // logsymlink
-    if((cmdFOUND == 0)
-            && (strcmp(FPScommand, "logsymlink") == 0))
+    if ((cmdFOUND == 0) && (strcmp(FPScommand, "logsymlink") == 0))
     {
         cmdFOUND = 1;
-        if(nbword != 2)
+        if (nbword != 2)
         {
 
             functionparameter_outlog("ERROR", "COMMAND logsymlink takes NBARGS = 1");
@@ -334,23 +275,18 @@ int functionparameter_FPSprocess_cmdline(
 
             functionparameter_outlog("INFO", "CREATE SYM LINK %s <- %s", FPSarg0, logfname);
 
-            if(symlink(logfname, FPSarg0) != 0)
+            if (symlink(logfname, FPSarg0) != 0)
             {
                 PRINT_ERROR("symlink error %s %s", logfname, FPSarg0);
             }
-
         }
     }
 
-
-
-
     // queueprio
-    if((cmdFOUND == 0)
-            && (strcmp(FPScommand, "queueprio") == 0))
+    if ((cmdFOUND == 0) && (strcmp(FPScommand, "queueprio") == 0))
     {
         cmdFOUND = 1;
-        if(nbword != 3)
+        if (nbword != 3)
         {
             functionparameter_outlog("ERROR", "COMMAND queueprio takes NBARGS = 2");
             *taskstatus |= FPSTASK_STATUS_ERR_NBARG;
@@ -361,7 +297,7 @@ int functionparameter_FPSprocess_cmdline(
             int queue = atoi(FPSarg0);
             int prio = atoi(FPSarg1);
 
-            if((queue >= 0) && (queue < NB_FPSCTRL_TASKQUEUE_MAX))
+            if ((queue >= 0) && (queue < NB_FPSCTRL_TASKQUEUE_MAX))
             {
                 fpsctrlqueuelist[queue].priority = prio;
                 functionparameter_outlog("INFO", "%s", "QUEUE %d PRIO = %d", queue, prio);
@@ -369,49 +305,38 @@ int functionparameter_FPSprocess_cmdline(
         }
     }
 
-
-
-
-
-
-
-
-
     // From this point on, FPSarg0 is expected to be a FPS entry
     // so we resolve it and look for fps
     int kwnindex = -1;
-    if(cmdFOUND == 0)
+    if (cmdFOUND == 0)
     {
         strcpy(FPSentryname, FPSarg0);
         strcpy(FPScmdarg1, FPSarg1);
 
-
         // look for entry, if found, kwnindex points to it
-        if(nbword > 1)
+        if (nbword > 1)
         {
             //                printf("Looking for entry for %s\n", FPSentryname);
 
             int kwnindexscan = 0;
-            while((kwnindex == -1) && (kwnindexscan < fpsCTRLvar->NBkwn))
+            while ((kwnindex == -1) && (kwnindexscan < fpsCTRLvar->NBkwn))
             {
-                if(strcmp(keywnode[kwnindexscan].keywordfull, FPSentryname) == 0)
+                if (strcmp(keywnode[kwnindexscan].keywordfull, FPSentryname) == 0)
                 {
                     kwnindex = kwnindexscan;
                 }
-                kwnindexscan ++;
+                kwnindexscan++;
             }
         }
 
         //            sprintf(msgstring, "nbword = %d  cmdOK = %d   kwnindex = %d",  nbword, cmdOK, kwnindex);
         //            functionparameter_outlog("INFO", "%s", msgstring);
 
-
-        if(kwnindex != -1)
+        if (kwnindex != -1)
         {
             fpsindex = keywnode[kwnindex].fpsindex;
             pindex = keywnode[kwnindex].pindex;
-            functionparameter_outlog("INFO", "FPS ENTRY FOUND : %-40s  %d %ld",
-                                     FPSentryname, fpsindex, pindex);
+            functionparameter_outlog("INFO", "FPS ENTRY FOUND : %-40s  %d %ld", FPSentryname, fpsindex, pindex);
         }
         else
         {
@@ -421,17 +346,14 @@ int functionparameter_FPSprocess_cmdline(
         }
     }
 
-
-
-    if(kwnindex != -1)   // if FPS has been found
+    if (kwnindex != -1) // if FPS has been found
     {
 
         // tmuxstart
-        if((cmdFOUND == 0)
-                && (strcmp(FPScommand, "tmuxstart") == 0))
+        if ((cmdFOUND == 0) && (strcmp(FPScommand, "tmuxstart") == 0))
         {
             cmdFOUND = 1;
-            if(nbword != 2)
+            if (nbword != 2)
             {
                 functionparameter_outlog("ERROR", "%s", "COMMAND tmuxstart takes NBARGS = 1");
                 *taskstatus |= FPSTASK_STATUS_ERR_NBARG;
@@ -442,18 +364,16 @@ int functionparameter_FPSprocess_cmdline(
                 DEBUG_TRACEPOINT(" ");
                 functionparameter_FPS_tmux_init(&fps[fpsindex]);
 
-                functionparameter_outlog("TMUXSTART", "Init tmux session %d %s",
-                                         fpsindex, fps[fpsindex].md->name);
+                functionparameter_outlog("TMUXSTART", "Init tmux session %d %s", fpsindex, fps[fpsindex].md->name);
                 cmdOK = 1;
             }
         }
 
         // tmuxstop
-        if((cmdFOUND == 0)
-                && (strcmp(FPScommand, "tmuxstop") == 0))
+        if ((cmdFOUND == 0) && (strcmp(FPScommand, "tmuxstop") == 0))
         {
             cmdFOUND = 1;
-            if(nbword != 2)
+            if (nbword != 2)
             {
                 functionparameter_outlog("ERROR", "%s", "COMMAND tmuxstop takes NBARGS = 1");
                 *taskstatus |= FPSTASK_STATUS_ERR_NBARG;
@@ -464,18 +384,16 @@ int functionparameter_FPSprocess_cmdline(
                 DEBUG_TRACEPOINT(" ");
                 functionparameter_FPS_tmux_kill(&fps[fpsindex]);
 
-                functionparameter_outlog("TMUXSTOP", "Init tmux session %d %s",
-                                         fpsindex, fps[fpsindex].md->name);
+                functionparameter_outlog("TMUXSTOP", "Init tmux session %d %s", fpsindex, fps[fpsindex].md->name);
                 cmdOK = 1;
             }
         }
 
         // confstart
-        if((cmdFOUND == 0)
-                && (strcmp(FPScommand, "confstart") == 0))
+        if ((cmdFOUND == 0) && (strcmp(FPScommand, "confstart") == 0))
         {
             cmdFOUND = 1;
-            if(nbword != 2)
+            if (nbword != 2)
             {
                 functionparameter_outlog("ERROR", "%s", "COMMAND confstart takes NBARGS = 1");
                 *taskstatus |= FPSTASK_STATUS_ERR_NBARG;
@@ -486,19 +404,16 @@ int functionparameter_FPSprocess_cmdline(
                 DEBUG_TRACEPOINT(" ");
                 functionparameter_CONFstart(&fps[fpsindex]);
 
-                functionparameter_outlog("CONFSTART", "start CONF process %d %s",
-                                         fpsindex, fps[fpsindex].md->name);
+                functionparameter_outlog("CONFSTART", "start CONF process %d %s", fpsindex, fps[fpsindex].md->name);
                 cmdOK = 1;
             }
         }
 
-
         // confstop
-        if((cmdFOUND == 0)
-                && (strcmp(FPScommand, "confstop") == 0))
+        if ((cmdFOUND == 0) && (strcmp(FPScommand, "confstop") == 0))
         {
             cmdFOUND = 1;
-            if(nbword != 2)
+            if (nbword != 2)
             {
                 functionparameter_outlog("ERROR", "COMMAND confstop takes NBARGS = 1");
                 *taskstatus |= FPSTASK_STATUS_ERR_NBARG;
@@ -508,29 +423,18 @@ int functionparameter_FPSprocess_cmdline(
             {
                 DEBUG_TRACEPOINT(" ");
                 functionparameter_CONFstop(&fps[fpsindex]);
-                functionparameter_outlog("CONFSTOP", "stop CONF process %d %s",
-                                         fpsindex, fps[fpsindex].md->name);
+                functionparameter_outlog("CONFSTOP", "stop CONF process %d %s", fpsindex, fps[fpsindex].md->name);
                 cmdOK = 1;
             }
         }
 
-
-
-
-
-
-
-
-
-
         // confupdate
 
         DEBUG_TRACEPOINT(" ");
-        if((cmdFOUND == 0)
-                && (strcmp(FPScommand, "confupdate") == 0))
+        if ((cmdFOUND == 0) && (strcmp(FPScommand, "confupdate") == 0))
         {
             cmdFOUND = 1;
-            if(nbword != 2)
+            if (nbword != 2)
             {
                 functionparameter_outlog("ERROR", "COMMAND confupdate takes NBARGS = 1");
                 *taskstatus |= FPSTASK_STATUS_ERR_NBARG;
@@ -541,29 +445,22 @@ int functionparameter_FPSprocess_cmdline(
                 DEBUG_TRACEPOINT(" ");
                 fps[fpsindex].md->signal |=
                     FUNCTION_PARAMETER_STRUCT_SIGNAL_CHECKED; // update status: check waiting to be done
-                fps[fpsindex].md->signal |=
-                    FUNCTION_PARAMETER_STRUCT_SIGNAL_UPDATE; // request an update
+                fps[fpsindex].md->signal |= FUNCTION_PARAMETER_STRUCT_SIGNAL_UPDATE; // request an update
 
-                functionparameter_outlog("CONFUPDATE", "update CONF process %d %s",
-                                         fpsindex, fps[fpsindex].md->name);
+                functionparameter_outlog("CONFUPDATE", "update CONF process %d %s", fpsindex, fps[fpsindex].md->name);
                 cmdOK = 1;
             }
         }
 
-
-
-
-
         // confwupdate
         // Wait until update is cleared
         // if not successful, retry until time lapsed
 
         DEBUG_TRACEPOINT(" ");
-        if((cmdFOUND == 0)
-                && (strcmp(FPScommand, "confwupdate") == 0))
+        if ((cmdFOUND == 0) && (strcmp(FPScommand, "confwupdate") == 0))
         {
             cmdFOUND = 1;
-            if(nbword != 2)
+            if (nbword != 2)
             {
                 functionparameter_outlog("ERROR", "COMMAND confwupdate takes NBARGS = 1");
                 *taskstatus |= FPSTASK_STATUS_ERR_NBARG;
@@ -577,17 +474,16 @@ int functionparameter_FPSprocess_cmdline(
                 useconds_t dt = 100;
                 unsigned int timercntmax = 10000; // 1 sec max
 
-                while(looptry == 1)
+                while (looptry == 1)
                 {
 
                     DEBUG_TRACEPOINT(" ");
                     fps[fpsindex].md->signal |=
                         FUNCTION_PARAMETER_STRUCT_SIGNAL_CHECKED; // update status: check waiting to be done
-                    fps[fpsindex].md->signal |=
-                        FUNCTION_PARAMETER_STRUCT_SIGNAL_UPDATE; // request an update
+                    fps[fpsindex].md->signal |= FUNCTION_PARAMETER_STRUCT_SIGNAL_UPDATE; // request an update
 
-                    while(((fps[fpsindex].md->signal & FUNCTION_PARAMETER_STRUCT_SIGNAL_CHECKED))
-                            && (timercnt < timercntmax))
+                    while (((fps[fpsindex].md->signal & FUNCTION_PARAMETER_STRUCT_SIGNAL_CHECKED)) &&
+                           (timercnt < timercntmax))
                     {
                         usleep(dt);
                         timercnt++;
@@ -595,42 +491,32 @@ int functionparameter_FPSprocess_cmdline(
                     usleep(dt);
                     timercnt++;
 
-                    functionparameter_outlog("CONFWUPDATE",
-                                             "[%d] waited %d us on FPS %d %s. conferrcnt = %d",
-                                             looptrycnt,
-                                             dt * timercnt,
-                                             fpsindex,
-                                             fps[fpsindex].md->name,
+                    functionparameter_outlog("CONFWUPDATE", "[%d] waited %d us on FPS %d %s. conferrcnt = %d",
+                                             looptrycnt, dt * timercnt, fpsindex, fps[fpsindex].md->name,
                                              fps[fpsindex].md->conferrcnt);
 
                     looptrycnt++;
 
-                    if(fps[fpsindex].md->conferrcnt == 0)   // no error ! we can proceed
+                    if (fps[fpsindex].md->conferrcnt == 0) // no error ! we can proceed
                     {
                         looptry = 0;
                     }
 
-                    if(timercnt > timercntmax)    // ran out of time ... giving up
+                    if (timercnt > timercntmax) // ran out of time ... giving up
                     {
                         looptry = 0;
                     }
-
-
                 }
 
                 cmdOK = 1;
             }
         }
 
-
-
-
         // runstart
-        if((cmdFOUND == 0)
-                && (strcmp(FPScommand, "runstart") == 0))
+        if ((cmdFOUND == 0) && (strcmp(FPScommand, "runstart") == 0))
         {
             cmdFOUND = 1;
-            if(nbword != 2)
+            if (nbword != 2)
             {
                 functionparameter_outlog("ERROR", "COMMAND runstart takes NBARGS = 1");
                 *taskstatus |= FPSTASK_STATUS_ERR_NBARG;
@@ -641,23 +527,18 @@ int functionparameter_FPSprocess_cmdline(
                 DEBUG_TRACEPOINT(" ");
                 functionparameter_RUNstart(&fps[fpsindex]);
 
-                functionparameter_outlog("RUNSTART", "start RUN process %d %s",
-                                         fpsindex, fps[fpsindex].md->name);
+                functionparameter_outlog("RUNSTART", "start RUN process %d %s", fpsindex, fps[fpsindex].md->name);
                 cmdOK = 1;
-
             }
         }
 
-
-
         // runwait
         // wait until run process is completed
 
-        if((cmdFOUND == 0)
-                && (strcmp(FPScommand, "runwait") == 0))
+        if ((cmdFOUND == 0) && (strcmp(FPScommand, "runwait") == 0))
         {
             cmdFOUND = 1;
-            if(nbword != 2)
+            if (nbword != 2)
             {
                 functionparameter_outlog("ERROR", "COMMAND runwait takes NBARGS = 1");
                 *taskstatus |= FPSTASK_STATUS_ERR_NBARG;
@@ -671,27 +552,24 @@ int functionparameter_FPSprocess_cmdline(
                 useconds_t dt = 10000;
                 unsigned int timercntmax = 100000; // 10000 sec max
 
-                while(((fps[fpsindex].md->status & FUNCTION_PARAMETER_STRUCT_STATUS_CMDRUN))
-                        && (timercnt < timercntmax))
+                while (((fps[fpsindex].md->status & FUNCTION_PARAMETER_STRUCT_STATUS_CMDRUN)) &&
+                       (timercnt < timercntmax))
                 {
                     usleep(dt);
                     timercnt++;
                 }
-                functionparameter_outlog("RUNWAIT", "waited %d us on FPS %d %s",
-                                         dt * timercnt, fpsindex, fps[fpsindex].md->name);
+                functionparameter_outlog("RUNWAIT", "waited %d us on FPS %d %s", dt * timercnt, fpsindex,
+                                         fps[fpsindex].md->name);
                 cmdOK = 1;
             }
         }
 
-
-
         // runstop
 
-        if((cmdFOUND == 0)
-                && (strcmp(FPScommand, "runstop") == 0))
+        if ((cmdFOUND == 0) && (strcmp(FPScommand, "runstop") == 0))
         {
             cmdFOUND = 1;
-            if(nbword != 2)
+            if (nbword != 2)
             {
                 functionparameter_outlog("ERROR", "COMMAND runstop takes NBARGS = 1");
                 *taskstatus |= FPSTASK_STATUS_ERR_NBARG;
@@ -701,22 +579,17 @@ int functionparameter_FPSprocess_cmdline(
             {
                 DEBUG_TRACEPOINT(" ");
                 functionparameter_RUNstop(&fps[fpsindex]);
-                functionparameter_outlog("RUNSTOP", "stop RUN process %d %s",
-                                         fpsindex, fps[fpsindex].md->name);
+                functionparameter_outlog("RUNSTOP", "stop RUN process %d %s", fpsindex, fps[fpsindex].md->name);
                 cmdOK = 1;
             }
         }
 
-
-
-
         // fpsrm
 
-        if((cmdFOUND == 0)
-                && (strcmp(FPScommand, "fpsrm") == 0))
+        if ((cmdFOUND == 0) && (strcmp(FPScommand, "fpsrm") == 0))
         {
             cmdFOUND = 1;
-            if(nbword != 2)
+            if (nbword != 2)
             {
                 functionparameter_outlog("ERROR", "COMMAND fpsrm takes NBARGS = 1");
                 *taskstatus |= FPSTASK_STATUS_ERR_NBARG;
@@ -727,29 +600,18 @@ int functionparameter_FPSprocess_cmdline(
                 DEBUG_TRACEPOINT("Removing fps number %d", fpsindex);
                 functionparameter_FPSremove(&fps[fpsindex]);
                 DEBUG_TRACEPOINT("Posting to fps log %s", fps[fpsindex].md->name);
-                functionparameter_outlog("FPSRM", "FPS remove %d %s", fpsindex,
-                                         fps[fpsindex].md->name);
+                functionparameter_outlog("FPSRM", "FPS remove %d %s", fpsindex, fps[fpsindex].md->name);
                 cmdOK = 1;
             }
         }
 
-
-
-
-
-
-
         DEBUG_TRACEPOINT(" ");
 
-
-
-
         // exec
-        if((cmdFOUND == 0)
-                && (strcmp(FPScommand, "exec") == 0))
+        if ((cmdFOUND == 0) && (strcmp(FPScommand, "exec") == 0))
         {
             cmdFOUND = 1;
-            if(nbword != 2)
+            if (nbword != 2)
             {
                 functionparameter_outlog("ERROR", "COMMAND exec takes NBARGS = 1");
                 *taskstatus |= FPSTASK_STATUS_ERR_NBARG;
@@ -758,36 +620,30 @@ int functionparameter_FPSprocess_cmdline(
             else
             {
                 DEBUG_TRACEPOINT(" ");
-                if(fps[fpsindex].parray[pindex].type == FPTYPE_EXECFILENAME)
+                if (fps[fpsindex].parray[pindex].type == FPTYPE_EXECFILENAME)
                 {
-                    EXECUTE_SYSTEM_COMMAND("tmux send-keys -t %s:run \"cd %s\" C-m",
-                                           fps[fpsindex].md->name, fps[fpsindex].md->workdir);
-                    EXECUTE_SYSTEM_COMMAND("tmux send-keys -t %s:run \"%s %s\" C-m",
-                                           fps[fpsindex].md->name, fps[fpsindex].parray[pindex].val.string[0],
-                                           fps[fpsindex].md->name);
+                    EXECUTE_SYSTEM_COMMAND("tmux send-keys -t %s:run \"cd %s\" C-m", fps[fpsindex].md->name,
+                                           fps[fpsindex].md->workdir);
+                    EXECUTE_SYSTEM_COMMAND("tmux send-keys -t %s:run \"%s %s\" C-m", fps[fpsindex].md->name,
+                                           fps[fpsindex].parray[pindex].val.string[0], fps[fpsindex].md->name);
                     cmdOK = 1;
                 }
                 else
                 {
-                    functionparameter_outlog("ERROR",
-                                             "COMMAND exec requires EXECFILENAME type parameter");
+                    functionparameter_outlog("ERROR", "COMMAND exec requires EXECFILENAME type parameter");
                     *taskstatus |= FPSTASK_STATUS_ERR_ARGTYPE;
                     cmdOK = 0;
                 }
             }
         }
 
-
-
         // setval
-        if((cmdFOUND == 0)
-                && (strcmp(FPScommand, "setval") == 0))
+        if ((cmdFOUND == 0) && (strcmp(FPScommand, "setval") == 0))
         {
             cmdFOUND = 1;
-            if(nbword != 3)
+            if (nbword != 3)
             {
-                SNPRINTF_CHECK(errmsgstring, STRINGMAXLEN_FPS_LOGMSG,
-                               "COMMAND setval takes NBARGS = 2");
+                SNPRINTF_CHECK(errmsgstring, STRINGMAXLEN_FPS_LOGMSG, "COMMAND setval takes NBARGS = 2");
                 functionparameter_outlog("ERROR", "%s", errmsgstring);
                 *taskstatus |= FPSTASK_STATUS_ERR_NBARG;
                 cmdOK = 0;
@@ -796,387 +652,336 @@ int functionparameter_FPSprocess_cmdline(
             {
                 int updated = 0;
 
-                switch(fps[fpsindex].parray[pindex].type)
+                switch (fps[fpsindex].parray[pindex].type)
                 {
 
+                case FPTYPE_INT32:
+                {
+                    char *endptr;
+                    long valn = strtol(FPScmdarg1, &endptr, 10);
 
-
-                    case FPTYPE_INT32:
+                    if (*endptr == '\0')
                     {
-                        char *endptr;
-                        long valn = strtol(FPScmdarg1, &endptr, 10);
-
-                        if(*endptr == '\0')
-                        {
-                            // OK
-                            if(functionparameter_SetParamValue_INT32(&fps[fpsindex], FPSentryname,
-                                    valn) == EXIT_SUCCESS)
-                            {
-                                updated = 1;
-
-                                functionparameter_outlog("SETVAL", "%-40s INT32      %ld",
-                                                         FPSentryname, valn);
-                            }
-                        }
-                        else
+                        // OK
+                        if (functionparameter_SetParamValue_INT32(&fps[fpsindex], FPSentryname, valn) == EXIT_SUCCESS)
                         {
-                            *taskstatus |= FPSTASK_STATUS_ERR_TYPECONV;
-                            cmdOK = 0;
-                            SNPRINTF_CHECK(errmsgstring, STRINGMAXLEN_FPS_LOGMSG, "argument is not INT32");
-                            functionparameter_outlog("ERROR", "%s", errmsgstring);
+                            updated = 1;
+
+                            functionparameter_outlog("SETVAL", "%-40s INT32      %ld", FPSentryname, valn);
                         }
                     }
-                    break;
-
+                    else
+                    {
+                        *taskstatus |= FPSTASK_STATUS_ERR_TYPECONV;
+                        cmdOK = 0;
+                        SNPRINTF_CHECK(errmsgstring, STRINGMAXLEN_FPS_LOGMSG, "argument is not INT32");
+                        functionparameter_outlog("ERROR", "%s", errmsgstring);
+                    }
+                }
+                break;
 
+                case FPTYPE_UINT32:
+                {
+                    char *endptr;
+                    long valn = strtol(FPScmdarg1, &endptr, 10);
 
-                    case FPTYPE_UINT32:
+                    if ((*endptr == '\0') && (valn >= 0))
                     {
-                        char *endptr;
-                        long valn = strtol(FPScmdarg1, &endptr, 10);
-
-                        if((*endptr == '\0') && (valn >= 0))
-                        {
-                            // OK
-                            if(functionparameter_SetParamValue_UINT32(&fps[fpsindex], FPSentryname,
-                                    valn) == EXIT_SUCCESS)
-                            {
-                                updated = 1;
-
-                                functionparameter_outlog("SETVAL", "%-40s UINT32     %ld",
-                                                         FPSentryname, valn);
-                            }
-                        }
-                        else
+                        // OK
+                        if (functionparameter_SetParamValue_UINT32(&fps[fpsindex], FPSentryname, valn) == EXIT_SUCCESS)
                         {
-                            *taskstatus |= FPSTASK_STATUS_ERR_TYPECONV;
-                            cmdOK = 0;
-                            SNPRINTF_CHECK(errmsgstring, STRINGMAXLEN_FPS_LOGMSG, "argument is not UINT32");
-                            functionparameter_outlog("ERROR", "%s", errmsgstring);
+                            updated = 1;
+
+                            functionparameter_outlog("SETVAL", "%-40s UINT32     %ld", FPSentryname, valn);
                         }
                     }
-                    break;
-
+                    else
+                    {
+                        *taskstatus |= FPSTASK_STATUS_ERR_TYPECONV;
+                        cmdOK = 0;
+                        SNPRINTF_CHECK(errmsgstring, STRINGMAXLEN_FPS_LOGMSG, "argument is not UINT32");
+                        functionparameter_outlog("ERROR", "%s", errmsgstring);
+                    }
+                }
+                break;
 
+                case FPTYPE_INT64:
+                {
+                    char *endptr;
+                    long valn = strtol(FPScmdarg1, &endptr, 10);
 
-                    case FPTYPE_INT64:
+                    if (*endptr == '\0')
                     {
-                        char *endptr;
-                        long valn = strtol(FPScmdarg1, &endptr, 10);
-
-                        if(*endptr == '\0')
-                        {
-                            // OK
-                            if(functionparameter_SetParamValue_INT64(&fps[fpsindex], FPSentryname,
-                                    valn) == EXIT_SUCCESS)
-                            {
-                                updated = 1;
-
-                                functionparameter_outlog("SETVAL", "%-40s INT64      %ld",
-                                                         FPSentryname, valn);
-                            }
-                        }
-                        else
+                        // OK
+                        if (functionparameter_SetParamValue_INT64(&fps[fpsindex], FPSentryname, valn) == EXIT_SUCCESS)
                         {
-                            *taskstatus |= FPSTASK_STATUS_ERR_TYPECONV;
-                            cmdOK = 0;
-                            SNPRINTF_CHECK(errmsgstring, STRINGMAXLEN_FPS_LOGMSG, "argument is not INT64");
-                            functionparameter_outlog("ERROR", "%s", errmsgstring);
+                            updated = 1;
+
+                            functionparameter_outlog("SETVAL", "%-40s INT64      %ld", FPSentryname, valn);
                         }
                     }
-                    break;
-
+                    else
+                    {
+                        *taskstatus |= FPSTASK_STATUS_ERR_TYPECONV;
+                        cmdOK = 0;
+                        SNPRINTF_CHECK(errmsgstring, STRINGMAXLEN_FPS_LOGMSG, "argument is not INT64");
+                        functionparameter_outlog("ERROR", "%s", errmsgstring);
+                    }
+                }
+                break;
 
+                case FPTYPE_UINT64:
+                {
+                    char *endptr;
+                    long valn = strtol(FPScmdarg1, &endptr, 10);
 
-                    case FPTYPE_UINT64:
+                    if ((*endptr == '\0') && (valn >= 0))
                     {
-                        char *endptr;
-                        long valn = strtol(FPScmdarg1, &endptr, 10);
-
-                        if((*endptr == '\0') && (valn >= 0))
-                        {
-                            // OK
-                            if(functionparameter_SetParamValue_UINT64(&fps[fpsindex], FPSentryname,
-                                    valn) == EXIT_SUCCESS)
-                            {
-                                updated = 1;
-
-                                functionparameter_outlog("SETVAL", "%-40s UINT64     %ld",
-                                                         FPSentryname, valn);
-                            }
-                        }
-                        else
+                        // OK
+                        if (functionparameter_SetParamValue_UINT64(&fps[fpsindex], FPSentryname, valn) == EXIT_SUCCESS)
                         {
-                            *taskstatus |= FPSTASK_STATUS_ERR_TYPECONV;
-                            cmdOK = 0;
-                            SNPRINTF_CHECK(errmsgstring, STRINGMAXLEN_FPS_LOGMSG, "argument is not UINT64");
-                            functionparameter_outlog("ERROR", "%s", errmsgstring);
+                            updated = 1;
+
+                            functionparameter_outlog("SETVAL", "%-40s UINT64     %ld", FPSentryname, valn);
                         }
                     }
-                    break;
-
+                    else
+                    {
+                        *taskstatus |= FPSTASK_STATUS_ERR_TYPECONV;
+                        cmdOK = 0;
+                        SNPRINTF_CHECK(errmsgstring, STRINGMAXLEN_FPS_LOGMSG, "argument is not UINT64");
+                        functionparameter_outlog("ERROR", "%s", errmsgstring);
+                    }
+                }
+                break;
 
+                case FPTYPE_FLOAT64:
+                {
+                    char *endptr;
+                    double valf64 = strtod(FPScmdarg1, &endptr);
 
-                    case FPTYPE_FLOAT64:
+                    if (*endptr == '\0')
                     {
-                        char *endptr;
-                        double valf64 = strtod(FPScmdarg1, &endptr);
-
-                        if(*endptr == '\0')
+                        // OK
+                        if (functionparameter_SetParamValue_FLOAT64(&fps[fpsindex], FPSentryname, valf64) ==
+                            EXIT_SUCCESS)
                         {
-                            // OK
-                            if(functionparameter_SetParamValue_FLOAT64(&fps[fpsindex], FPSentryname,
-                                    valf64) == EXIT_SUCCESS)
-                            {
-                                updated = 1;
-
-                                functionparameter_outlog("SETVAL", "%-40s FLOAT64     %f",
-                                                         FPSentryname, valf64);
-                            }
-                        }
-                        else
-                        {
-                            *taskstatus |= FPSTASK_STATUS_ERR_TYPECONV;
-                            cmdOK = 0;
-                            SNPRINTF_CHECK(errmsgstring, STRINGMAXLEN_FPS_LOGMSG,
-                                           "argument is not FLOAT64");
-                            functionparameter_outlog("ERROR", "%s", errmsgstring);
+                            updated = 1;
+
+                            functionparameter_outlog("SETVAL", "%-40s FLOAT64     %f", FPSentryname, valf64);
                         }
                     }
-                    break;
-
+                    else
+                    {
+                        *taskstatus |= FPSTASK_STATUS_ERR_TYPECONV;
+                        cmdOK = 0;
+                        SNPRINTF_CHECK(errmsgstring, STRINGMAXLEN_FPS_LOGMSG, "argument is not FLOAT64");
+                        functionparameter_outlog("ERROR", "%s", errmsgstring);
+                    }
+                }
+                break;
 
+                case FPTYPE_FLOAT32:
+                {
+                    char *endptr;
+                    double valf32 = strtof(FPScmdarg1, &endptr);
 
-                    case FPTYPE_FLOAT32:
+                    if (*endptr == '\0')
                     {
-                        char *endptr;
-                        double valf32 = strtof(FPScmdarg1, &endptr);
-
-                        if(*endptr == '\0')
-                        {
-                            // OK
-                            if(functionparameter_SetParamValue_FLOAT32(&fps[fpsindex], FPSentryname,
-                                    valf32) == EXIT_SUCCESS)
-                            {
-                                updated = 1;
-
-                                functionparameter_outlog("SETVAL", "%-40s FLOAT32     %f",
-                                                         FPSentryname, valf32);
-                            }
-                        }
-                        else
+                        // OK
+                        if (functionparameter_SetParamValue_FLOAT32(&fps[fpsindex], FPSentryname, valf32) ==
+                            EXIT_SUCCESS)
                         {
-                            *taskstatus |= FPSTASK_STATUS_ERR_TYPECONV;
-                            cmdOK = 0;
-                            SNPRINTF_CHECK(errmsgstring, STRINGMAXLEN_FPS_LOGMSG,
-                                           "argument is not FLOAT32");
-                            functionparameter_outlog("ERROR", "%s", errmsgstring);
+                            updated = 1;
+
+                            functionparameter_outlog("SETVAL", "%-40s FLOAT32     %f", FPSentryname, valf32);
                         }
                     }
-                    break;
-
+                    else
+                    {
+                        *taskstatus |= FPSTASK_STATUS_ERR_TYPECONV;
+                        cmdOK = 0;
+                        SNPRINTF_CHECK(errmsgstring, STRINGMAXLEN_FPS_LOGMSG, "argument is not FLOAT32");
+                        functionparameter_outlog("ERROR", "%s", errmsgstring);
+                    }
+                }
+                break;
 
+                case FPTYPE_PID:
+                {
+                    char *endptr;
+                    long valn = strtol(FPScmdarg1, &endptr, 10);
 
-                    case FPTYPE_PID:
+                    if (*endptr == '\0')
                     {
-                        char *endptr;
-                        long valn = strtol(FPScmdarg1, &endptr, 10);
-
-                        if(*endptr == '\0')
-                        {
-                            // OK
-                            if(functionparameter_SetParamValue_INT64(&fps[fpsindex], FPSentryname,
-                                    valn) == EXIT_SUCCESS)
-                            {
-                                updated = 1;
-
-                                functionparameter_outlog("SETVAL", "%-40s PID      %ld",
-                                                         FPSentryname, valn);
-                            }
-                        }
-                        else
+                        // OK
+                        if (functionparameter_SetParamValue_INT64(&fps[fpsindex], FPSentryname, valn) == EXIT_SUCCESS)
                         {
-                            *taskstatus |= FPSTASK_STATUS_ERR_TYPECONV;
-                            cmdOK = 0;
-                            SNPRINTF_CHECK(errmsgstring, STRINGMAXLEN_FPS_LOGMSG, "argument is not INT64");
-                            functionparameter_outlog("ERROR", "%s", errmsgstring);
+                            updated = 1;
+
+                            functionparameter_outlog("SETVAL", "%-40s PID      %ld", FPSentryname, valn);
                         }
                     }
-                    break;
-
-                    case FPTYPE_TIMESPEC:
+                    else
                     {
-                        char *endptr;
-                        double valf32 = strtof(FPScmdarg1, &endptr);
+                        *taskstatus |= FPSTASK_STATUS_ERR_TYPECONV;
+                        cmdOK = 0;
+                        SNPRINTF_CHECK(errmsgstring, STRINGMAXLEN_FPS_LOGMSG, "argument is not INT64");
+                        functionparameter_outlog("ERROR", "%s", errmsgstring);
+                    }
+                }
+                break;
 
-                        if(*endptr == '\0')
-                        {
-                            // OK
-                            if(functionparameter_SetParamValue_TIMESPEC(&fps[fpsindex], FPSentryname,
-                                    valf32) == EXIT_SUCCESS)
-                            {
-                                updated = 1;
-
-                                functionparameter_outlog("SETVAL", "%-40s TIMESPEC     %f",
-                                                         FPSentryname, valf32);
-                            }
-                        }
-                        else
+                case FPTYPE_TIMESPEC:
+                {
+                    char *endptr;
+                    double valf32 = strtof(FPScmdarg1, &endptr);
+
+                    if (*endptr == '\0')
+                    {
+                        // OK
+                        if (functionparameter_SetParamValue_TIMESPEC(&fps[fpsindex], FPSentryname, valf32) ==
+                            EXIT_SUCCESS)
                         {
-                            *taskstatus |= FPSTASK_STATUS_ERR_TYPECONV;
-                            cmdOK = 0;
-                            SNPRINTF_CHECK(errmsgstring, STRINGMAXLEN_FPS_LOGMSG,
-                                           "argument is not FLOAT->TIMESPEC");
-                            functionparameter_outlog("ERROR", "%s", errmsgstring);
+                            updated = 1;
+
+                            functionparameter_outlog("SETVAL", "%-40s TIMESPEC     %f", FPSentryname, valf32);
                         }
                     }
+                    else
+                    {
+                        *taskstatus |= FPSTASK_STATUS_ERR_TYPECONV;
+                        cmdOK = 0;
+                        SNPRINTF_CHECK(errmsgstring, STRINGMAXLEN_FPS_LOGMSG, "argument is not FLOAT->TIMESPEC");
+                        functionparameter_outlog("ERROR", "%s", errmsgstring);
+                    }
+                }
+                break;
+
+                case FPTYPE_FILENAME:
+                    if (functionparameter_SetParamValue_STRING(&fps[fpsindex], FPSentryname, FPScmdarg1) ==
+                        EXIT_SUCCESS)
+                    {
+                        updated = 1;
+                    }
+                    functionparameter_outlog("SETVAL", "%-40s FILENAME   %s", FPSentryname, FPScmdarg1);
                     break;
 
-                    case FPTYPE_FILENAME:
-                        if(functionparameter_SetParamValue_STRING(&fps[fpsindex], FPSentryname,
-                                FPScmdarg1) == EXIT_SUCCESS)
-                        {
-                            updated = 1;
-                        }
-                        functionparameter_outlog("SETVAL", "%-40s FILENAME   %s",
-                                                 FPSentryname, FPScmdarg1);
-                        break;
+                case FPTYPE_FITSFILENAME:
+                    if (functionparameter_SetParamValue_STRING(&fps[fpsindex], FPSentryname, FPScmdarg1) ==
+                        EXIT_SUCCESS)
+                    {
+                        updated = 1;
+                    }
+                    functionparameter_outlog("SETVAL", "%-40s FITSFILENAME   %s", FPSentryname, FPScmdarg1);
+                    break;
 
-                    case FPTYPE_FITSFILENAME:
-                        if(functionparameter_SetParamValue_STRING(&fps[fpsindex], FPSentryname,
-                                FPScmdarg1) == EXIT_SUCCESS)
-                        {
-                            updated = 1;
-                        }
-                        functionparameter_outlog("SETVAL", "%-40s FITSFILENAME   %s",
-                                                 FPSentryname, FPScmdarg1);
-                        break;
+                case FPTYPE_EXECFILENAME:
+                    if (functionparameter_SetParamValue_STRING(&fps[fpsindex], FPSentryname, FPScmdarg1) ==
+                        EXIT_SUCCESS)
+                    {
+                        updated = 1;
+                    }
+                    functionparameter_outlog("SETVAL", "%-40s EXECFILENAME   %s", FPSentryname, FPScmdarg1);
+                    break;
 
-                    case FPTYPE_EXECFILENAME:
-                        if(functionparameter_SetParamValue_STRING(&fps[fpsindex], FPSentryname,
-                                FPScmdarg1) == EXIT_SUCCESS)
-                        {
-                            updated = 1;
-                        }
-                        functionparameter_outlog("SETVAL", "%-40s EXECFILENAME   %s",
-                                                 FPSentryname, FPScmdarg1);
-                        break;
+                case FPTYPE_DIRNAME:
+                    if (functionparameter_SetParamValue_STRING(&fps[fpsindex], FPSentryname, FPScmdarg1) ==
+                        EXIT_SUCCESS)
+                    {
+                        updated = 1;
+                    }
+                    functionparameter_outlog("SETVAL", "%-40s DIRNAME    %s", FPSentryname, FPScmdarg1);
+                    break;
 
-                    case FPTYPE_DIRNAME:
-                        if(functionparameter_SetParamValue_STRING(&fps[fpsindex], FPSentryname,
-                                FPScmdarg1) == EXIT_SUCCESS)
-                        {
-                            updated = 1;
-                        }
-                        functionparameter_outlog("SETVAL", "%-40s DIRNAME    %s",
-                                                 FPSentryname, FPScmdarg1);
-                        break;
+                case FPTYPE_STREAMNAME:
+                    if (functionparameter_SetParamValue_STRING(&fps[fpsindex], FPSentryname, FPScmdarg1) ==
+                        EXIT_SUCCESS)
+                    {
+                        updated = 1;
+                    }
+                    functionparameter_outlog("SETVAL", "%-40s STREAMNAME %s", FPSentryname, FPScmdarg1);
+                    break;
 
-                    case FPTYPE_STREAMNAME:
-                        if(functionparameter_SetParamValue_STRING(&fps[fpsindex], FPSentryname,
-                                FPScmdarg1) == EXIT_SUCCESS)
-                        {
-                            updated = 1;
-                        }
-                        functionparameter_outlog("SETVAL", "%-40s STREAMNAME %s",
-                                                 FPSentryname, FPScmdarg1);
-                        break;
+                case FPTYPE_STRING:
+                    if (functionparameter_SetParamValue_STRING(&fps[fpsindex], FPSentryname, FPScmdarg1) ==
+                        EXIT_SUCCESS)
+                    {
+                        updated = 1;
+                    }
+                    functionparameter_outlog("SETVAL", "%-40s STRING     %s", FPSentryname, FPScmdarg1);
+                    break;
 
-                    case FPTYPE_STRING:
-                        if(functionparameter_SetParamValue_STRING(&fps[fpsindex], FPSentryname,
-                                FPScmdarg1) == EXIT_SUCCESS)
+                case FPTYPE_ONOFF:
+                    if (strncmp(FPScmdarg1, "ON", 2) == 0)
+                    {
+                        if (functionparameter_SetParamValue_ONOFF(&fps[fpsindex], FPSentryname, 1) == EXIT_SUCCESS)
                         {
                             updated = 1;
                         }
-                        functionparameter_outlog("SETVAL", "%-40s STRING     %s",
-                                                 FPSentryname, FPScmdarg1);
-                        break;
-
-                    case FPTYPE_ONOFF:
-                        if(strncmp(FPScmdarg1, "ON", 2) == 0)
-                        {
-                            if(functionparameter_SetParamValue_ONOFF(&fps[fpsindex], FPSentryname,
-                                    1) == EXIT_SUCCESS)
-                            {
-                                updated = 1;
-                            }
-                            functionparameter_outlog("SETVAL", "%-40s ONOFF      ON",
-                                                     FPSentryname);
-                        }
-                        if(strncmp(FPScmdarg1, "OFF", 3) == 0)
-                        {
-                            if(functionparameter_SetParamValue_ONOFF(&fps[fpsindex], FPSentryname,
-                                    0) == EXIT_SUCCESS)
-                            {
-                                updated = 1;
-                            }
-                            functionparameter_outlog("SETVAL", "%-40s ONOFF      OFF",
-                                                     FPSentryname);
-                        }
-                        break;
-
-
-                    case FPTYPE_FPSNAME:
-                        if(functionparameter_SetParamValue_STRING(&fps[fpsindex], FPSentryname,
-                                FPScmdarg1) == EXIT_SUCCESS)
+                        functionparameter_outlog("SETVAL", "%-40s ONOFF      ON", FPSentryname);
+                    }
+                    if (strncmp(FPScmdarg1, "OFF", 3) == 0)
+                    {
+                        if (functionparameter_SetParamValue_ONOFF(&fps[fpsindex], FPSentryname, 0) == EXIT_SUCCESS)
                         {
                             updated = 1;
                         }
-                        functionparameter_outlog("SETVAL", "%-40s FPSNAME   %s",
-                                                 FPSentryname, FPScmdarg1);
-                        break;
+                        functionparameter_outlog("SETVAL", "%-40s ONOFF      OFF", FPSentryname);
+                    }
+                    break;
 
-                    default:
-                        SNPRINTF_CHECK(errmsgstring, STRINGMAXLEN_FPS_LOGMSG,
-                                       "argument type not recognized");
-                        functionparameter_outlog("ERROR", "%s", errmsgstring);
-                        *taskstatus |= FPSTASK_STATUS_ERR_ARGTYPE;
-                        break;
+                case FPTYPE_FPSNAME:
+                    if (functionparameter_SetParamValue_STRING(&fps[fpsindex], FPSentryname, FPScmdarg1) ==
+                        EXIT_SUCCESS)
+                    {
+                        updated = 1;
+                    }
+                    functionparameter_outlog("SETVAL", "%-40s FPSNAME   %s", FPSentryname, FPScmdarg1);
+                    break;
 
+                default:
+                    SNPRINTF_CHECK(errmsgstring, STRINGMAXLEN_FPS_LOGMSG, "argument type not recognized");
+                    functionparameter_outlog("ERROR", "%s", errmsgstring);
+                    *taskstatus |= FPSTASK_STATUS_ERR_ARGTYPE;
+                    break;
                 }
 
                 // notify fpsCTRL that parameter has been updated
-                if(updated == 1)
+                if (updated == 1)
                 {
                     cmdOK = 1;
-                    functionparameter_WriteParameterToDisk(&fps[fpsindex], pindex, "setval",
-                                                           "InputCommandFile");
+                    functionparameter_WriteParameterToDisk(&fps[fpsindex], pindex, "setval", "InputCommandFile");
                     fps[fpsindex].md->signal |= FUNCTION_PARAMETER_STRUCT_SIGNAL_UPDATE;
                 }
                 else
                 {
                     cmdOK = 0;
                 }
-
             }
         }
 
-
-
-
-
         // getval or fwrval
-        if((cmdFOUND == 0)
-                && ((strcmp(FPScommand, "getval") == 0) || (strcmp(FPScommand, "fwrval") == 0)))
+        if ((cmdFOUND == 0) && ((strcmp(FPScommand, "getval") == 0) || (strcmp(FPScommand, "fwrval") == 0)))
         {
             cmdFOUND = 1;
             cmdOK = 0;
 
-            if((strcmp(FPScommand, "getval") == 0) && (nbword != 2))
+            if ((strcmp(FPScommand, "getval") == 0) && (nbword != 2))
             {
                 functionparameter_outlog("ERROR", "COMMAND getval NBARGS = 1");
             }
-            else if((strcmp(FPScommand, "fwrval") == 0) && (nbword != 3))
+            else if ((strcmp(FPScommand, "fwrval") == 0) && (nbword != 3))
             {
                 functionparameter_outlog("ERROR", "COMMAND fwrval NBARGS = 2");
             }
             else
             {
                 errno_t ret;
-                ret = functionparameter_PrintParameter_ValueString(
-                          &fps[fpsindex].parray[pindex], msgstring, STRINGMAXLEN_FPS_LOGMSG);
+                ret = functionparameter_PrintParameter_ValueString(&fps[fpsindex].parray[pindex], msgstring,
+                                                                   STRINGMAXLEN_FPS_LOGMSG);
 
-                if(ret == RETURN_SUCCESS)
+                if (ret == RETURN_SUCCESS)
                 {
                     cmdOK = 1;
                 }
@@ -1327,13 +1132,13 @@ int functionparameter_FPSprocess_cmdline(
 
                 */
 
-                if(cmdOK == 1)
+                if (cmdOK == 1)
                 {
-                    if(strcmp(FPScommand, "getval") == 0)
+                    if (strcmp(FPScommand, "getval") == 0)
                     {
                         functionparameter_outlog("GETVAL", "%s", msgstring);
                     }
-                    if(strcmp(FPScommand, "fwrval") == 0)
+                    if (strcmp(FPScommand, "fwrval") == 0)
                     {
 
                         FILE *fpouttmp = fopen(FPScmdarg1, "a");
@@ -1342,76 +1147,57 @@ int functionparameter_FPSprocess_cmdline(
 
                         functionparameter_outlog("FWRVAL", "%s", msgstring);
                         char msgstring1[STRINGMAXLEN_FPS_LOGMSG];
-                        SNPRINTF_CHECK(msgstring1, STRINGMAXLEN_FPS_LOGMSG, "WROTE to file %s",
-                                       FPScmdarg1);
+                        SNPRINTF_CHECK(msgstring1, STRINGMAXLEN_FPS_LOGMSG, "WROTE to file %s", FPScmdarg1);
                         functionparameter_outlog("FWRVAL", "%s", msgstring1);
                     }
                 }
-
             }
         }
-
-
     }
 
-
-    if(cmdOK == 0)
+    if (cmdOK == 0)
     {
-        SNPRINTF_CHECK(msgstring, STRINGMAXLEN_FPS_LOGMSG, "\"%s\" > %s", FPScmdline,
-                       errmsgstring);
+        SNPRINTF_CHECK(msgstring, STRINGMAXLEN_FPS_LOGMSG, "\"%s\" > %s", FPScmdline, errmsgstring);
         functionparameter_outlog("CMDFAIL", "%s", msgstring);
         *taskstatus |= FPSTASK_STATUS_CMDFAIL;
     }
 
-    if(cmdOK == 1)
+    if (cmdOK == 1)
     {
         SNPRINTF_CHECK(msgstring, STRINGMAXLEN_FPS_LOGMSG, "\"%s\"", FPScmdline);
         functionparameter_outlog("CMDOK", "%s", msgstring);
         *taskstatus |= FPSTASK_STATUS_CMDOK;
     }
 
-    if(cmdFOUND == 0)
+    if (cmdFOUND == 0)
     {
-        SNPRINTF_CHECK(msgstring, STRINGMAXLEN_FPS_LOGMSG, "COMMAND NOT FOUND: %s",
-                       FPScommand);
+        SNPRINTF_CHECK(msgstring, STRINGMAXLEN_FPS_LOGMSG, "COMMAND NOT FOUND: %s", FPScommand);
         functionparameter_outlog("ERROR", "%s", msgstring);
         *taskstatus |= FPSTASK_STATUS_CMDNOTFOUND;
     }
 
-
     DEBUG_TRACEPOINT(" ");
 
-
     return fpsindex;
 }
 
-
-
-
-
-int functionparameter_FPSprocess_cmdfile(
-    char *infname,
-    FUNCTION_PARAMETER_STRUCT *fps,
-    KEYWORD_TREE_NODE *keywnode,
-    FPSCTRL_TASK_QUEUE *fpsctrlqueuelist,
-    FPSCTRL_PROCESS_VARS *fpsCTRLvar
-)
+int functionparameter_FPSprocess_cmdfile(char *infname, FUNCTION_PARAMETER_STRUCT *fps, KEYWORD_TREE_NODE *keywnode,
+                                         FPSCTRL_TASK_QUEUE *fpsctrlqueuelist, FPSCTRL_PROCESS_VARS *fpsCTRLvar)
 {
     FILE *fpinputcmd;
     fpinputcmd = fopen(infname, "r");
 
-    if(fpinputcmd != NULL)
+    if (fpinputcmd != NULL)
     {
         char *FPScmdline = NULL;
         size_t len = 0;
         ssize_t read;
 
-        while((read = getline(&FPScmdline, &len, fpinputcmd)) != -1)
+        while ((read = getline(&FPScmdline, &len, fpinputcmd)) != -1)
         {
             uint64_t taskstatus = 0;
             printf("Processing line : %s\n", FPScmdline);
-            functionparameter_FPSprocess_cmdline(FPScmdline, fpsctrlqueuelist, keywnode,
-                                                 fpsCTRLvar, fps, &taskstatus);
+            functionparameter_FPSprocess_cmdline(FPScmdline, fpsctrlqueuelist, keywnode, fpsCTRLvar, fps, &taskstatus);
         }
         fclose(fpinputcmd);
     }
diff --git a/src/CommandLineInterface/fps_processcmdline.h b/src/CommandLineInterface/fps_processcmdline.h
index 16ba4bfc..cfb7c1ee 100644
--- a/src/CommandLineInterface/fps_processcmdline.h
+++ b/src/CommandLineInterface/fps_processcmdline.h
@@ -8,21 +8,11 @@
 
 #include "function_parameters.h"
 
-int functionparameter_FPSprocess_cmdline(
-    char *FPScmdline,
-    FPSCTRL_TASK_QUEUE *fpsctrlqueuelist,
-    KEYWORD_TREE_NODE *keywnode,
-    FPSCTRL_PROCESS_VARS *fpsCTRLvar,
-    FUNCTION_PARAMETER_STRUCT *fps,
-    uint64_t *taskstatus
-);
+int functionparameter_FPSprocess_cmdline(char *FPScmdline, FPSCTRL_TASK_QUEUE *fpsctrlqueuelist,
+                                         KEYWORD_TREE_NODE *keywnode, FPSCTRL_PROCESS_VARS *fpsCTRLvar,
+                                         FUNCTION_PARAMETER_STRUCT *fps, uint64_t *taskstatus);
 
-int functionparameter_FPSprocess_cmdfile(
-    char *infname,
-    FUNCTION_PARAMETER_STRUCT *fps,
-    KEYWORD_TREE_NODE *keywnode,
-    FPSCTRL_TASK_QUEUE *fpsctrlqueuelist,
-    FPSCTRL_PROCESS_VARS *fpsCTRLvar
-);
+int functionparameter_FPSprocess_cmdfile(char *infname, FUNCTION_PARAMETER_STRUCT *fps, KEYWORD_TREE_NODE *keywnode,
+                                         FPSCTRL_TASK_QUEUE *fpsctrlqueuelist, FPSCTRL_PROCESS_VARS *fpsCTRLvar);
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/CommandLineInterface/fps_processinfo_entries.c b/src/CommandLineInterface/fps_processinfo_entries.c
index 0b418f3c..94117b54 100644
--- a/src/CommandLineInterface/fps_processinfo_entries.c
+++ b/src/CommandLineInterface/fps_processinfo_entries.c
@@ -3,13 +3,10 @@
  * @brief   Add parameters to FPS for real-time process settings
  */
 
-
 #include "CommandLineInterface/CLIcore.h"
 
-
 #include "fps_GetParamIndex.h"
 
-
 /** @brief Add parameters to FPS for real-time process settings
  *
  * Adds standard set of parameters for integration with process info
@@ -18,9 +15,7 @@
  * This function is typically called within the FPCONF fps creation step.
  *
  */
-errno_t fps_add_processinfo_entries(
-    FUNCTION_PARAMETER_STRUCT *fps
-)
+errno_t fps_add_processinfo_entries(FUNCTION_PARAMETER_STRUCT *fps)
 {
     DEBUG_TRACE_FSTART();
 
@@ -28,112 +23,89 @@ errno_t fps_add_processinfo_entries(
     FPFLAG = FPFLAG_DEFAULT_INPUT | FPFLAG_MINLIMIT | FPFLAG_MAXLIMIT;
     FPFLAG &= ~FPFLAG_WRITERUN;
 
-
-
-
     // run time string
-    function_parameter_add_entry(fps, ".conf.timestring", "runstart time string",
-                                 FPTYPE_STRING, FPFLAG, "undef", NULL);
-
+    function_parameter_add_entry(fps, ".conf.timestring", "runstart time string", FPTYPE_STRING, FPFLAG, "undef", NULL);
 
     // custom label
-    function_parameter_add_entry(fps, ".conf.label", "custom label",
-                                 FPTYPE_STRING, FPFLAG, "", NULL);
-
+    function_parameter_add_entry(fps, ".conf.label", "custom label", FPTYPE_STRING, FPFLAG, "", NULL);
 
     // output directory where results are saved
     //
-//	char outdir[FPS_DIR_STRLENMAX];
-//	snprintf(outdir, FPS_DIR_STRLENMAX, "fps.%s", fps->md->name);
-    function_parameter_add_entry(fps, ".conf.datadir", "data directory",
-                                 FPTYPE_DIRNAME, FPFLAG, fps->md->datadir, NULL);
+    //	char outdir[FPS_DIR_STRLENMAX];
+    //	snprintf(outdir, FPS_DIR_STRLENMAX, "fps.%s", fps->md->name);
+    function_parameter_add_entry(fps, ".conf.datadir", "data directory", FPTYPE_DIRNAME, FPFLAG, fps->md->datadir,
+                                 NULL);
 
     // input directory, FPS configuration files ready by FPSsync operation
     //
-//	char confdir[FPS_DIR_STRLENMAX];
-//	snprintf(confdir, FPS_DIR_STRLENMAX, "fpsconfdir-%s", fps->md->name);
-    function_parameter_add_entry(fps, ".conf.confdir", "conf directory",
-                                 FPTYPE_DIRNAME, FPFLAG, fps->md->confdir, NULL);
-
-
+    //	char confdir[FPS_DIR_STRLENMAX];
+    //	snprintf(confdir, FPS_DIR_STRLENMAX, "fpsconfdir-%s", fps->md->name);
+    function_parameter_add_entry(fps, ".conf.confdir", "conf directory", FPTYPE_DIRNAME, FPFLAG, fps->md->confdir,
+                                 NULL);
 
     // Where results are archived
     //
-    function_parameter_add_entry(fps, ".conf.archivedir", "archive directory",
-                                 FPTYPE_DIRNAME, FPFLAG, NULL, NULL);
-
-
+    function_parameter_add_entry(fps, ".conf.archivedir", "archive directory", FPTYPE_DIRNAME, FPFLAG, NULL, NULL);
 
     // value = -1 indicates no RT priority
-    long RTprio_default[4] = { fps->cmdset.RT_priority, -1, 49, 20 };
-    function_parameter_add_entry(fps, ".procinfo.RTprio", "RTprio",
-                                 FPTYPE_INT64, FPFLAG, &RTprio_default, NULL);
+    long RTprio_default[4] = {fps->cmdset.RT_priority, -1, 49, 20};
+    function_parameter_add_entry(fps, ".procinfo.RTprio", "RTprio", FPTYPE_INT64, FPFLAG, &RTprio_default, NULL);
 
     // cset
-    function_parameter_add_entry(fps, ".procinfo.cset", "CPUs set",
-                                 FPTYPE_STRING, FPFLAG, "system", NULL);
+    function_parameter_add_entry(fps, ".procinfo.cset", "CPUs set", FPTYPE_STRING, FPFLAG, "system", NULL);
 
     // taskset
-    function_parameter_add_entry(fps, ".procinfo.taskset", "CPUs mask",
-                                 FPTYPE_STRING, FPFLAG, "1-127", NULL);
+    function_parameter_add_entry(fps, ".procinfo.taskset", "CPUs mask", FPTYPE_STRING, FPFLAG, "1-127", NULL);
 
     // value = 0 indicates process will adjust to available nb cores
-    long maxNBthread_default[4] = { 1, 0, 50, 1 };
-    function_parameter_add_entry(fps, ".procinfo.NBthread", "max NB threads",
-                                 FPTYPE_INT64, FPFLAG, &maxNBthread_default, NULL);
+    long maxNBthread_default[4] = {1, 0, 50, 1};
+    function_parameter_add_entry(fps, ".procinfo.NBthread", "max NB threads", FPTYPE_INT64, FPFLAG,
+                                 &maxNBthread_default, NULL);
 
     // PROCESSINFO
     long fp_pinfoenabled = 0;
-    function_parameter_add_entry(fps, ".procinfo.enabled", "procinfo mode",
-                                 FPTYPE_ONOFF, FPFLAG, NULL, &fp_pinfoenabled);
+    function_parameter_add_entry(fps, ".procinfo.enabled", "procinfo mode", FPTYPE_ONOFF, FPFLAG, NULL,
+                                 &fp_pinfoenabled);
     fps->parray[fp_pinfoenabled].fpflag |= FPFLAG_ONOFF;
 
-
     // no max limit
     FPFLAG = FPFLAG_DEFAULT_INPUT | FPFLAG_MINLIMIT;
     FPFLAG &= ~FPFLAG_WRITERUN;
     // value = -1 indicates infinite loop
-    long loopcntMax_default[4] = { fps->cmdset.procinfo_loopcntMax, -1, 5000000, 1 };
-    function_parameter_add_entry(fps, ".procinfo.loopcntMax", "max loop cnt",
-                                 FPTYPE_INT64, FPFLAG, &loopcntMax_default, NULL);
-
+    long loopcntMax_default[4] = {fps->cmdset.procinfo_loopcntMax, -1, 5000000, 1};
+    function_parameter_add_entry(fps, ".procinfo.loopcntMax", "max loop cnt", FPTYPE_INT64, FPFLAG, &loopcntMax_default,
+                                 NULL);
 
-    long triggermode_default[4] = { fps->cmdset.triggermode, -1, 10, 0 };
-    function_parameter_add_entry(fps, ".procinfo.triggermode", "trigger mode",
-                                 FPTYPE_INT64, FPFLAG, &triggermode_default, NULL);
+    long triggermode_default[4] = {fps->cmdset.triggermode, -1, 10, 0};
+    function_parameter_add_entry(fps, ".procinfo.triggermode", "trigger mode", FPTYPE_INT64, FPFLAG,
+                                 &triggermode_default, NULL);
 
-    function_parameter_add_entry(fps, ".procinfo.triggersname", "trigger stream name",
-                                 FPTYPE_STREAMNAME, FPFLAG, fps->cmdset.triggerstreamname, NULL);
+    function_parameter_add_entry(fps, ".procinfo.triggersname", "trigger stream name", FPTYPE_STREAMNAME, FPFLAG,
+                                 fps->cmdset.triggerstreamname, NULL);
 
     // -1 : auto (recommended)
-    long semindexrequested_default[4] = { fps->cmdset.semindexrequested, -1, 10, 0 };
-    function_parameter_add_entry(fps, ".procinfo.semindexrequested", "trigger requested semaphore index",
-                                 FPTYPE_INT64, FPFLAG, &semindexrequested_default, NULL);
+    long semindexrequested_default[4] = {fps->cmdset.semindexrequested, -1, 10, 0};
+    function_parameter_add_entry(fps, ".procinfo.semindexrequested", "trigger requested semaphore index", FPTYPE_INT64,
+                                 FPFLAG, &semindexrequested_default, NULL);
 
-    struct timespec triggerdelay_default[2] = { fps->cmdset.triggerdelay, {0,0}};
-    function_parameter_add_entry(fps, ".procinfo.triggerdelay", "trigger delay",
-                                 FPTYPE_TIMESPEC, FPFLAG, &triggerdelay_default, NULL);
-
-    struct timespec triggertimeout_default[2] = { fps->cmdset.triggertimeout, {0,0}};
-    function_parameter_add_entry(fps, ".procinfo.triggertimeout", "trigger timeout",
-                                 FPTYPE_TIMESPEC, FPFLAG, &triggertimeout_default, NULL);
+    struct timespec triggerdelay_default[2] = {fps->cmdset.triggerdelay, {0, 0}};
+    function_parameter_add_entry(fps, ".procinfo.triggerdelay", "trigger delay", FPTYPE_TIMESPEC, FPFLAG,
+                                 &triggerdelay_default, NULL);
 
+    struct timespec triggertimeout_default[2] = {fps->cmdset.triggertimeout, {0, 0}};
+    function_parameter_add_entry(fps, ".procinfo.triggertimeout", "trigger timeout", FPTYPE_TIMESPEC, FPFLAG,
+                                 &triggertimeout_default, NULL);
 
     DEBUG_TRACE_FEXIT();
     return RETURN_SUCCESS;
 }
 
-
-
-errno_t fps_to_processinfo(
-    FUNCTION_PARAMETER_STRUCT *fps,
-    PROCESSINFO *procinfo
-)
+errno_t fps_to_processinfo(FUNCTION_PARAMETER_STRUCT *fps, PROCESSINFO *procinfo)
 {
     DEBUG_TRACE_FSTART();
 
     DEBUG_TRACEPOINT("Checking fps pointer");
-    if ( fps == NULL )
+    if (fps == NULL)
     {
         PRINT_ERROR("Null pointer - cannot proceed\n");
         abort();
@@ -141,28 +113,20 @@ errno_t fps_to_processinfo(
 
     DEBUG_TRACEPOINT("set RT_priority if applicable");
     {
-        long pindex = functionparameter_GetParamIndex(
-                          fps,
-                          ".procinfo.RTprio");
-        if(pindex > -1)
+        long pindex = functionparameter_GetParamIndex(fps, ".procinfo.RTprio");
+        if (pindex > -1)
         {
-            long RTprio = functionparameter_GetParamValue_INT64(
-                              fps,
-                              ".procinfo.RTprio");
+            long RTprio = functionparameter_GetParamValue_INT64(fps, ".procinfo.RTprio");
             procinfo->RT_priority = RTprio;
         }
     }
 
     DEBUG_TRACEPOINT("set loopcntMax if applicable");
     {
-        long pindex = functionparameter_GetParamIndex(
-                          fps,
-                          ".procinfo.loopcntMax");
-        if(pindex > -1)
+        long pindex = functionparameter_GetParamIndex(fps, ".procinfo.loopcntMax");
+        if (pindex > -1)
         {
-            long loopcntMax = functionparameter_GetParamValue_INT64(
-                                  fps,
-                                  ".procinfo.loopcntMax");
+            long loopcntMax = functionparameter_GetParamValue_INT64(fps, ".procinfo.loopcntMax");
             procinfo->loopcntMax = loopcntMax;
         }
     }
@@ -170,20 +134,15 @@ errno_t fps_to_processinfo(
     DEBUG_TRACEPOINT("set triggermode if applicable");
     {
 
-        long pindex = functionparameter_GetParamIndex(
-                          fps,
-                          ".procinfo.triggermode");
-        if(pindex > -1)
+        long pindex = functionparameter_GetParamIndex(fps, ".procinfo.triggermode");
+        if (pindex > -1)
         {
-            long triggermode = functionparameter_GetParamValue_INT64(
-                                   fps,
-                                   ".procinfo.triggermode");
+            long triggermode = functionparameter_GetParamValue_INT64(fps, ".procinfo.triggermode");
             procinfo->triggermode = triggermode;
             printf(">>>>>>>>>>>>> SET TRIGGERMODE = %ld\n", triggermode);
         }
     }
 
-
     DEBUG_TRACE_FEXIT();
     return RETURN_SUCCESS;
 }
diff --git a/src/CommandLineInterface/fps_processinfo_entries.h b/src/CommandLineInterface/fps_processinfo_entries.h
index 0a5a93c1..e791b9ba 100644
--- a/src/CommandLineInterface/fps_processinfo_entries.h
+++ b/src/CommandLineInterface/fps_processinfo_entries.h
@@ -6,11 +6,11 @@
 #ifndef FPS_ADD_RTSETTING_ENTRIES_H
 #define FPS_ADD_RTSETTING_ENTRIES_H
 
-#include "processinfo.h"
 #include "function_parameters.h"
+#include "processinfo.h"
 
 errno_t fps_add_processinfo_entries(FUNCTION_PARAMETER_STRUCT *fps);
 
 errno_t fps_to_processinfo(FUNCTION_PARAMETER_STRUCT *fps, PROCESSINFO *procinfo);
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/CommandLineInterface/fps_read_fpsCMD_fifo.c b/src/CommandLineInterface/fps_read_fpsCMD_fifo.c
index cd80e793..bbc9dd83 100644
--- a/src/CommandLineInterface/fps_read_fpsCMD_fifo.c
+++ b/src/CommandLineInterface/fps_read_fpsCMD_fifo.c
@@ -2,17 +2,12 @@
  * @file    fps_read_fpsCMD_fifo.c
  */
 
-
 #include "CommandLineInterface/CLIcore.h"
 
-
 // fill up task list from fifo submissions
 
-int functionparameter_read_fpsCMD_fifo(
-    int fpsCTRLfifofd,
-    FPSCTRL_TASK_ENTRY *fpsctrltasklist,
-    FPSCTRL_TASK_QUEUE *fpsctrlqueuelist
-)
+int functionparameter_read_fpsCMD_fifo(int fpsCTRLfifofd, FPSCTRL_TASK_ENTRY *fpsctrltasklist,
+                                       FPSCTRL_TASK_QUEUE *fpsctrlqueuelist)
 {
     int cmdcnt = 0;
     char *FPScmdline = NULL;
@@ -26,47 +21,41 @@ int functionparameter_read_fpsCMD_fifo(
     static int waitonrun = 0;
     static int waitonconf = 0;
 
-
-
-    static uint16_t	cmdinputcnt = 0;
+    static uint16_t cmdinputcnt = 0;
 
     int lineOK = 1; // keep reading
 
-
     DEBUG_TRACEPOINT(" ");
 
-    while(lineOK == 1)
+    while (lineOK == 1)
     {
         total_bytes = 0;
         lineOK = 0;
-        for(;;)
+        for (;;)
         {
-            bytes = read(fpsCTRLfifofd, buf0, 1);  // read one char at a time
+            bytes = read(fpsCTRLfifofd, buf0, 1); // read one char at a time
             DEBUG_TRACEPOINT("ERRROR: BUFFER OVERFLOW %d %d\n", bytes, total_bytes);
-            if(bytes > 0)
+            if (bytes > 0)
             {
                 buff[total_bytes] = buf0[0];
                 total_bytes += (size_t)bytes;
-
             }
             else
             {
-                if(errno == EWOULDBLOCK)
+                if (errno == EWOULDBLOCK)
                 {
                     break;
                 }
-                else     // read 0 byte
+                else // read 0 byte
                 {
                     //perror("read 0 byte");
                     return cmdcnt;
                 }
             }
 
-
             DEBUG_TRACEPOINT(" ");
 
-
-            if(buf0[0] == '\n')
+            if (buf0[0] == '\n')
             {
                 // reached end of line
                 // -> process command
@@ -75,45 +64,39 @@ int functionparameter_read_fpsCMD_fifo(
                 buff[total_bytes - 1] = '\0';
                 FPScmdline = buff;
 
-
-
                 // find next index
                 int cmdindex = 0;
                 int cmdindexOK = 0;
-                while((cmdindexOK == 0) && (cmdindex < NB_FPSCTRL_TASK_MAX))
+                while ((cmdindexOK == 0) && (cmdindex < NB_FPSCTRL_TASK_MAX))
                 {
-                    if(fpsctrltasklist[cmdindex].status == 0)
+                    if (fpsctrltasklist[cmdindex].status == 0)
                     {
                         cmdindexOK = 1;
                     }
                     else
                     {
-                        cmdindex ++;
+                        cmdindex++;
                     }
                 }
 
-
-                if(cmdindex == NB_FPSCTRL_TASK_MAX)
+                if (cmdindex == NB_FPSCTRL_TASK_MAX)
                 {
                     printf("ERROR: fpscmdarray is full\n");
                     exit(0);
                 }
 
-
                 DEBUG_TRACEPOINT(" ");
 
                 // Some commands affect how the task list is configured instead of being inserted as entries
                 int cmdFOUND = 0;
 
-
-                if((FPScmdline[0] == '#') || (FPScmdline[0] == ' ') || (total_bytes<2))       // disregard line
+                if ((FPScmdline[0] == '#') || (FPScmdline[0] == ' ') || (total_bytes < 2)) // disregard line
                 {
                     cmdFOUND = 1;
                 }
 
                 // set wait on run ON
-                if((cmdFOUND == 0)
-                        && (strncmp(FPScmdline, "taskcntzero", strlen("taskcntzero")) == 0))
+                if ((cmdFOUND == 0) && (strncmp(FPScmdline, "taskcntzero", strlen("taskcntzero")) == 0))
                 {
                     cmdFOUND = 1;
                     cmdinputcnt = 0;
@@ -121,30 +104,28 @@ int functionparameter_read_fpsCMD_fifo(
 
                 // Set queue index
                 // entries will now be placed in queue specified by this command
-                if((cmdFOUND == 0)
-                        && (strncmp(FPScmdline, "setqindex", strlen("setqindex")) == 0))
+                if ((cmdFOUND == 0) && (strncmp(FPScmdline, "setqindex", strlen("setqindex")) == 0))
                 {
                     cmdFOUND = 1;
                     char stringtmp[200];
                     int queue_index;
                     sscanf(FPScmdline, "%s %d", stringtmp, &queue_index);
 
-                    if((queue_index > -1) && (queue_index < NB_FPSCTRL_TASKQUEUE_MAX))
+                    if ((queue_index > -1) && (queue_index < NB_FPSCTRL_TASKQUEUE_MAX))
                     {
                         queue = queue_index;
                     }
                 }
 
                 // Set queue priority
-                if((cmdFOUND == 0)
-                        && (strncmp(FPScmdline, "setqprio", strlen("setqprio")) == 0))
+                if ((cmdFOUND == 0) && (strncmp(FPScmdline, "setqprio", strlen("setqprio")) == 0))
                 {
                     cmdFOUND = 1;
                     char stringtmp[200];
                     int queue_priority;
                     sscanf(FPScmdline, "%s %d", stringtmp, &queue_priority);
 
-                    if(queue_priority < 0)
+                    if (queue_priority < 0)
                     {
                         queue_priority = 0;
                     }
@@ -152,50 +133,42 @@ int functionparameter_read_fpsCMD_fifo(
                     fpsctrlqueuelist[queue].priority = queue_priority;
                 }
 
-
-
                 // set wait on run ON
-                if((cmdFOUND == 0)
-                        && (strncmp(FPScmdline, "waitonrunON", strlen("waitonrunON")) == 0))
+                if ((cmdFOUND == 0) && (strncmp(FPScmdline, "waitonrunON", strlen("waitonrunON")) == 0))
                 {
                     cmdFOUND = 1;
                     waitonrun = 1;
                 }
 
                 // set wait on run OFF
-                if((cmdFOUND == 0)
-                        && (strncmp(FPScmdline, "waitonrunOFF", strlen("waitonrunOFF")) == 0))
+                if ((cmdFOUND == 0) && (strncmp(FPScmdline, "waitonrunOFF", strlen("waitonrunOFF")) == 0))
                 {
                     cmdFOUND = 1;
                     waitonrun = 0;
                 }
 
                 // set wait on conf ON
-                if((cmdFOUND == 0)
-                        && (strncmp(FPScmdline, "waitonconfON", strlen("waitonconfON")) == 0))
+                if ((cmdFOUND == 0) && (strncmp(FPScmdline, "waitonconfON", strlen("waitonconfON")) == 0))
                 {
                     cmdFOUND = 1;
                     waitonconf = 1;
                 }
 
                 // set wait on conf OFF
-                if((cmdFOUND == 0)
-                        && (strncmp(FPScmdline, "waitonconfOFF", strlen("waitonconfOFF")) == 0))
+                if ((cmdFOUND == 0) && (strncmp(FPScmdline, "waitonconfOFF", strlen("waitonconfOFF")) == 0))
                 {
                     cmdFOUND = 1;
                     waitonconf = 0;
                 }
 
-
                 // set wait point for arbitrary FPS run to have finished
 
                 DEBUG_TRACEPOINT(" ");
 
                 // for all other commands, put in task list
-                if(cmdFOUND == 0)
+                if (cmdFOUND == 0)
                 {
-                    strncpy(fpsctrltasklist[cmdindex].cmdstring, FPScmdline,
-                            STRINGMAXLEN_FPS_CMDLINE-1);
+                    strncpy(fpsctrltasklist[cmdindex].cmdstring, FPScmdline, STRINGMAXLEN_FPS_CMDLINE - 1);
 
                     fpsctrltasklist[cmdindex].status = FPSTASK_STATUS_ACTIVE | FPSTASK_STATUS_SHOW;
                     fpsctrltasklist[cmdindex].inputindex = cmdinputcnt;
@@ -205,8 +178,7 @@ int functionparameter_read_fpsCMD_fifo(
                     // waiting to be processed
                     fpsctrltasklist[cmdindex].status |= FPSTASK_STATUS_WAITING;
 
-
-                    if(waitonrun == 1)
+                    if (waitonrun == 1)
                     {
                         fpsctrltasklist[cmdindex].flag |= FPSTASK_FLAG_WAITONRUN;
                     }
@@ -215,7 +187,7 @@ int functionparameter_read_fpsCMD_fifo(
                         fpsctrltasklist[cmdindex].flag &= ~FPSTASK_FLAG_WAITONRUN;
                     }
 
-                    if(waitonconf == 1)
+                    if (waitonconf == 1)
                     {
                         fpsctrltasklist[cmdindex].flag |= FPSTASK_FLAG_WAITONCONF;
                     }
@@ -226,17 +198,15 @@ int functionparameter_read_fpsCMD_fifo(
 
                     cmdinputcnt++;
 
-                    cmdcnt ++;
+                    cmdcnt++;
                 }
                 lineOK = 1;
                 break;
             }
         }
-
     }
 
     DEBUG_TRACEPOINT(" ");
 
     return cmdcnt;
 }
-
diff --git a/src/CommandLineInterface/fps_read_fpsCMD_fifo.h b/src/CommandLineInterface/fps_read_fpsCMD_fifo.h
index 2e8067ee..95226bfe 100644
--- a/src/CommandLineInterface/fps_read_fpsCMD_fifo.h
+++ b/src/CommandLineInterface/fps_read_fpsCMD_fifo.h
@@ -7,10 +7,7 @@
 
 #include "function_parameters.h"
 
-int functionparameter_read_fpsCMD_fifo(
-    int fpsCTRLfifofd,
-    FPSCTRL_TASK_ENTRY *fpsctrltasklist,
-    FPSCTRL_TASK_QUEUE *fpsctrlqueuelist
-);
+int functionparameter_read_fpsCMD_fifo(int fpsCTRLfifofd, FPSCTRL_TASK_ENTRY *fpsctrltasklist,
+                                       FPSCTRL_TASK_QUEUE *fpsctrlqueuelist);
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/CommandLineInterface/fps_save2disk.c b/src/CommandLineInterface/fps_save2disk.c
index 29b5fa22..80db156d 100644
--- a/src/CommandLineInterface/fps_save2disk.c
+++ b/src/CommandLineInterface/fps_save2disk.c
@@ -3,61 +3,41 @@
  * @brief   Save FPS content to disk
  */
 
-
-#include <sys/stat.h> // fstat
-#include <sys/syscall.h> // needed for tid = syscall(SYS_gettid);
 #include <dirent.h>
+#include <sys/stat.h>    // fstat
+#include <sys/syscall.h> // needed for tid = syscall(SYS_gettid);
 
+#include "COREMOD_iofits/COREMOD_iofits.h"
 #include "CommandLineInterface/CLIcore.h"
 #include "CommandLineInterface/timeutils.h"
-#include "COREMOD_iofits/COREMOD_iofits.h"
 
 #include "fps_GetParamIndex.h"
-#include "fps_printparameter_valuestring.h"
 #include "fps_WriteParameterToDisk.h"
+#include "fps_printparameter_valuestring.h"
 
-
-
-
-
-int functionparameter_SaveParam2disk(
-    FUNCTION_PARAMETER_STRUCT *fpsentry,
-    const char *paramname
-)
+int functionparameter_SaveParam2disk(FUNCTION_PARAMETER_STRUCT *fpsentry, const char *paramname)
 {
     int pindex;
 
     pindex = functionparameter_GetParamIndex(fpsentry, paramname);
-    functionparameter_WriteParameterToDisk(fpsentry, pindex, "setval",
-                                           "SaveParam2disk");
+    functionparameter_WriteParameterToDisk(fpsentry, pindex, "setval", "SaveParam2disk");
 
     return RETURN_SUCCESS;
 }
 
-
-
-
-
-
-
-int functionparameter_SaveFPS2disk_dir(
-    FUNCTION_PARAMETER_STRUCT *fpsentry,
-    char *dirname
-)
+int functionparameter_SaveFPS2disk_dir(FUNCTION_PARAMETER_STRUCT *fpsentry, char *dirname)
 {
     char fname[STRINGMAXLEN_FULLFILENAME];
     FILE *fpoutval;
     int stringmaxlen = 500;
     char outfpstring[stringmaxlen];
 
-
     struct stat st = {0};
-    if(stat(dirname, &st) == -1)
+    if (stat(dirname, &st) == -1)
     {
         mkdir(dirname, 0700);
     }
 
-
     sprintf(fname, "%s/%s.fps", dirname, fpsentry->md->name);
     fpoutval = fopen(fname, "w");
 
@@ -74,42 +54,33 @@ int functionparameter_SaveFPS2disk_dir(
     struct tm *uttime;
     uttime = gmtime(&now);
 
-
-    sprintf(timestring, "%04d-%02d-%02dT%02d:%02d:%02d.%09ld",
-            1900 + uttime->tm_year, 1 + uttime->tm_mon, uttime->tm_mday, uttime->tm_hour,
-            uttime->tm_min,  uttime->tm_sec, tnow.tv_nsec);
-
+    sprintf(timestring, "%04d-%02d-%02dT%02d:%02d:%02d.%09ld", 1900 + uttime->tm_year, 1 + uttime->tm_mon,
+            uttime->tm_mday, uttime->tm_hour, uttime->tm_min, uttime->tm_sec, tnow.tv_nsec);
 
     fprintf(fpoutval, "# TIMESTRING %s\n", timestring);
     fprintf(fpoutval, "# PID        %d\n", getpid());
-    fprintf(fpoutval, "# TID        %d\n", (int) tid);
+    fprintf(fpoutval, "# TID        %d\n", (int)tid);
     fprintf(fpoutval, "#\n");
 
-    for(int pindex = 0; pindex < fpsentry->md->NBparamMAX; pindex++)
+    for (int pindex = 0; pindex < fpsentry->md->NBparamMAX; pindex++)
     {
-        errno_t ret = functionparameter_PrintParameter_ValueString(
-                          &fpsentry->parray[pindex], outfpstring, stringmaxlen);
-        if(ret == RETURN_SUCCESS)
+        errno_t ret =
+            functionparameter_PrintParameter_ValueString(&fpsentry->parray[pindex], outfpstring, stringmaxlen);
+        if (ret == RETURN_SUCCESS)
         {
             fprintf(fpoutval, "%s\n", outfpstring);
         }
-
     }
     fclose(fpoutval);
 
-
     return RETURN_SUCCESS;
 }
 
-
-
 /** @brief save entire FPS to disk
  *
  * Writes in subdirectory fpslog
  */
-int functionparameter_SaveFPS2disk(
-    FUNCTION_PARAMETER_STRUCT *fps
-)
+int functionparameter_SaveFPS2disk(FUNCTION_PARAMETER_STRUCT *fps)
 {
     char outdir[STRINGMAXLEN_DIRNAME];
     WRITE_DIRNAME(outdir, "%s", fps->md->datadir);
@@ -122,22 +93,16 @@ int functionparameter_SaveFPS2disk(
     mkUTtimestring_microsec(timestring, fps->md->runpidstarttime);
     mkUTtimestring_microsec_now(timestringnow);
 
-
     char ffname[STRINGMAXLEN_FULLFILENAME];
     FILE *fpout;
     WRITE_FULLFILENAME(ffname, "%s/%s.fps.outlog", fps->md->datadir, fps->md->name);
     fpout = fopen(ffname, "w");
-    fprintf(fpout, "%s %s %s fps %s %s fps\n", timestring, timestringnow,
-            fps->md->name, fps->md->name, fps->md->name);
+    fprintf(fpout, "%s %s %s fps %s %s fps\n", timestring, timestringnow, fps->md->name, fps->md->name, fps->md->name);
     fclose(fpout);
 
-
     return RETURN_SUCCESS;
 }
 
-
-
-
 /** @brief Write archive script to .log2fps entry
  *
  * Funciton to be executed inside fps->md->datadir.
@@ -152,9 +117,7 @@ int functionparameter_SaveFPS2disk(
  * File loglist.dat in directory .conf.dirname
  *
  */
-errno_t	functionparameter_write_archivescript(
-    FUNCTION_PARAMETER_STRUCT *fps
-)
+errno_t functionparameter_write_archivescript(FUNCTION_PARAMETER_STRUCT *fps)
 {
     // Write archive script
     // to be executed to archive most recent calibration data
@@ -165,12 +128,9 @@ errno_t	functionparameter_write_archivescript(
 
     char datadirname[STRINGMAXLEN_DIRNAME];
 
-
     char timestring[FUNCTION_PARAMETER_STRMAXLEN];
-    strncpy(timestring, functionparameter_GetParamPtr_STRING(fps,
-            ".conf.timestring"), FUNCTION_PARAMETER_STRMAXLEN - 1);
-
-
+    strncpy(timestring, functionparameter_GetParamPtr_STRING(fps, ".conf.timestring"),
+            FUNCTION_PARAMETER_STRMAXLEN - 1);
 
     WRITE_FULLFILENAME(ffname, "archlogscript.bash");
 
@@ -184,47 +144,39 @@ errno_t	functionparameter_write_archivescript(
     datestring[8] = '\0';
 
     // save FPS
-    WRITE_DIRNAME(datadirname, "../datadir/%s/%s/fps.%s", datestring, fps->md->name,
-                  fps->md->name);
+    WRITE_DIRNAME(datadirname, "../datadir/%s/%s/fps.%s", datestring, fps->md->name, fps->md->name);
     fprintf(fplogscript, "mkdir -p %s\n", datadirname);
-    fprintf(fplogscript, "cp fps.%s.dat %s/fps.%s.%s.dat\n", fps->md->name,
-            datadirname, fps->md->name, timestring);
+    fprintf(fplogscript, "cp fps.%s.dat %s/fps.%s.%s.dat\n", fps->md->name, datadirname, fps->md->name, timestring);
 
     // save files listed in loglist.dat
     FILE *fploglist;
     char loglistfname[STRINGMAXLEN_FULLFILENAME];
     WRITE_FULLFILENAME(loglistfname, "loglist.dat");
     fploglist = fopen(loglistfname, "r");
-    if(fploglist != NULL)
+    if (fploglist != NULL)
     {
         char *line = NULL;
         size_t llen = 0;
         char logfname[STRINGMAXLEN_FILENAME];
 
-        while(getline(&line, &llen, fploglist) != -1)
+        while (getline(&line, &llen, fploglist) != -1)
         {
             sscanf(line, "%s", logfname);
-            WRITE_DIRNAME(datadirname, "../datadir/%s/%s/%s", datestring, fps->md->name,
-                          logfname);
+            WRITE_DIRNAME(datadirname, "../datadir/%s/%s/%s", datestring, fps->md->name, logfname);
             fprintf(fplogscript, "mkdir -p %s\n", datadirname);
-            fprintf(fplogscript, "cp -r %s %s/%s.%s\n", logfname, datadirname, logfname,
-                    timestring);
+            fprintf(fplogscript, "cp -r %s %s/%s.%s\n", logfname, datadirname, logfname, timestring);
         }
         fclose(fploglist);
     }
 
     fclose(fplogscript);
-    chmod(ffname, S_IRWXU | S_IRWXG  | S_IROTH);
+    chmod(ffname, S_IRWXU | S_IRWXG | S_IROTH);
 
-//    functionparameter_SetParamValue_STRING(fps, ".conf.archivescript", ffname);
+    //    functionparameter_SetParamValue_STRING(fps, ".conf.archivescript", ffname);
 
     return RETURN_SUCCESS;
 }
 
-
-
-
-
 /** @brief Save image as FITS
  *
  * Standard function to save output of FPS RUN function.
@@ -233,11 +185,7 @@ errno_t	functionparameter_write_archivescript(
  * outname.fits.
  *
  */
-errno_t fps_write_RUNoutput_image(
-    FUNCTION_PARAMETER_STRUCT *fps,
-    const char *imagename,
-    const char *outname
-)
+errno_t fps_write_RUNoutput_image(FUNCTION_PARAMETER_STRUCT *fps, const char *imagename, const char *outname)
 {
     char ffname[STRINGMAXLEN_FULLFILENAME];
     char timestring[100];
@@ -253,28 +201,19 @@ errno_t fps_write_RUNoutput_image(
     FILE *fpout;
     WRITE_FULLFILENAME(ffname, "%s/%s.fits.outlog", fps->md->datadir, outname);
     fpout = fopen(ffname, "w");
-    fprintf(fpout, "%s %s %s fits %s %s fits\n", timestring, timestringnow, outname,
-            fps->md->name, outname);
+    fprintf(fpout, "%s %s %s fits %s %s fits\n", timestring, timestringnow, outname, fps->md->name, outname);
     fclose(fpout);
 
-
     return RETURN_SUCCESS;
 }
 
-
-
-
 /** @brief Save text file
  *
  * Standard function to save output of FPS RUN function.
  *
  *
  */
-FILE *fps_write_RUNoutput_file(
-    FUNCTION_PARAMETER_STRUCT *fps,
-    const char *filename,
-    const char *extension
-)
+FILE *fps_write_RUNoutput_file(FUNCTION_PARAMETER_STRUCT *fps, const char *filename, const char *extension)
 {
     FILE *fp;
 
@@ -290,28 +229,21 @@ FILE *fps_write_RUNoutput_file(
     fp = fopen(ffname, "w");
 
     FILE *fpout;
-    WRITE_FULLFILENAME(ffname, "%s/%s.%s.outlog", fps->md->datadir, filename,
-                       extension);
+    WRITE_FULLFILENAME(ffname, "%s/%s.%s.outlog", fps->md->datadir, filename, extension);
     fpout = fopen(ffname, "w");
-    fprintf(fpout, "%s %s %s %s %s %s %s\n", timestring, timestringnow, filename,
-            extension, fps->md->name, filename, extension);
+    fprintf(fpout, "%s %s %s %s %s %s %s\n", timestring, timestringnow, filename, extension, fps->md->name, filename,
+            extension);
     fclose(fpout);
 
-
     return fp;
 }
 
-
-
-
-
-
 /** @brief Get file extension
  */
 static char *get_filename_ext(const char *filename)
 {
     char *dot = strrchr(filename, '.');
-    if(!dot || dot == filename)
+    if (!dot || dot == filename)
     {
         return "";
     }
@@ -322,20 +254,19 @@ static char *remove_filename_ext(const char *filename)
 {
     char *tmpstring;
 
-    if((tmpstring = malloc(strlen(filename) + 1)) == NULL)
+    if ((tmpstring = malloc(strlen(filename) + 1)) == NULL)
     {
         return NULL;
     }
     strcpy(tmpstring, filename);
     char *lastdot = strrchr(tmpstring, '.');
-    if(lastdot != NULL)
+    if (lastdot != NULL)
     {
         *lastdot = '\0';
     }
     return tmpstring;
 }
 
-
 /** @brief Copy file
  */
 static errno_t filecopy(char *sourcefilename, char *destfilename)
@@ -344,21 +275,20 @@ static errno_t filecopy(char *sourcefilename, char *destfilename)
     char ch;
     int pos;
 
-    if((fp1 = fopen(sourcefilename, "r")) == NULL)
+    if ((fp1 = fopen(sourcefilename, "r")) == NULL)
     {
         printf("Cannot open file \"%s\" \n", sourcefilename);
         return RETURN_FAILURE;
     }
 
-
     fp2 = fopen(destfilename, "w");
 
     fseek(fp1, 0L, SEEK_END); // file pointer at end of file
     pos = ftell(fp1);
     fseek(fp1, 0L, SEEK_SET); // file pointer set at start
-    while(pos--)
+    while (pos--)
     {
-        ch = fgetc(fp1);  // copying file character by character
+        ch = fgetc(fp1); // copying file character by character
         fputc(ch, fp2);
     }
     fclose(fp1);
@@ -367,8 +297,6 @@ static errno_t filecopy(char *sourcefilename, char *destfilename)
     return RETURN_SUCCESS;
 }
 
-
-
 /** @brief Save FPS from datadir to confdir
  *
  *	Scan datadir, looking for .outlog file(s).
@@ -376,37 +304,32 @@ static errno_t filecopy(char *sourcefilename, char *destfilename)
  * For each such file, copy <file>.outlog and <file> from datadir to confdir.
  *
  */
-errno_t fps_datadir_to_confdir(
-    FUNCTION_PARAMETER_STRUCT *fps
-)
+errno_t fps_datadir_to_confdir(FUNCTION_PARAMETER_STRUCT *fps)
 {
-    struct dirent *indirentry;  // Pointer for directory entry
-    char *file_ext; // extension
-
+    struct dirent *indirentry; // Pointer for directory entry
+    char *file_ext;            // extension
 
     // opendir() returns a pointer of DIR type.
     DIR *indir = opendir(fps->md->datadir);
-    if(indir == NULL)   // opendir returns NULL if couldn't open directory
+    if (indir == NULL) // opendir returns NULL if couldn't open directory
     {
         printf("Cannot open directory \"%s\"\n", fps->md->datadir);
         return RETURN_FAILURE;
     }
 
     DIR *outdir = opendir(fps->md->confdir);
-    if(outdir == NULL)   // opendir returns NULL if couldn't open directory
+    if (outdir == NULL) // opendir returns NULL if couldn't open directory
     {
         printf("Cannot open directory\"%s\"", fps->md->confdir);
         return RETURN_FAILURE;
     }
 
-
-
-    while((indirentry = readdir(indir)) != NULL)
+    while ((indirentry = readdir(indir)) != NULL)
     {
         printf("%s\n", indirentry->d_name);
         file_ext = get_filename_ext(indirentry->d_name);
 
-        if(strcmp(file_ext, "outlog") == 0)
+        if (strcmp(file_ext, "outlog") == 0)
         {
             char ffnamein[STRINGMAXLEN_FULLFILENAME];
             char ffnameout[STRINGMAXLEN_FULLFILENAME];
@@ -431,4 +354,3 @@ errno_t fps_datadir_to_confdir(
 
     return RETURN_SUCCESS;
 }
-
diff --git a/src/CommandLineInterface/fps_save2disk.h b/src/CommandLineInterface/fps_save2disk.h
index 677642dd..7b37f710 100644
--- a/src/CommandLineInterface/fps_save2disk.h
+++ b/src/CommandLineInterface/fps_save2disk.h
@@ -8,42 +8,18 @@
 
 #include "function_parameters.h"
 
-int functionparameter_SaveParam2disk(
-    FUNCTION_PARAMETER_STRUCT *fpsentry,
-    const char *paramname
-);
+int functionparameter_SaveParam2disk(FUNCTION_PARAMETER_STRUCT *fpsentry, const char *paramname);
 
+int functionparameter_SaveFPS2disk_dir(FUNCTION_PARAMETER_STRUCT *fpsentry, char *dirname);
 
-int functionparameter_SaveFPS2disk_dir(
-    FUNCTION_PARAMETER_STRUCT *fpsentry,
-    char *dirname
-);
+int functionparameter_SaveFPS2disk(FUNCTION_PARAMETER_STRUCT *fpsentry);
 
+errno_t functionparameter_write_archivescript(FUNCTION_PARAMETER_STRUCT *fps);
 
-int functionparameter_SaveFPS2disk(
-    FUNCTION_PARAMETER_STRUCT *fpsentry
-);
+errno_t fps_write_RUNoutput_image(FUNCTION_PARAMETER_STRUCT *fps, const char *imagename, const char *outname);
 
+FILE *fps_write_RUNoutput_file(FUNCTION_PARAMETER_STRUCT *fps, const char *filename, const char *extension);
 
-errno_t	functionparameter_write_archivescript(
-    FUNCTION_PARAMETER_STRUCT *fps
-);
+errno_t fps_datadir_to_confdir(FUNCTION_PARAMETER_STRUCT *fps);
 
-
-errno_t fps_write_RUNoutput_image(
-	FUNCTION_PARAMETER_STRUCT *fps,
-	const char *imagename,
-	const char *outname
-);
-
-FILE *fps_write_RUNoutput_file(
-	FUNCTION_PARAMETER_STRUCT *fps,
-	const char *filename,
-	const char *extension
-);
-
-errno_t fps_datadir_to_confdir(
-	FUNCTION_PARAMETER_STRUCT *fps
-);
-
-#endif
\ No newline at end of file
+#endif
diff --git a/src/CommandLineInterface/fps_scan.c b/src/CommandLineInterface/fps_scan.c
index ee296175..1fa6a7f4 100644
--- a/src/CommandLineInterface/fps_scan.c
+++ b/src/CommandLineInterface/fps_scan.c
@@ -4,9 +4,8 @@
  */
 
 #include <dirent.h>
+#include <libgen.h>   // basename
 #include <sys/stat.h> // fstat
-#include <libgen.h> // basename
-
 
 #include "CommandLineInterface/CLIcore.h"
 
@@ -15,23 +14,13 @@
 #include "fps_connect.h"
 #include "fps_disconnect.h"
 
-
-
-
 /** @brief scan and load FPSs
  *
  */
 
-errno_t functionparameter_scan_fps(
-    uint32_t mode,
-    char *fpsnamemask,
-    FUNCTION_PARAMETER_STRUCT *fps,
-    KEYWORD_TREE_NODE *keywnode,
-    int *ptr_NBkwn,
-    int *ptr_fpsindex,
-    long *ptr_pindex,
-    int verbose
-)
+errno_t functionparameter_scan_fps(uint32_t mode, char *fpsnamemask, FUNCTION_PARAMETER_STRUCT *fps,
+                                   KEYWORD_TREE_NODE *keywnode, int *ptr_NBkwn, int *ptr_fpsindex, long *ptr_pindex,
+                                   int verbose)
 {
     int stringmaxlen = 500;
     int fpsindex;
@@ -41,7 +30,6 @@ errno_t functionparameter_scan_fps(
     int NBkwn;
     int l;
 
-
     // int nodechain[MAXNBLEVELS];
     //int GUIlineSelected[MAXNBLEVELS];
 
@@ -50,62 +38,50 @@ errno_t functionparameter_scan_fps(
     int fpslistcnt = 0;
     char FPSlist[200][100];
 
-
-
     // Static variables
     static int shmdirname_init = 0;
     static char shmdname[200];
 
-
-
-
     // scan filesystem for fps entries
 
-    if(verbose > 0)
+    if (verbose > 0)
     {
         printf("\n\n\n====================== SCANNING FPS ON SYSTEM ==============================\n\n");
         fflush(stdout);
     }
 
-
-    if(shmdirname_init == 0)
+    if (shmdirname_init == 0)
     {
         function_parameter_struct_shmdirname(shmdname);
         shmdirname_init = 1;
     }
 
-
-
-
-
     // disconnect previous fps
-    for(fpsindex = 0; fpsindex < NB_FPS_MAX; fpsindex++)
+    for (fpsindex = 0; fpsindex < NB_FPS_MAX; fpsindex++)
     {
-        if(fps[fpsindex].SMfd > -1)   // connected
+        if (fps[fpsindex].SMfd > -1) // connected
         {
             function_parameter_struct_disconnect(&fps[fpsindex]);
         }
     }
 
-
-
     // request match to file ./fpscomd/fpslist.txt
-    if(mode & 0x0001)
+    if (mode & 0x0001)
     {
-        if((fpfpslist = fopen("fpscmd/fpslist.txt", "r")) != NULL)
+        if ((fpfpslist = fopen("fpscmd/fpslist.txt", "r")) != NULL)
         {
             char *FPSlistline = NULL;
             size_t len = 0;
             ssize_t read;
 
-            while((read = getline(&FPSlistline, &len, fpfpslist)) != -1)
+            while ((read = getline(&FPSlistline, &len, fpfpslist)) != -1)
             {
-                if(FPSlistline[0] != '#')
+                if (FPSlistline[0] != '#')
                 {
                     char *pch;
 
                     pch = strtok(FPSlistline, " \t\n\r");
-                    if(pch != NULL)
+                    if (pch != NULL)
                     {
                         sprintf(FPSlist[fpslistcnt], "%s", pch);
                         fpslistcnt++;
@@ -116,41 +92,34 @@ errno_t functionparameter_scan_fps(
         }
         else
         {
-            if(verbose > 0)
+            if (verbose > 0)
             {
                 printf("Cannot open file fpscmd/fpslist.txt\n");
             }
         }
 
         int fpsi;
-        for(fpsi = 0; fpsi < fpslistcnt; fpsi++)
+        for (fpsi = 0; fpsi < fpslistcnt; fpsi++)
         {
-            if(verbose > 0)
+            if (verbose > 0)
             {
                 printf("FPSname must match %s\n", FPSlist[fpsi]);
             }
         }
     }
 
-
-
-
     //  for(l = 0; l < MAXNBLEVELS; l++) {
     // nodechain[l] = 0;
     // GUIlineSelected[l] = 0;
     //}
 
-    for(int kindex = 0; kindex < NB_KEYWNODE_MAX; kindex++)
+    for (int kindex = 0; kindex < NB_KEYWNODE_MAX; kindex++)
     {
         keywnode[kindex].NBchild = 0;
     }
 
-
-
-
     //    NBparam = function_parameter_struct_connect(fpsname, &fps[fpsindex]);
 
-
     // create ROOT node (invisible)
     keywnode[0].keywordlevel = 0;
     sprintf(keywnode[0].keyword[0], "ROOT");
@@ -158,42 +127,38 @@ errno_t functionparameter_scan_fps(
     keywnode[0].NBchild = 0;
     NBkwn = 1;
 
-
-
-
     DIR *d;
     struct dirent *dir;
     d = opendir(shmdname);
-    if(d)
+    if (d)
     {
         fpsindex = 0;
         pindex = 0;
-        while(((dir = readdir(d)) != NULL))
+        while (((dir = readdir(d)) != NULL))
         {
             char *pch = strstr(dir->d_name, ".fps.shm");
 
             int matchOK = 0;
             // name filtering
-            if(strcmp(fpsnamemask, "_ALL") == 0)
+            if (strcmp(fpsnamemask, "_ALL") == 0)
             {
                 matchOK = 1;
             }
             else
             {
-                if(strncmp(dir->d_name, fpsnamemask, strlen(fpsnamemask)) == 0)
+                if (strncmp(dir->d_name, fpsnamemask, strlen(fpsnamemask)) == 0)
                 {
                     matchOK = 1;
                 }
             }
 
-
-            if(mode & 0x0001)   // enforce match to list
+            if (mode & 0x0001) // enforce match to list
             {
                 int matchOKlist = 0;
                 int fpsi;
 
-                for(fpsi = 0; fpsi < fpslistcnt; fpsi++)
-                    if(strncmp(dir->d_name, FPSlist[fpsi], strlen(FPSlist[fpsi])) == 0)
+                for (fpsi = 0; fpsi < fpslistcnt; fpsi++)
+                    if (strncmp(dir->d_name, FPSlist[fpsi], strlen(FPSlist[fpsi])) == 0)
                     {
                         matchOKlist = 1;
                     }
@@ -201,10 +166,7 @@ errno_t functionparameter_scan_fps(
                 matchOK *= matchOKlist;
             }
 
-
-
-
-            if((pch) && (matchOK == 1))
+            if ((pch) && (matchOK == 1))
             {
 
                 // is file sym link ?
@@ -217,7 +179,7 @@ errno_t functionparameter_scan_fps(
                 sprintf(fullname, "%s/%s", shmdname, dir->d_name);
 
                 retv = lstat(fullname, &buf);
-                if(retv == -1)
+                if (retv == -1)
                 {
                     TUI_exit();
                     printf("File \"%s\"", dir->d_name);
@@ -227,7 +189,7 @@ errno_t functionparameter_scan_fps(
                     exit(EXIT_FAILURE);
                 }
 
-                if(S_ISLNK(buf.st_mode))   // resolve link name
+                if (S_ISLNK(buf.st_mode)) // resolve link name
                 {
                     char fullname[stringmaxlen];
                     char linknamefull[stringmaxlen];
@@ -237,12 +199,12 @@ errno_t functionparameter_scan_fps(
                     function_parameter_struct_shmdirname(shmdname);
 
                     //fps_symlink[fpsindex] = 1;
-                    if(snprintf(fullname, stringmaxlen, "%s/%s", shmdname, dir->d_name) < 0)
+                    if (snprintf(fullname, stringmaxlen, "%s/%s", shmdname, dir->d_name) < 0)
                     {
                         PRINT_ERROR("snprintf error");
                     }
 
-                    if(readlink(fullname, linknamefull, 200 - 1) == -1)
+                    if (readlink(fullname, linknamefull, 200 - 1) == -1)
                     {
                         // todo: replace with realpath()
                         PRINT_ERROR("readlink() error");
@@ -251,9 +213,9 @@ errno_t functionparameter_scan_fps(
 
                     int lOK = 1;
                     unsigned int ii = 0;
-                    while((lOK == 1) && (ii < strlen(linkname)))
+                    while ((lOK == 1) && (ii < strlen(linkname)))
                     {
-                        if(linkname[ii] == '.')
+                        if (linkname[ii] == '.')
                         {
                             linkname[ii] = '\0';
                             lOK = 0;
@@ -267,60 +229,54 @@ errno_t functionparameter_scan_fps(
                 //  fps_symlink[fpsindex] = 0;
                 //}
 
-
                 //fps_symlink[fpsindex] = 0;
 
-
                 char fpsname[STRINGMAXLEN_FPS_NAME];
                 long strcplen = strlen(dir->d_name) - strlen(".fps.shm");
-                int strcplen1 = STRINGMAXLEN_FPS_NAME-1;
-                if(strcplen < strcplen1) {
-                    strcplen1 =  strcplen;
+                int strcplen1 = STRINGMAXLEN_FPS_NAME - 1;
+                if (strcplen < strcplen1)
+                {
+                    strcplen1 = strcplen;
                 }
 
                 strncpy(fpsname, dir->d_name, strcplen1);
                 fpsname[strcplen1] = '\0';
 
-
-                if(verbose > 0)
+                if (verbose > 0)
                 {
                     printf("FOUND FPS %s - (RE)-CONNECTING  [%d]\n", fpsname, fpsindex);
                     fflush(stdout);
                 }
 
-
-                long NBparamMAX = function_parameter_struct_connect(fpsname, &fps[fpsindex],
-                                  FPSCONNECT_SIMPLE);
-
+                long NBparamMAX = function_parameter_struct_connect(fpsname, &fps[fpsindex], FPSCONNECT_SIMPLE);
 
                 long pindex0;
-                for(pindex0 = 0; pindex0 < NBparamMAX; pindex0++)
+                for (pindex0 = 0; pindex0 < NBparamMAX; pindex0++)
                 {
-                    if(fps[fpsindex].parray[pindex0].fpflag & FPFLAG_ACTIVE)   // if entry is active
+                    if (fps[fpsindex].parray[pindex0].fpflag & FPFLAG_ACTIVE) // if entry is active
                     {
                         // find or allocate keyword node
                         int level;
-                        for(level = 1; level < fps[fpsindex].parray[pindex0].keywordlevel + 1; level++)
+                        for (level = 1; level < fps[fpsindex].parray[pindex0].keywordlevel + 1; level++)
                         {
 
                             // does node already exist ?
                             int scanOK = 0;
-                            for(kwnindex = 0; kwnindex < NBkwn;
-                                    kwnindex++)   // scan existing nodes looking for match
+                            for (kwnindex = 0; kwnindex < NBkwn; kwnindex++) // scan existing nodes looking for match
                             {
-                                if(keywnode[kwnindex].keywordlevel == level)   // levels have to match
+                                if (keywnode[kwnindex].keywordlevel == level) // levels have to match
                                 {
                                     int match = 1;
-                                    for(l = 0; l < level; l++)   // keywords at all levels need to match
+                                    for (l = 0; l < level; l++) // keywords at all levels need to match
                                     {
-                                        if(strcmp(fps[fpsindex].parray[pindex0].keyword[l],
-                                                  keywnode[kwnindex].keyword[l]) != 0)
+                                        if (strcmp(fps[fpsindex].parray[pindex0].keyword[l],
+                                                   keywnode[kwnindex].keyword[l]) != 0)
                                         {
                                             match = 0;
                                         }
                                         //                        printf("TEST MATCH : %16s %16s  %d\n", fps[fpsindex].parray[i].keyword[l], keywnode[kwnindex].keyword[l], match);
                                     }
-                                    if(match == 1)   // we have a match
+                                    if (match == 1) // we have a match
                                     {
                                         scanOK = 1;
                                     }
@@ -328,32 +284,29 @@ errno_t functionparameter_scan_fps(
                                 }
                             }
 
-
-
-                            if(scanOK == 0)   // node does not exit -> create it
+                            if (scanOK == 0) // node does not exit -> create it
                             {
 
                                 // look for parent
                                 int scanparentOK = 0;
                                 int kwnindexp = 0;
-                                keywnode[kwnindex].parent_index =
-                                    0; // default value, not found -> assigned to ROOT
+                                keywnode[kwnindex].parent_index = 0; // default value, not found -> assigned to ROOT
 
-                                while((kwnindexp < NBkwn) && (scanparentOK == 0))
+                                while ((kwnindexp < NBkwn) && (scanparentOK == 0))
                                 {
-                                    if(keywnode[kwnindexp].keywordlevel == level - 1)   // check parent has level-1
+                                    if (keywnode[kwnindexp].keywordlevel == level - 1) // check parent has level-1
                                     {
                                         int match = 1;
 
-                                        for(l = 0; l < level - 1; l++)   // keywords at all levels need to match
+                                        for (l = 0; l < level - 1; l++) // keywords at all levels need to match
                                         {
-                                            if(strcmp(fps[fpsindex].parray[pindex0].keyword[l],
-                                                      keywnode[kwnindexp].keyword[l]) != 0)
+                                            if (strcmp(fps[fpsindex].parray[pindex0].keyword[l],
+                                                       keywnode[kwnindexp].keyword[l]) != 0)
                                             {
                                                 match = 0;
                                             }
                                         }
-                                        if(match == 1)   // we have a match
+                                        if (match == 1) // we have a match
                                         {
                                             scanparentOK = 1;
                                         }
@@ -361,7 +314,7 @@ errno_t functionparameter_scan_fps(
                                     kwnindexp++;
                                 }
 
-                                if(scanparentOK == 1)
+                                if (scanparentOK == 1)
                                 {
                                     keywnode[kwnindex].parent_index = kwnindexp - 1;
                                     int cindex;
@@ -370,18 +323,18 @@ errno_t functionparameter_scan_fps(
                                     keywnode[keywnode[kwnindex].parent_index].NBchild++;
                                 }
 
-                                if(verbose > 0)
+                                if (verbose > 0)
                                 {
                                     printf("CREATING NODE %d ", kwnindex);
                                 }
                                 keywnode[kwnindex].keywordlevel = level;
 
-                                for(l = 0; l < level; l++)
+                                for (l = 0; l < level; l++)
                                 {
                                     char tmpstring[200];
                                     strcpy(keywnode[kwnindex].keyword[l], fps[fpsindex].parray[pindex0].keyword[l]);
                                     printf(" %s", keywnode[kwnindex].keyword[l]);
-                                    if(l == 0)
+                                    if (l == 0)
                                     {
                                         strcpy(keywnode[kwnindex].keywordfull, keywnode[kwnindex].keyword[l]);
                                     }
@@ -391,14 +344,13 @@ errno_t functionparameter_scan_fps(
                                         strcat(keywnode[kwnindex].keywordfull, tmpstring);
                                     }
                                 }
-                                if(verbose > 0)
+                                if (verbose > 0)
                                 {
                                     printf("   %d %d\n", keywnode[kwnindex].keywordlevel,
                                            fps[fpsindex].parray[pindex0].keywordlevel);
                                 }
 
-                                if(keywnode[kwnindex].keywordlevel ==
-                                        fps[fpsindex].parray[pindex0].keywordlevel)
+                                if (keywnode[kwnindex].keywordlevel == fps[fpsindex].parray[pindex0].keywordlevel)
                                 {
                                     //									strcpy(keywnode[kwnindex].keywordfull, fps[fpsindex].parray[i].keywordfull);
 
@@ -409,13 +361,12 @@ errno_t functionparameter_scan_fps(
                                 else
                                 {
 
-
                                     keywnode[kwnindex].leaf = 0;
                                     keywnode[kwnindex].fpsindex = fpsindex;
                                     keywnode[kwnindex].pindex = 0;
                                 }
 
-                                kwnindex ++;
+                                kwnindex++;
                                 NBkwn = kwnindex;
                             }
                         }
@@ -423,14 +374,12 @@ errno_t functionparameter_scan_fps(
                     }
                 }
 
-                if(verbose > 0)
+                if (verbose > 0)
                 {
-                    printf("--- FPS %4d  %-20s %ld parameters\n", fpsindex, fpsname,
-                           fps[fpsindex].md->NBparamMAX);
+                    printf("--- FPS %4d  %-20s %ld parameters\n", fpsindex, fpsname, fps[fpsindex].md->NBparamMAX);
                 }
 
-
-                fpsindex ++;
+                fpsindex++;
             }
         }
         closedir(d);
@@ -445,8 +394,7 @@ errno_t functionparameter_scan_fps(
         exit(EXIT_FAILURE);
     }
 
-
-    if(verbose > 0)
+    if (verbose > 0)
     {
         printf("\n\n=================[END] SCANNING FPS ON SYSTEM [END]=  %d  ========================\n\n\n",
                fpsindex);
@@ -457,9 +405,5 @@ errno_t functionparameter_scan_fps(
     *ptr_fpsindex = fpsindex;
     *ptr_pindex = pindex;
 
-
-
     return RETURN_SUCCESS;
 }
-
-
diff --git a/src/CommandLineInterface/fps_scan.h b/src/CommandLineInterface/fps_scan.h
index 348e856f..64c7252d 100644
--- a/src/CommandLineInterface/fps_scan.h
+++ b/src/CommandLineInterface/fps_scan.h
@@ -8,15 +8,8 @@
 
 #include "function_parameters.h"
 
-errno_t functionparameter_scan_fps(
-    uint32_t mode,
-    char *fpsnamemask,
-    FUNCTION_PARAMETER_STRUCT *fps,
-    KEYWORD_TREE_NODE *keywnode,
-    int *ptr_NBkwn,
-    int *ptr_fpsindex,
-    long *ptr_pindex,
-    int verbose
-);
+errno_t functionparameter_scan_fps(uint32_t mode, char *fpsnamemask, FUNCTION_PARAMETER_STRUCT *fps,
+                                   KEYWORD_TREE_NODE *keywnode, int *ptr_NBkwn, int *ptr_fpsindex, long *ptr_pindex,
+                                   int verbose);
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/CommandLineInterface/fps_shmdirname.c b/src/CommandLineInterface/fps_shmdirname.c
index 78dc5cfd..a7d2b119 100644
--- a/src/CommandLineInterface/fps_shmdirname.c
+++ b/src/CommandLineInterface/fps_shmdirname.c
@@ -3,16 +3,12 @@
  * @brief   create FPS shared memory directory name
  */
 
-
 #include <dirent.h>
 
-
-
 #include "CommandLineInterface/CLIcore.h"
 
 #define SHAREDSHMDIR data.shmdir
 
-
 errno_t function_parameter_struct_shmdirname(char *shmdname)
 {
     int shmdirOK = 0;
@@ -20,24 +16,24 @@ errno_t function_parameter_struct_shmdirname(char *shmdname)
     static unsigned long functioncnt = 0;
     static char shmdname_static[STRINGMAXLEN_SHMDIRNAME];
 
-    if(functioncnt == 0)
+    if (functioncnt == 0)
     {
         functioncnt++; // ensure we only run this once, and then retrieve stored result from shmdname_static
 
         // first, we try the env variable if it exists
         char *MILK_SHM_DIR = getenv("MILK_SHM_DIR");
-        if(MILK_SHM_DIR != NULL)
+        if (MILK_SHM_DIR != NULL)
         {
             DEBUG_TRACEPOINT("MILK_SHM_DIR is '%s'\n", MILK_SHM_DIR);
 
             {
                 int slen = snprintf(shmdname, STRINGMAXLEN_SHMDIRNAME, "%s", MILK_SHM_DIR);
-                if(slen < 1)
+                if (slen < 1)
                 {
                     PRINT_ERROR("snprintf wrote <1 char");
                     abort(); // can't handle this error any other way
                 }
-                if(slen >= STRINGMAXLEN_SHMDIRNAME)
+                if (slen >= STRINGMAXLEN_SHMDIRNAME)
                 {
                     PRINT_ERROR("snprintf string truncation");
                     abort(); // can't handle this error any other way
@@ -46,7 +42,7 @@ errno_t function_parameter_struct_shmdirname(char *shmdname)
 
             // does this direcory exist ?
             tmpdir = opendir(shmdname);
-            if(tmpdir) // directory exits
+            if (tmpdir) // directory exits
             {
                 shmdirOK = 1;
                 closedir(tmpdir);
@@ -58,36 +54,35 @@ errno_t function_parameter_struct_shmdirname(char *shmdname)
         }
 
         // second, we try SHAREDSHMDIR default
-        if(shmdirOK == 0)
+        if (shmdirOK == 0)
         {
             tmpdir = opendir(SHAREDSHMDIR);
-            if(tmpdir) // directory exits
+            if (tmpdir) // directory exits
             {
                 {
                     int slen = snprintf(shmdname, STRINGMAXLEN_SHMDIRNAME, "%s", SHAREDSHMDIR);
-                    if(slen < 1)
+                    if (slen < 1)
                     {
                         PRINT_ERROR("snprintf wrote <1 char");
                         abort(); // can't handle this error any other way
                     }
-                    if(slen >= STRINGMAXLEN_SHMDIRNAME)
+                    if (slen >= STRINGMAXLEN_SHMDIRNAME)
                     {
                         PRINT_ERROR("snprintf string truncation");
                         abort(); // can't handle this error any other way
                     }
                 }
 
-
                 shmdirOK = 1;
                 closedir(tmpdir);
             }
         }
 
         // if all above fails, set to /tmp
-        if(shmdirOK == 0)
+        if (shmdirOK == 0)
         {
             tmpdir = opendir("/tmp");
-            if(!tmpdir)
+            if (!tmpdir)
             {
                 exit(EXIT_FAILURE);
             }
@@ -99,16 +94,15 @@ errno_t function_parameter_struct_shmdirname(char *shmdname)
             }
         }
 
-
         {
             int slen = snprintf(shmdname_static, STRINGMAXLEN_SHMDIRNAME, "%s",
                                 shmdname); // keep it memory
-            if(slen < 1)
+            if (slen < 1)
             {
                 PRINT_ERROR("snprintf wrote <1 char");
                 abort(); // can't handle this error any other way
             }
-            if(slen >= STRINGMAXLEN_SHMDIRNAME)
+            if (slen >= STRINGMAXLEN_SHMDIRNAME)
             {
                 PRINT_ERROR("snprintf string truncation");
                 abort(); // can't handle this error any other way
@@ -119,18 +113,17 @@ errno_t function_parameter_struct_shmdirname(char *shmdname)
     {
         {
             int slen = snprintf(shmdname, STRINGMAXLEN_SHMDIRNAME, "%s", shmdname_static);
-            if(slen < 1)
+            if (slen < 1)
             {
                 PRINT_ERROR("snprintf wrote <1 char");
                 abort(); // can't handle this error any other way
             }
-            if(slen >= STRINGMAXLEN_SHMDIRNAME)
+            if (slen >= STRINGMAXLEN_SHMDIRNAME)
             {
                 PRINT_ERROR("snprintf string truncation");
                 abort(); // can't handle this error any other way
             }
         }
-
     }
 
     return RETURN_SUCCESS;
diff --git a/src/CommandLineInterface/fps_shmdirname.h b/src/CommandLineInterface/fps_shmdirname.h
index f814d488..f8ddd62d 100644
--- a/src/CommandLineInterface/fps_shmdirname.h
+++ b/src/CommandLineInterface/fps_shmdirname.h
@@ -8,4 +8,4 @@
 
 errno_t function_parameter_struct_shmdirname(char *shmdname);
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/CommandLineInterface/fps_tmux.c b/src/CommandLineInterface/fps_tmux.c
index 6938ecc0..7f789bda 100644
--- a/src/CommandLineInterface/fps_tmux.c
+++ b/src/CommandLineInterface/fps_tmux.c
@@ -6,50 +6,32 @@
  * tmux wrapper for FPS control
  */
 
-
-
 #include "CommandLineInterface/CLIcore.h"
 
-
 /** @brief Kill FPS tmux sesssion
  *
  */
-errno_t functionparameter_FPS_tmux_kill(
-    FUNCTION_PARAMETER_STRUCT *fps
-)
+errno_t functionparameter_FPS_tmux_kill(FUNCTION_PARAMETER_STRUCT *fps)
 {
     // terminate tmux sessions
-    EXECUTE_SYSTEM_COMMAND("tmux send-keys -t %s:ctrl C-c 2> /dev/null",
-                           fps->md->name);
-    EXECUTE_SYSTEM_COMMAND("tmux send-keys -t %s:ctrl \"exit\" C-m 2> /dev/null",
-                           fps->md->name);
+    EXECUTE_SYSTEM_COMMAND("tmux send-keys -t %s:ctrl C-c 2> /dev/null", fps->md->name);
+    EXECUTE_SYSTEM_COMMAND("tmux send-keys -t %s:ctrl \"exit\" C-m 2> /dev/null", fps->md->name);
 
-    EXECUTE_SYSTEM_COMMAND("tmux send-keys -t %s:conf C-c 2> /dev/null",
-                           fps->md->name);
-    EXECUTE_SYSTEM_COMMAND("tmux send-keys -t %s:conf \"exit\" C-m 2> /dev/null",
-                           fps->md->name);
-
-    EXECUTE_SYSTEM_COMMAND("tmux send-keys -t %s:run C-c 2> /dev/null",
-                           fps->md->name);
-    EXECUTE_SYSTEM_COMMAND("tmux send-keys -t %s:run \"exit\" C-m 2> /dev/null",
-                           fps->md->name);
+    EXECUTE_SYSTEM_COMMAND("tmux send-keys -t %s:conf C-c 2> /dev/null", fps->md->name);
+    EXECUTE_SYSTEM_COMMAND("tmux send-keys -t %s:conf \"exit\" C-m 2> /dev/null", fps->md->name);
 
+    EXECUTE_SYSTEM_COMMAND("tmux send-keys -t %s:run C-c 2> /dev/null", fps->md->name);
+    EXECUTE_SYSTEM_COMMAND("tmux send-keys -t %s:run \"exit\" C-m 2> /dev/null", fps->md->name);
 
     EXECUTE_SYSTEM_COMMAND("tmux kill-session -t %s 2> /dev/null", fps->md->name);
 
     return RETURN_SUCCESS;
 }
 
-
-
-
-
 /** @brief Initialize FPS tmux sesssion
  *
  */
-errno_t functionparameter_FPS_tmux_init(
-    FUNCTION_PARAMETER_STRUCT *fps
-)
+errno_t functionparameter_FPS_tmux_init(FUNCTION_PARAMETER_STRUCT *fps)
 {
     int funcstring_maxlen = 10000;
     int argstring_maxlen = 1000;
@@ -63,18 +45,16 @@ errno_t functionparameter_FPS_tmux_init(
     EXECUTE_SYSTEM_COMMAND("tmux new-session -s %s -d", fps->md->name);
     EXECUTE_SYSTEM_COMMAND("tmux rename-window -t %s:0 ctrl", fps->md->name);
 
-
     EXECUTE_SYSTEM_COMMAND("tmux new-window -t %s -n conf", fps->md->name);
     EXECUTE_SYSTEM_COMMAND("tmux new-window -t %s -n run", fps->md->name);
 
-
     // Write functions to tmux windows
     //
     char functionstring[funcstring_maxlen];
     char argstring[argstring_maxlen];
     char argstringcp[argstring_maxlen];
 
-    if(fps->md->NBnameindex > 0)
+    if (fps->md->NBnameindex > 0)
     {
         snprintf(argstring, argstring_maxlen, "%s", fps->md->nameindexW[0]);
     }
@@ -83,73 +63,49 @@ errno_t functionparameter_FPS_tmux_init(
         sprintf(argstring, " ");
     }
 
-    for(int i = 1; i < fps->md->NBnameindex; i++)
+    for (int i = 1; i < fps->md->NBnameindex; i++)
     {
-        snprintf(argstringcp, argstring_maxlen, "%s %s", argstring,
-                 fps->md->nameindexW[i]);
+        snprintf(argstringcp, argstring_maxlen, "%s %s", argstring, fps->md->nameindexW[i]);
         strcpy(argstring, argstringcp);
     }
 
-
     // module load string
     char mloadstring[mloadstring_maxlen];
     char mloadstringcp[mloadstring_maxlen];
     sprintf(mloadstring, " ");
-    for(int m = 0; m < fps->md->NBmodule; m++)
+    for (int m = 0; m < fps->md->NBmodule; m++)
     {
-        snprintf(mloadstringcp, mloadstring_maxlen, "%smload %s;", mloadstring,
-                 fps->md->modulename[m]);
+        snprintf(mloadstringcp, mloadstring_maxlen, "%smload %s;", mloadstring, fps->md->modulename[m]);
         strcpy(mloadstring, mloadstringcp);
     }
 
-
-    EXECUTE_SYSTEM_COMMAND("tmux send-keys -t %s:ctrl \"bash\" C-m",
-                           fps->md->name);
-
+    EXECUTE_SYSTEM_COMMAND("tmux send-keys -t %s:ctrl \"bash\" C-m", fps->md->name);
 
     // confstart
     //
-    EXECUTE_SYSTEM_COMMAND("tmux send-keys -t %s:conf \"bash\" C-m",
-                           fps->md->name);
+    EXECUTE_SYSTEM_COMMAND("tmux send-keys -t %s:conf \"bash\" C-m", fps->md->name);
 
     sprintf(functionstring,
             "function fpsconfstart {\n"
             "echo \"STARTING CONF PROCESS\"\n"
             "MILK_FPSPROCINFO=1 %s-exec -n %s \\\"%s%s _CONFSTART_ %s\\\"\n"
             "}\n",
-            fps->md->callprogname,
-            fps->md->name,
-            mloadstring,
-            fps->md->callfuncname,
-            argstring
-           );
-
-    EXECUTE_SYSTEM_COMMAND("tmux send-keys -t %s:conf \"%s\" C-m",
-                           fps->md->name,
-                           functionstring);
+            fps->md->callprogname, fps->md->name, mloadstring, fps->md->callfuncname, argstring);
 
+    EXECUTE_SYSTEM_COMMAND("tmux send-keys -t %s:conf \"%s\" C-m", fps->md->name, functionstring);
 
     // runstart
     //
-    EXECUTE_SYSTEM_COMMAND("tmux send-keys -t %s:run \"bash\" C-m",
-                           fps->md->name);
+    EXECUTE_SYSTEM_COMMAND("tmux send-keys -t %s:run \"bash\" C-m", fps->md->name);
 
     sprintf(functionstring,
             "function fpsrunstart {\n"
             "echo \"STARTING RUN PROCESS\"\n"
             "MILK_FPSPROCINFO=1 %s-exec -n %s \\\"\\${TCSETCMDPREFIX} %s%s _RUNSTART_ %s\\\"\n"
             "}\n",
-            fps->md->callprogname,
-            fps->md->name,
-            mloadstring,
-            fps->md->callfuncname,
-            argstring
-           );
-
-    EXECUTE_SYSTEM_COMMAND("tmux send-keys -t %s:run \"%s\" C-m",
-                           fps->md->name,
-                           functionstring);
+            fps->md->callprogname, fps->md->name, mloadstring, fps->md->callfuncname, argstring);
 
+    EXECUTE_SYSTEM_COMMAND("tmux send-keys -t %s:run \"%s\" C-m", fps->md->name, functionstring);
 
     // runstop
     //
@@ -158,19 +114,9 @@ errno_t functionparameter_FPS_tmux_init(
             "echo \"STOPPING RUN PROCESS\"\n"
             "%s-exec -n %s \\\"%s%s _RUNSTOP_ %s\\\"\n"
             "}\n",
-            fps->md->callprogname,
-            fps->md->name,
-            mloadstring,
-            fps->md->callfuncname,
-            argstring
-           );
-
-    EXECUTE_SYSTEM_COMMAND("tmux send-keys -t %s:run \"%s\" C-m",
-                           fps->md->name,
-                           functionstring);
-
+            fps->md->callprogname, fps->md->name, mloadstring, fps->md->callfuncname, argstring);
 
+    EXECUTE_SYSTEM_COMMAND("tmux send-keys -t %s:run \"%s\" C-m", fps->md->name, functionstring);
 
     return RETURN_SUCCESS;
 }
-
diff --git a/src/CommandLineInterface/fps_tmux.h b/src/CommandLineInterface/fps_tmux.h
index 678b05d3..6aada6c6 100644
--- a/src/CommandLineInterface/fps_tmux.h
+++ b/src/CommandLineInterface/fps_tmux.h
@@ -9,13 +9,8 @@
 
 #include "function_parameters.h"
 
-errno_t functionparameter_FPS_tmux_kill(
-    FUNCTION_PARAMETER_STRUCT *fps
-);
+errno_t functionparameter_FPS_tmux_kill(FUNCTION_PARAMETER_STRUCT *fps);
 
-
-errno_t functionparameter_FPS_tmux_init(
-    FUNCTION_PARAMETER_STRUCT *fps
-);
+errno_t functionparameter_FPS_tmux_init(FUNCTION_PARAMETER_STRUCT *fps);
 
 #endif
diff --git a/src/CommandLineInterface/fps_userinputsetparamvalue.c b/src/CommandLineInterface/fps_userinputsetparamvalue.c
index 2518e8b2..ed8e7cae 100644
--- a/src/CommandLineInterface/fps_userinputsetparamvalue.c
+++ b/src/CommandLineInterface/fps_userinputsetparamvalue.c
@@ -3,10 +3,8 @@
  * @brief   read user input to set parameter value
  */
 
-
-#include <math.h>
 #include <limits.h>
-
+#include <math.h>
 
 #include "CommandLineInterface/CLIcore.h"
 
@@ -15,18 +13,11 @@
 
 #include "TUItools.h"
 
-
-
-
-
 /** @brief Enter new value for parameter
  *
  *
  */
-int functionparameter_UserInputSetParamValue(
-    FUNCTION_PARAMETER_STRUCT *fpsentry,
-    int pindex
-)
+int functionparameter_UserInputSetParamValue(FUNCTION_PARAMETER_STRUCT *fpsentry, int pindex)
 {
     int inputOK;
     int strlenmax = 20;
@@ -35,13 +26,12 @@ int functionparameter_UserInputSetParamValue(
 
     functionparameter_PrintParameterInfo(fpsentry, pindex);
 
-
-    if(fpsentry->parray[pindex].fpflag & FPFLAG_WRITESTATUS)
+    if (fpsentry->parray[pindex].fpflag & FPFLAG_WRITESTATUS)
     {
         inputOK = 0;
         fflush(stdout);
 
-        while(inputOK == 0)
+        while (inputOK == 0)
         {
             printf("\nESC or update value : ");
             fflush(stdout);
@@ -50,23 +40,23 @@ int functionparameter_UserInputSetParamValue(
 
             c = get_singlechar_block();
 
-            while((c != 27) && (c != 10) && (c != 13) && (stringindex < strlenmax - 1))
+            while ((c != 27) && (c != 10) && (c != 13) && (stringindex < strlenmax - 1))
             {
                 buff[stringindex] = c;
-                if(c == 127)   // delete key
+                if (c == 127) // delete key
                 {
                     putchar(0x8);
                     putchar(' ');
                     putchar(0x8);
-                    stringindex --;
+                    stringindex--;
                 }
                 else
                 {
-                    putchar(c);  // echo on screen
+                    putchar(c); // echo on screen
                     fflush(stdout);
                     stringindex++;
                 }
-                if(stringindex < 0)
+                if (stringindex < 0)
                 {
                     stringindex = 0;
                 }
@@ -77,7 +67,7 @@ int functionparameter_UserInputSetParamValue(
             inputOK = 1;
         }
 
-        if(c != 27)   // do not update value if escape key
+        if (c != 27) // do not update value if escape key
         {
 
             long lval = 0;
@@ -85,296 +75,273 @@ int functionparameter_UserInputSetParamValue(
             char *endptr;
             int vOK = 1;
 
-            switch(fpsentry->parray[pindex].type)
+            switch (fpsentry->parray[pindex].type)
             {
 
-                case FPTYPE_INT32:
-                    errno = 0;    /* To distinguish success/failure after call */
-                    lval = strtol(buff, &endptr, 10);
-
-                    /* Check for various possible errors */
-                    if((errno == ERANGE && (lval == LONG_MAX || lval == LONG_MIN))
-                            || (errno != 0 && lval == 0))
-                    {
-                        perror("strtol");
-                        vOK = 0;
-                        sleep(1);
-                    }
-
-                    if(endptr == buff)
-                    {
-                        fprintf(stderr, "\nERROR: No digits were found\n");
-                        vOK = 0;
-                        sleep(1);
-                    }
-
-                    if(vOK == 1)
-                    {
-                        fpsentry->parray[pindex].val.i32[0] = lval;
-                    }
-                    break;
-
-                case FPTYPE_UINT32:
-                    errno = 0;    /* To distinguish success/failure after call */
-                    lval = strtol(buff, &endptr, 10);
-
-                    /* Check for various possible errors */
-                    if((errno == ERANGE && (lval == LONG_MAX || lval == LONG_MIN))
-                            || (errno != 0 && lval == 0))
-                    {
-                        perror("strtol");
-                        vOK = 0;
-                        sleep(1);
-                    }
-
-                    if(endptr == buff)
-                    {
-                        fprintf(stderr, "\nERROR: No digits were found\n");
-                        vOK = 0;
-                        sleep(1);
-                    }
-
-                    if(lval < 0)
-                    {
-                        fprintf(stderr, "\nERROR: must be positive\n");
-                        vOK = 0;
-                    }
-
-                    if(vOK == 1)
-                    {
-                        fpsentry->parray[pindex].val.ui32[0] = lval;
-                    }
-                    break;
-
-
-
-                case FPTYPE_INT64:
-                    errno = 0;    /* To distinguish success/failure after call */
-                    lval = strtol(buff, &endptr, 10);
-
-                    /* Check for various possible errors */
-                    if((errno == ERANGE && (lval == LONG_MAX || lval == LONG_MIN))
-                            || (errno != 0 && lval == 0))
-                    {
-                        perror("strtol");
-                        vOK = 0;
-                        sleep(1);
-                    }
-
-                    if(endptr == buff)
-                    {
-                        fprintf(stderr, "\nERROR: No digits were found\n");
-                        vOK = 0;
-                        sleep(1);
-                    }
-
-                    if(vOK == 1)
-                    {
-                        fpsentry->parray[pindex].val.i64[0] = lval;
-                    }
-                    break;
-
-                case FPTYPE_UINT64:
-                    errno = 0;    /* To distinguish success/failure after call */
-                    lval = strtol(buff, &endptr, 10);
-
-                    /* Check for various possible errors */
-                    if((errno == ERANGE && (lval == LONG_MAX || lval == LONG_MIN))
-                            || (errno != 0 && lval == 0))
-                    {
-                        perror("strtol");
-                        vOK = 0;
-                        sleep(1);
-                    }
-
-                    if(endptr == buff)
-                    {
-                        fprintf(stderr, "\nERROR: No digits were found\n");
-                        vOK = 0;
-                        sleep(1);
-                    }
-
-                    if(lval < 0)
-                    {
-                        fprintf(stderr, "\nERROR: must be positive\n");
-                        vOK = 0;
-                    }
-
-                    if(vOK == 1)
-                    {
-                        fpsentry->parray[pindex].val.ui64[0] = lval;
-                    }
-                    break;
-
-
-
-
-                case FPTYPE_FLOAT64:
-                    errno = 0;    /* To distinguish success/failure after call */
-                    fval = strtod(buff, &endptr);
-
-                    /* Check for various possible errors */
-                    if((errno == ERANGE)
-                            || (errno != 0 && fval == 0.0))
-                    {
-                        perror("strtod");
-                        vOK = 0;
-                        sleep(1);
-                    }
-
-                    if(endptr == buff)
-                    {
-                        fprintf(stderr, "\nERROR: No digits were found\n");
-                        vOK = 0;
-                        sleep(1);
-                    }
-
-                    if(vOK == 1)
-                    {
-                        fpsentry->parray[pindex].val.f64[0] = fval;
-                    }
-                    break;
-
-
-                case FPTYPE_FLOAT32:
-                    errno = 0;    /* To distinguish success/failure after call */
-                    fval = strtod(buff, &endptr);
-
-                    /* Check for various possible errors */
-                    if((errno == ERANGE)
-                            || (errno != 0 && fval == 0.0))
-                    {
-                        perror("strtod");
-                        vOK = 0;
-                        sleep(1);
-                    }
-
-                    if(endptr == buff)
-                    {
-                        fprintf(stderr, "\nERROR: No digits were found\n");
-                        vOK = 0;
-                        sleep(1);
-                    }
-
-                    if(vOK == 1)
-                    {
-                        fpsentry->parray[pindex].val.f32[0] = fval;
-                    }
-                    break;
-
-                case FPTYPE_TIMESPEC:
-                    errno = 0;    /* To distinguish success/failure after call */
-                    fval = strtod(buff, &endptr);
-
-                    /* Check for various possible errors */
-                    if((errno == ERANGE)
-                            || (errno != 0 && fval == 0.0))
-                    {
-                        perror("strtod");
-                        vOK = 0;
-                        sleep(1);
-                    }
-
-                    if(endptr == buff)
-                    {
-                        fprintf(stderr, "\nERROR: No digits were found\n");
-                        vOK = 0;
-                        sleep(1);
-                    }
-
-                    if(vOK == 1)
-                    {
-                        double finteger;
-                        double fractional = modf(fval, &finteger);
-
-                        fpsentry->parray[pindex].val.ts[0].tv_sec = (long)(finteger + 0.1);
-                        fpsentry->parray[pindex].val.ts[0].tv_nsec = (long)(1.0e9 * fractional + 0.1);
-                    }
-                    break;
-
-                case FPTYPE_PID :
-                    errno = 0;    /* To distinguish success/failure after call */
-                    lval = strtol(buff, &endptr, 10);
-
-                    /* Check for various possible errors */
-                    if((errno == ERANGE && (lval == LONG_MAX || lval == LONG_MIN))
-                            || (errno != 0 && lval == 0))
-                    {
-                        perror("strtol");
-                        vOK = 0;
-                        sleep(1);
-                    }
-
-                    if(endptr == buff)
-                    {
-                        fprintf(stderr, "\nERROR: No digits were found\n");
-                        vOK = 0;
-                        sleep(1);
-                    }
-
-                    if(vOK == 1)
-                    {
-                        fpsentry->parray[pindex].val.pid[0] = (pid_t) lval;
-                    }
-                    break;
-
-
-                case FPTYPE_FILENAME :
-                    if(snprintf(fpsentry->parray[pindex].val.string[0],
-                                FUNCTION_PARAMETER_STRMAXLEN, "%s", buff) < 0)
-                    {
-                        PRINT_ERROR("snprintf error");
-                    }
-                    break;
-
-                case FPTYPE_FITSFILENAME :
-                    if(snprintf(fpsentry->parray[pindex].val.string[0],
-                                FUNCTION_PARAMETER_STRMAXLEN, "%s", buff) < 0)
-                    {
-                        PRINT_ERROR("snprintf error");
-                    }
-                    break;
-
-                case FPTYPE_EXECFILENAME :
-                    if(snprintf(fpsentry->parray[pindex].val.string[0],
-                                FUNCTION_PARAMETER_STRMAXLEN, "%s", buff) < 0)
-                    {
-                        PRINT_ERROR("snprintf error");
-                    }
-                    break;
-
-                case FPTYPE_DIRNAME :
-                    if(snprintf(fpsentry->parray[pindex].val.string[0],
-                                FUNCTION_PARAMETER_STRMAXLEN, "%s", buff) < 0)
-                    {
-                        PRINT_ERROR("snprintf error");
-                    }
-                    break;
-
-                case FPTYPE_STREAMNAME :
-                    if(snprintf(fpsentry->parray[pindex].val.string[0],
-                                FUNCTION_PARAMETER_STRMAXLEN, "%s", buff) < 0)
-                    {
-                        PRINT_ERROR("snprintf error");
-                    }
-                    break;
-
-                case FPTYPE_STRING :
-                    if(snprintf(fpsentry->parray[pindex].val.string[0],
-                                FUNCTION_PARAMETER_STRMAXLEN, "%s", buff) < 0)
-                    {
-                        PRINT_ERROR("snprintf error");
-                    }
-                    break;
-
-                case FPTYPE_FPSNAME :
-                    if(snprintf(fpsentry->parray[pindex].val.string[0],
-                                FUNCTION_PARAMETER_STRMAXLEN, "%s", buff) < 0)
-                    {
-                        PRINT_ERROR("snprintf error");
-                    }
-                    break;
+            case FPTYPE_INT32:
+                errno = 0; /* To distinguish success/failure after call */
+                lval = strtol(buff, &endptr, 10);
+
+                /* Check for various possible errors */
+                if ((errno == ERANGE && (lval == LONG_MAX || lval == LONG_MIN)) || (errno != 0 && lval == 0))
+                {
+                    perror("strtol");
+                    vOK = 0;
+                    sleep(1);
+                }
+
+                if (endptr == buff)
+                {
+                    fprintf(stderr, "\nERROR: No digits were found\n");
+                    vOK = 0;
+                    sleep(1);
+                }
+
+                if (vOK == 1)
+                {
+                    fpsentry->parray[pindex].val.i32[0] = lval;
+                }
+                break;
+
+            case FPTYPE_UINT32:
+                errno = 0; /* To distinguish success/failure after call */
+                lval = strtol(buff, &endptr, 10);
+
+                /* Check for various possible errors */
+                if ((errno == ERANGE && (lval == LONG_MAX || lval == LONG_MIN)) || (errno != 0 && lval == 0))
+                {
+                    perror("strtol");
+                    vOK = 0;
+                    sleep(1);
+                }
+
+                if (endptr == buff)
+                {
+                    fprintf(stderr, "\nERROR: No digits were found\n");
+                    vOK = 0;
+                    sleep(1);
+                }
+
+                if (lval < 0)
+                {
+                    fprintf(stderr, "\nERROR: must be positive\n");
+                    vOK = 0;
+                }
+
+                if (vOK == 1)
+                {
+                    fpsentry->parray[pindex].val.ui32[0] = lval;
+                }
+                break;
+
+            case FPTYPE_INT64:
+                errno = 0; /* To distinguish success/failure after call */
+                lval = strtol(buff, &endptr, 10);
+
+                /* Check for various possible errors */
+                if ((errno == ERANGE && (lval == LONG_MAX || lval == LONG_MIN)) || (errno != 0 && lval == 0))
+                {
+                    perror("strtol");
+                    vOK = 0;
+                    sleep(1);
+                }
+
+                if (endptr == buff)
+                {
+                    fprintf(stderr, "\nERROR: No digits were found\n");
+                    vOK = 0;
+                    sleep(1);
+                }
+
+                if (vOK == 1)
+                {
+                    fpsentry->parray[pindex].val.i64[0] = lval;
+                }
+                break;
+
+            case FPTYPE_UINT64:
+                errno = 0; /* To distinguish success/failure after call */
+                lval = strtol(buff, &endptr, 10);
+
+                /* Check for various possible errors */
+                if ((errno == ERANGE && (lval == LONG_MAX || lval == LONG_MIN)) || (errno != 0 && lval == 0))
+                {
+                    perror("strtol");
+                    vOK = 0;
+                    sleep(1);
+                }
+
+                if (endptr == buff)
+                {
+                    fprintf(stderr, "\nERROR: No digits were found\n");
+                    vOK = 0;
+                    sleep(1);
+                }
+
+                if (lval < 0)
+                {
+                    fprintf(stderr, "\nERROR: must be positive\n");
+                    vOK = 0;
+                }
 
+                if (vOK == 1)
+                {
+                    fpsentry->parray[pindex].val.ui64[0] = lval;
+                }
+                break;
+
+            case FPTYPE_FLOAT64:
+                errno = 0; /* To distinguish success/failure after call */
+                fval = strtod(buff, &endptr);
+
+                /* Check for various possible errors */
+                if ((errno == ERANGE) || (errno != 0 && fval == 0.0))
+                {
+                    perror("strtod");
+                    vOK = 0;
+                    sleep(1);
+                }
+
+                if (endptr == buff)
+                {
+                    fprintf(stderr, "\nERROR: No digits were found\n");
+                    vOK = 0;
+                    sleep(1);
+                }
+
+                if (vOK == 1)
+                {
+                    fpsentry->parray[pindex].val.f64[0] = fval;
+                }
+                break;
+
+            case FPTYPE_FLOAT32:
+                errno = 0; /* To distinguish success/failure after call */
+                fval = strtod(buff, &endptr);
+
+                /* Check for various possible errors */
+                if ((errno == ERANGE) || (errno != 0 && fval == 0.0))
+                {
+                    perror("strtod");
+                    vOK = 0;
+                    sleep(1);
+                }
+
+                if (endptr == buff)
+                {
+                    fprintf(stderr, "\nERROR: No digits were found\n");
+                    vOK = 0;
+                    sleep(1);
+                }
+
+                if (vOK == 1)
+                {
+                    fpsentry->parray[pindex].val.f32[0] = fval;
+                }
+                break;
+
+            case FPTYPE_TIMESPEC:
+                errno = 0; /* To distinguish success/failure after call */
+                fval = strtod(buff, &endptr);
+
+                /* Check for various possible errors */
+                if ((errno == ERANGE) || (errno != 0 && fval == 0.0))
+                {
+                    perror("strtod");
+                    vOK = 0;
+                    sleep(1);
+                }
+
+                if (endptr == buff)
+                {
+                    fprintf(stderr, "\nERROR: No digits were found\n");
+                    vOK = 0;
+                    sleep(1);
+                }
+
+                if (vOK == 1)
+                {
+                    double finteger;
+                    double fractional = modf(fval, &finteger);
+
+                    fpsentry->parray[pindex].val.ts[0].tv_sec = (long)(finteger + 0.1);
+                    fpsentry->parray[pindex].val.ts[0].tv_nsec = (long)(1.0e9 * fractional + 0.1);
+                }
+                break;
+
+            case FPTYPE_PID:
+                errno = 0; /* To distinguish success/failure after call */
+                lval = strtol(buff, &endptr, 10);
+
+                /* Check for various possible errors */
+                if ((errno == ERANGE && (lval == LONG_MAX || lval == LONG_MIN)) || (errno != 0 && lval == 0))
+                {
+                    perror("strtol");
+                    vOK = 0;
+                    sleep(1);
+                }
+
+                if (endptr == buff)
+                {
+                    fprintf(stderr, "\nERROR: No digits were found\n");
+                    vOK = 0;
+                    sleep(1);
+                }
+
+                if (vOK == 1)
+                {
+                    fpsentry->parray[pindex].val.pid[0] = (pid_t)lval;
+                }
+                break;
+
+            case FPTYPE_FILENAME:
+                if (snprintf(fpsentry->parray[pindex].val.string[0], FUNCTION_PARAMETER_STRMAXLEN, "%s", buff) < 0)
+                {
+                    PRINT_ERROR("snprintf error");
+                }
+                break;
+
+            case FPTYPE_FITSFILENAME:
+                if (snprintf(fpsentry->parray[pindex].val.string[0], FUNCTION_PARAMETER_STRMAXLEN, "%s", buff) < 0)
+                {
+                    PRINT_ERROR("snprintf error");
+                }
+                break;
+
+            case FPTYPE_EXECFILENAME:
+                if (snprintf(fpsentry->parray[pindex].val.string[0], FUNCTION_PARAMETER_STRMAXLEN, "%s", buff) < 0)
+                {
+                    PRINT_ERROR("snprintf error");
+                }
+                break;
+
+            case FPTYPE_DIRNAME:
+                if (snprintf(fpsentry->parray[pindex].val.string[0], FUNCTION_PARAMETER_STRMAXLEN, "%s", buff) < 0)
+                {
+                    PRINT_ERROR("snprintf error");
+                }
+                break;
+
+            case FPTYPE_STREAMNAME:
+                if (snprintf(fpsentry->parray[pindex].val.string[0], FUNCTION_PARAMETER_STRMAXLEN, "%s", buff) < 0)
+                {
+                    PRINT_ERROR("snprintf error");
+                }
+                break;
+
+            case FPTYPE_STRING:
+                if (snprintf(fpsentry->parray[pindex].val.string[0], FUNCTION_PARAMETER_STRMAXLEN, "%s", buff) < 0)
+                {
+                    PRINT_ERROR("snprintf error");
+                }
+                break;
+
+            case FPTYPE_FPSNAME:
+                if (snprintf(fpsentry->parray[pindex].val.string[0], FUNCTION_PARAMETER_STRMAXLEN, "%s", buff) < 0)
+                {
+                    PRINT_ERROR("snprintf error");
+                }
+                break;
             }
 
             fpsentry->parray[pindex].cnt0++;
@@ -382,12 +349,10 @@ int functionparameter_UserInputSetParamValue(
             // notify GUI
             fpsentry->md->signal |= FUNCTION_PARAMETER_STRUCT_SIGNAL_UPDATE;
 
-
             // Save to disk
-            if(fpsentry->parray[pindex].fpflag & FPFLAG_SAVEONCHANGE)
+            if (fpsentry->parray[pindex].fpflag & FPFLAG_SAVEONCHANGE)
             {
-                functionparameter_WriteParameterToDisk(fpsentry, pindex, "setval",
-                                                       "UserInputSetParamValue");
+                functionparameter_WriteParameterToDisk(fpsentry, pindex, "setval", "UserInputSetParamValue");
             }
         }
     }
@@ -397,8 +362,5 @@ int functionparameter_UserInputSetParamValue(
         c = getchar();
     }
 
-
-
     return 0;
 }
-
diff --git a/src/CommandLineInterface/fps_userinputsetparamvalue.h b/src/CommandLineInterface/fps_userinputsetparamvalue.h
index b7fa582b..dde14a9a 100644
--- a/src/CommandLineInterface/fps_userinputsetparamvalue.h
+++ b/src/CommandLineInterface/fps_userinputsetparamvalue.h
@@ -8,9 +8,6 @@
 
 #include "function_parameters.h"
 
-int functionparameter_UserInputSetParamValue(
-    FUNCTION_PARAMETER_STRUCT *fpsentry,
-    int pindex
-);
+int functionparameter_UserInputSetParamValue(FUNCTION_PARAMETER_STRUCT *fpsentry, int pindex);
 
 #endif
diff --git a/src/CommandLineInterface/function_parameters.h b/src/CommandLineInterface/function_parameters.h
index 3cf5b8d1..9ac00a07 100644
--- a/src/CommandLineInterface/function_parameters.h
+++ b/src/CommandLineInterface/function_parameters.h
@@ -11,109 +11,98 @@
 
 #define FUNCTION_PARAMETERS_H
 
-
 #include "cmdsettings.h"
 
-
-#define STRINGMAXLEN_FPS_LOGMSG       1000
-#define STRINGMAXLEN_FPS_CMDLINE      1000
-
-
+#define STRINGMAXLEN_FPS_LOGMSG 1000
+#define STRINGMAXLEN_FPS_CMDLINE 1000
 
 #define NB_FPS_MAX 100
 
 #define MAXNBLEVELS 20
 
 #define FPSCONNECT_SIMPLE 0
-#define FPSCONNECT_CONF   1
-#define FPSCONNECT_RUN    2
-
+#define FPSCONNECT_CONF 1
+#define FPSCONNECT_RUN 2
 
 // CMCODE type is uint32_t
-#define FPSCMDCODE_CONFSTART          0x00000001  // start configuration process
-#define FPSCMDCODE_CONFSTOP           0x00000002  // stop configuration process
-#define FPSCMDCODE_FPSINIT            0x00000004  // initialize FPS if does not exist
-#define FPSCMDCODE_FPSINITCREATE      0x00000008  // (re-)create FPS even if it exists
-#define FPSCMDCODE_RUNSTART           0x00000010  // start run process
-#define FPSCMDCODE_RUNSTOP            0x00000020  // stop run process
-#define FPSCMDCODE_TMUXSTART          0x00000100  // start tmux sessions
-#define FPSCMDCODE_TMUXSTOP           0x00000200  // stop tmux sessions
-
-#define FPSCMDCODE_IGNORE             0x00001000  // do not run anything
+#define FPSCMDCODE_CONFSTART 0x00000001     // start configuration process
+#define FPSCMDCODE_CONFSTOP 0x00000002      // stop configuration process
+#define FPSCMDCODE_FPSINIT 0x00000004       // initialize FPS if does not exist
+#define FPSCMDCODE_FPSINITCREATE 0x00000008 // (re-)create FPS even if it exists
+#define FPSCMDCODE_RUNSTART 0x00000010      // start run process
+#define FPSCMDCODE_RUNSTOP 0x00000020       // stop run process
+#define FPSCMDCODE_TMUXSTART 0x00000100     // start tmux sessions
+#define FPSCMDCODE_TMUXSTOP 0x00000200      // stop tmux sessions
 
+#define FPSCMDCODE_IGNORE 0x00001000 // do not run anything
 
 // function can use this structure to expose parameters for external control or monitoring
 // the structure describes how user can interact with parameter, so it allows for control GUIs to connect to parameters
 
-#define FUNCTION_PARAMETER_KEYWORD_STRMAXLEN   64
-#define FUNCTION_PARAMETER_KEYWORD_MAXLEVEL    20
+#define FUNCTION_PARAMETER_KEYWORD_STRMAXLEN 64
+#define FUNCTION_PARAMETER_KEYWORD_MAXLEVEL 20
 
 // Note that notation allows parameter to have more than one type
 // ... to be used with caution: most of the time, use type exclusively
 // type is uint32_t
 
-#define FPTYPE_AUTO          0x00000000 // automatic typing
-#define FPTYPE_UNDEF         0x00000001
-#define FPTYPE_INT32         0x00000002
-#define FPTYPE_UINT32        0x00000004
-#define FPTYPE_INT64         0x00000008
-#define FPTYPE_UINT64        0x00000010
-#define FPTYPE_FLOAT32       0x00000020
-#define FPTYPE_FLOAT64       0x00000040
-
-#define FPTYPE_PID           0x00000080
-#define FPTYPE_TIMESPEC      0x00000100
-
-#define FPTYPE_FILENAME      0x00000200  // generic filename
-#define FPTYPE_FITSFILENAME  0x00000400  // FITS file
-#define FPTYPE_EXECFILENAME  0x00000800  // executable file
-
-#define FPTYPE_DIRNAME       0x00001000  // directory name
-#define FPTYPE_STREAMNAME    0x00002000  // stream name -> process may load from shm if required. See loading stream section below and associated flags
-#define FPTYPE_STRING        0x00004000  // generic string
-#define FPTYPE_ONOFF         0x00008000  // uses ONOFF bit flag, string[0] and string[1] for OFF and ON descriptions respectively. setval saves ONOFF as integer
-#define FPTYPE_PROCESS       0x00010000
-
-
-#define FPTYPE_FPSNAME       0x00020000 // connection to another FPS
+#define FPTYPE_AUTO 0x00000000 // automatic typing
+#define FPTYPE_UNDEF 0x00000001
+#define FPTYPE_INT32 0x00000002
+#define FPTYPE_UINT32 0x00000004
+#define FPTYPE_INT64 0x00000008
+#define FPTYPE_UINT64 0x00000010
+#define FPTYPE_FLOAT32 0x00000020
+#define FPTYPE_FLOAT64 0x00000040
 
+#define FPTYPE_PID 0x00000080
+#define FPTYPE_TIMESPEC 0x00000100
 
+#define FPTYPE_FILENAME 0x00000200     // generic filename
+#define FPTYPE_FITSFILENAME 0x00000400 // FITS file
+#define FPTYPE_EXECFILENAME 0x00000800 // executable file
 
-#define FUNCTION_PARAMETER_DESCR_STRMAXLEN   64
-#define FUNCTION_PARAMETER_STRMAXLEN         64
+#define FPTYPE_DIRNAME 0x00001000 // directory name
+#define FPTYPE_STREAMNAME                                                                                              \
+    0x00002000 // stream name -> process may load from shm if required. See loading stream section below and associated flags
+#define FPTYPE_STRING 0x00004000 // generic string
+#define FPTYPE_ONOFF                                                                                                   \
+    0x00008000 // uses ONOFF bit flag, string[0] and string[1] for OFF and ON descriptions respectively. setval saves ONOFF as integer
+#define FPTYPE_PROCESS 0x00010000
 
+#define FPTYPE_FPSNAME 0x00020000 // connection to another FPS
 
+#define FUNCTION_PARAMETER_DESCR_STRMAXLEN 64
+#define FUNCTION_PARAMETER_STRMAXLEN 64
 
 // Function Parameter (FP) flags
 
 // parameter use and visibility
-#define FPFLAG_ACTIVE        0x0000000000000001    // is this entry registered ?
-#define FPFLAG_USED          0x0000000000000002    // is this entry used ? if not, skip all checks
-#define FPFLAG_VISIBLE       0x0000000000000004    // is this entry visible (=displayed) ?
+#define FPFLAG_ACTIVE 0x0000000000000001  // is this entry registered ?
+#define FPFLAG_USED 0x0000000000000002    // is this entry used ? if not, skip all checks
+#define FPFLAG_VISIBLE 0x0000000000000004 // is this entry visible (=displayed) ?
 
 // write permission
-#define FPFLAG_WRITE         0x0000000000000010    // is value writable when neither CONF and RUN are active
-#define FPFLAG_WRITECONF     0x0000000000000020    // can user change value at configuration time ?
-#define FPFLAG_WRITERUN      0x0000000000000040    // can user change value at run time ?
-#define FPFLAG_WRITESTATUS   0x0000000000000080    // current write status (computed from above flags, initialized at 1)
+#define FPFLAG_WRITE 0x0000000000000010       // is value writable when neither CONF and RUN are active
+#define FPFLAG_WRITECONF 0x0000000000000020   // can user change value at configuration time ?
+#define FPFLAG_WRITERUN 0x0000000000000040    // can user change value at run time ?
+#define FPFLAG_WRITESTATUS 0x0000000000000080 // current write status (computed from above flags, initialized at 1)
 
 // logging and saving
-#define FPFLAG_LOG           0x0000000000000100    // log on change
-#define FPFLAG_SAVEONCHANGE  0x0000000000000200    // save to disk on change
-#define FPFLAG_SAVEONCLOSE   0x0000000000000400    // save to disk on close
+#define FPFLAG_LOG 0x0000000000000100          // log on change
+#define FPFLAG_SAVEONCHANGE 0x0000000000000200 // save to disk on change
+#define FPFLAG_SAVEONCLOSE 0x0000000000000400  // save to disk on close
 
 // special types
-#define FPFLAG_IMPORTED      0x0000000000001000    // is this entry imported from another parameter ?
-#define FPFLAG_FEEDBACK      0x0000000000002000    // is there a separate current value feedback ?
-#define FPFLAG_ONOFF         0x0000000000004000    // bit controlled under TYPE_ONOFF
+#define FPFLAG_IMPORTED 0x0000000000001000 // is this entry imported from another parameter ?
+#define FPFLAG_FEEDBACK 0x0000000000002000 // is there a separate current value feedback ?
+#define FPFLAG_ONOFF 0x0000000000004000    // bit controlled under TYPE_ONOFF
 
 // parameter testing
-#define FPFLAG_CHECKINIT     0x0000000000010000    // should parameter be initialized prior to function start ?
-#define FPFLAG_MINLIMIT      0x0000000000020000    // enforce min limit
-#define FPFLAG_MAXLIMIT      0x0000000000040000    // enforce max limit
-#define FPFLAG_ERROR         0x0000000000080000    // is current parameter value OK ?
-
-
+#define FPFLAG_CHECKINIT 0x0000000000010000 // should parameter be initialized prior to function start ?
+#define FPFLAG_MINLIMIT 0x0000000000020000  // enforce min limit
+#define FPFLAG_MAXLIMIT 0x0000000000040000  // enforce max limit
+#define FPFLAG_ERROR 0x0000000000080000     // is current parameter value OK ?
 
 // if FPTYPE_STREAMNAME
 // STREAM FLAGS: actions and tests related to streams
@@ -126,27 +115,26 @@
 // [d]-CONFNAME name of fits file configuration: a file ./conf/shmim.<stream>.fname.conf contains the name of the disk file to be loaded as the stream, relative to current running directory
 // --- convention : this is upstream ---
 
-
 // what is the source from which a stream was successfully loaded
-#define STREAM_LOAD_SOURCE_NOTFOUND   0
+#define STREAM_LOAD_SOURCE_NOTFOUND 0
 #define STREAM_LOAD_SOURCE_NOTFOUND_STRING "STREAM_LOAD_SOURCE_NOTFOUND"
 
-#define STREAM_LOAD_SOURCE_LOCALMEM  1
+#define STREAM_LOAD_SOURCE_LOCALMEM 1
 #define STREAM_LOAD_SOURCE_LOCALMEM_STRING "STREAM_LOAD_SOURCE_LOCALMEM"
 
-#define STREAM_LOAD_SOURCE_SHAREMEM  2
+#define STREAM_LOAD_SOURCE_SHAREMEM 2
 #define STREAM_LOAD_SOURCE_SHAREMEM_STRING "STREAM_LOAD_SOURCE_SHAREMEM"
 
-#define STREAM_LOAD_SOURCE_CONFFITS  3
+#define STREAM_LOAD_SOURCE_CONFFITS 3
 #define STREAM_LOAD_SOURCE_CONFFITS_STRING "STREAM_LOAD_SOURCE_CONFFITS"
 
-#define STREAM_LOAD_SOURCE_CONFNAME  4
+#define STREAM_LOAD_SOURCE_CONFNAME 4
 #define STREAM_LOAD_SOURCE_CONFNAME_STRING "STREAM_LOAD_SOURCE_CONFNAME"
 
-#define STREAM_LOAD_SOURCE_NULL  5
+#define STREAM_LOAD_SOURCE_NULL 5
 #define STREAM_LOAD_SOURCE_NULL_STRING "STREAM_LOAD_SOURCE_NULL"
 
-#define STREAM_LOAD_SOURCE_EXITFAILURE   -1
+#define STREAM_LOAD_SOURCE_EXITFAILURE -1
 #define STREAM_LOAD_SOURCE_EXITFAILURE_STRING "STREAM_LOAD_SOURCE_EXITFAILURE"
 
 //
@@ -163,7 +151,6 @@
 //
 //
 
-
 // STREAM LOADING POLICY FLAGS
 // These flags modify the default stream load policy
 // Default load policy: FORCE flags = 0, SKIPSEARCH flags = 0, UPDATE flags = 0
@@ -171,10 +158,10 @@
 // FORCE flags will force a location to be used and all downstream locations to be updated
 // if the FORCE location does not exist, it will fail
 // only one such flag should be specified. If several force flags are specified, the first one ((a) over (b)) will be considered
-#define FPFLAG_STREAM_LOAD_FORCE_LOCALMEM        0x0000000000100000
-#define FPFLAG_STREAM_LOAD_FORCE_SHAREMEM        0x0000000000200000
-#define FPFLAG_STREAM_LOAD_FORCE_CONFFITS        0x0000000000400000
-#define FPFLAG_STREAM_LOAD_FORCE_CONFNAME        0x0000000000800000
+#define FPFLAG_STREAM_LOAD_FORCE_LOCALMEM 0x0000000000100000
+#define FPFLAG_STREAM_LOAD_FORCE_SHAREMEM 0x0000000000200000
+#define FPFLAG_STREAM_LOAD_FORCE_CONFFITS 0x0000000000400000
+#define FPFLAG_STREAM_LOAD_FORCE_CONFNAME 0x0000000000800000
 
 // SKIPSEARCH flags will skip search location
 // multiple such flags can be specified
@@ -182,34 +169,27 @@
 // Note that the FORCE flags have priority over the SKIPSEARCH flags
 // If a FORCE flag is active, the SKIPSEARCH flags will be ignored
 //
-#define FPFLAG_STREAM_LOAD_SKIPSEARCH_LOCALMEM   0x0000000001000000
-#define FPFLAG_STREAM_LOAD_SKIPSEARCH_SHAREMEM   0x0000000002000000
-#define FPFLAG_STREAM_LOAD_SKIPSEARCH_CONFFITS   0x0000000004000000
-#define FPFLAG_STREAM_LOAD_SKIPSEARCH_CONFNAME   0x0000000008000000
+#define FPFLAG_STREAM_LOAD_SKIPSEARCH_LOCALMEM 0x0000000001000000
+#define FPFLAG_STREAM_LOAD_SKIPSEARCH_SHAREMEM 0x0000000002000000
+#define FPFLAG_STREAM_LOAD_SKIPSEARCH_CONFFITS 0x0000000004000000
+#define FPFLAG_STREAM_LOAD_SKIPSEARCH_CONFNAME 0x0000000008000000
 
 // UPDATE flags will update upstream locations
-#define FPFLAG_STREAM_LOAD_UPDATE_SHAREMEM       0x0000000010000000
-#define FPFLAG_STREAM_LOAD_UPDATE_CONFFITS       0x0000000020000000
-
-
-
+#define FPFLAG_STREAM_LOAD_UPDATE_SHAREMEM 0x0000000010000000
+#define FPFLAG_STREAM_LOAD_UPDATE_CONFFITS 0x0000000020000000
 
 // Additionally, the following flags specify what to do if stream properties do not match the required properties
 //
 
-
-#define FPFLAG_FILE_CONF_REQUIRED                0x0000000040000000  // file must exist for CONF process to proceed
-#define FPFLAG_FILE_RUN_REQUIRED                 0x0000000080000000  // file must exist for RUN process to proceed
+#define FPFLAG_FILE_CONF_REQUIRED 0x0000000040000000 // file must exist for CONF process to proceed
+#define FPFLAG_FILE_RUN_REQUIRED 0x0000000080000000  // file must exist for RUN process to proceed
 // note: we can reuse same codes
 
-#define FPFLAG_FPS_CONF_REQUIRED                 0x0000000040000000  // file must exist for CONF process to proceed
-#define FPFLAG_FPS_RUN_REQUIRED                  0x0000000080000000  // file must exist for RUN process to proceed
-
-#define FPFLAG_STREAM_CONF_REQUIRED              0x0000000040000000  // stream has to be in MEM for CONF process to proceed
-#define FPFLAG_STREAM_RUN_REQUIRED               0x0000000080000000  // stream has to be in MEM for RUN process to proceed
-
-
+#define FPFLAG_FPS_CONF_REQUIRED 0x0000000040000000 // file must exist for CONF process to proceed
+#define FPFLAG_FPS_RUN_REQUIRED 0x0000000080000000  // file must exist for RUN process to proceed
 
+#define FPFLAG_STREAM_CONF_REQUIRED 0x0000000040000000 // stream has to be in MEM for CONF process to proceed
+#define FPFLAG_STREAM_RUN_REQUIRED 0x0000000080000000  // stream has to be in MEM for RUN process to proceed
 
 // Additional notes on load functions in AOloopControl_IOtools
 //
@@ -221,77 +201,60 @@
 */
 //
 
-
-
-
-#define FPFLAG_STREAM_ENFORCE_DATATYPE           0x0000000100000000  // enforce stream datatype
+#define FPFLAG_STREAM_ENFORCE_DATATYPE 0x0000000100000000 // enforce stream datatype
 // stream type requirement: one of the following tests must succeed (OR) if FPFLAG_STREAM_ENFORCE_DATATYPE
 // If creating image, the first active entry is used
-#define FPFLAG_STREAM_TEST_DATATYPE_UINT8        0x0000000200000000  // test if stream of type UINT8   (OR test)
-#define FPFLAG_STREAM_TEST_DATATYPE_INT8         0x0000000400000000  // test if stream of type INT8    (OR test)
-#define FPFLAG_STREAM_TEST_DATATYPE_UINT16       0x0000000800000000  // test if stream of type UINT16  (OR test)
-#define FPFLAG_STREAM_TEST_DATATYPE_INT16        0x0000001000000000  // test if stream of type INT16   (OR test)
-#define FPFLAG_STREAM_TEST_DATATYPE_UINT32       0x0000002000000000  // test if stream of type UINT32  (OR test)
-#define FPFLAG_STREAM_TEST_DATATYPE_INT32        0x0000004000000000  // test if stream of type INT32   (OR test)
-#define FPFLAG_STREAM_TEST_DATATYPE_UINT64       0x0000008000000000  // test if stream of type UINT64  (OR test)
-#define FPFLAG_STREAM_TEST_DATATYPE_INT64        0x0000010000000000  // test if stream of type INT64   (OR test)
-#define FPFLAG_STREAM_TEST_DATATYPE_HALF         0x0000020000000000  // test if stream of type HALF    (OR test)
-#define FPFLAG_STREAM_TEST_DATATYPE_FLOAT        0x0000040000000000  // test if stream of type FLOAT   (OR test)
-#define FPFLAG_STREAM_TEST_DATATYPE_DOUBLE       0x0000080000000000  // test if stream of type DOUBLE  (OR test)
-
-#define FPFLAG_STREAM_ENFORCE_1D                 0x0000100000000000  // enforce 1D image
-#define FPFLAG_STREAM_ENFORCE_2D                 0x0000200000000000  // enforce 2D image
-#define FPFLAG_STREAM_ENFORCE_3D                 0x0000400000000000  // enforce 3D image
-#define FPFLAG_STREAM_ENFORCE_XSIZE              0x0008000000000000  // enforce X size
-#define FPFLAG_STREAM_ENFORCE_YSIZE              0x0010000000000000  // enforce Y size
-#define FPFLAG_STREAM_ENFORCE_ZSIZE              0x0020000000000000  // enforce Z size
-
-#define FPFLAG_CHECKSTREAM                       0x0040000000000000  // check and display stream status in GUI
-#define FPFLAG_STREAM_MEMLOADREPORT              0x0080000000000000  // Write stream load report (for debugging)
-
-
-
-
-
-
-
+#define FPFLAG_STREAM_TEST_DATATYPE_UINT8 0x0000000200000000  // test if stream of type UINT8   (OR test)
+#define FPFLAG_STREAM_TEST_DATATYPE_INT8 0x0000000400000000   // test if stream of type INT8    (OR test)
+#define FPFLAG_STREAM_TEST_DATATYPE_UINT16 0x0000000800000000 // test if stream of type UINT16  (OR test)
+#define FPFLAG_STREAM_TEST_DATATYPE_INT16 0x0000001000000000  // test if stream of type INT16   (OR test)
+#define FPFLAG_STREAM_TEST_DATATYPE_UINT32 0x0000002000000000 // test if stream of type UINT32  (OR test)
+#define FPFLAG_STREAM_TEST_DATATYPE_INT32 0x0000004000000000  // test if stream of type INT32   (OR test)
+#define FPFLAG_STREAM_TEST_DATATYPE_UINT64 0x0000008000000000 // test if stream of type UINT64  (OR test)
+#define FPFLAG_STREAM_TEST_DATATYPE_INT64 0x0000010000000000  // test if stream of type INT64   (OR test)
+#define FPFLAG_STREAM_TEST_DATATYPE_HALF 0x0000020000000000   // test if stream of type HALF    (OR test)
+#define FPFLAG_STREAM_TEST_DATATYPE_FLOAT 0x0000040000000000  // test if stream of type FLOAT   (OR test)
+#define FPFLAG_STREAM_TEST_DATATYPE_DOUBLE 0x0000080000000000 // test if stream of type DOUBLE  (OR test)
+
+#define FPFLAG_STREAM_ENFORCE_1D 0x0000100000000000    // enforce 1D image
+#define FPFLAG_STREAM_ENFORCE_2D 0x0000200000000000    // enforce 2D image
+#define FPFLAG_STREAM_ENFORCE_3D 0x0000400000000000    // enforce 3D image
+#define FPFLAG_STREAM_ENFORCE_XSIZE 0x0008000000000000 // enforce X size
+#define FPFLAG_STREAM_ENFORCE_YSIZE 0x0010000000000000 // enforce Y size
+#define FPFLAG_STREAM_ENFORCE_ZSIZE 0x0020000000000000 // enforce Z size
+
+#define FPFLAG_CHECKSTREAM 0x0040000000000000          // check and display stream status in GUI
+#define FPFLAG_STREAM_MEMLOADREPORT 0x0080000000000000 // Write stream load report (for debugging)
 
 // PRE-ASSEMBLED DEFAULT FLAGS
 
 // input parameter (used as default when adding entry)
-#define FPFLAG_DEFAULT_INPUT            FPFLAG_ACTIVE|FPFLAG_USED|FPFLAG_VISIBLE|FPFLAG_WRITE|FPFLAG_WRITECONF|FPFLAG_SAVEONCHANGE|FPFLAG_FEEDBACK|FPFLAG_WRITESTATUS
-#define FPFLAG_DEFAULT_OUTPUT           FPFLAG_ACTIVE|FPFLAG_USED|FPFLAG_VISIBLE
-#define FPFLAG_DEFAULT_INPUT_STREAM     FPFLAG_DEFAULT_INPUT|FPFLAG_STREAM_RUN_REQUIRED|FPFLAG_CHECKSTREAM
-#define FPFLAG_DEFAULT_OUTPUT_STREAM    FPFLAG_DEFAULT_INPUT|FPFLAG_CHECKSTREAM
-
+#define FPFLAG_DEFAULT_INPUT                                                                                           \
+    FPFLAG_ACTIVE | FPFLAG_USED | FPFLAG_VISIBLE | FPFLAG_WRITE | FPFLAG_WRITECONF | FPFLAG_SAVEONCHANGE |             \
+        FPFLAG_FEEDBACK | FPFLAG_WRITESTATUS
+#define FPFLAG_DEFAULT_OUTPUT FPFLAG_ACTIVE | FPFLAG_USED | FPFLAG_VISIBLE
+#define FPFLAG_DEFAULT_INPUT_STREAM FPFLAG_DEFAULT_INPUT | FPFLAG_STREAM_RUN_REQUIRED | FPFLAG_CHECKSTREAM
+#define FPFLAG_DEFAULT_OUTPUT_STREAM FPFLAG_DEFAULT_INPUT | FPFLAG_CHECKSTREAM
 
 // status parameters, no logging, read only
-#define FPFLAG_DEFAULT_STATUS     FPFLAG_ACTIVE|FPFLAG_USED|FPFLAG_VISIBLE
-
-
-
-
-
-#define FUNCTION_PARAMETER_NBPARAM_DEFAULT    100       // size of dynamically allocated array of parameters
-
+#define FPFLAG_DEFAULT_STATUS FPFLAG_ACTIVE | FPFLAG_USED | FPFLAG_VISIBLE
 
+#define FUNCTION_PARAMETER_NBPARAM_DEFAULT 100 // size of dynamically allocated array of parameters
 
 typedef struct
 {
-    long      streamID; // if type is stream and MASK_CHECKSTREAM. For CONF only
-    uint8_t   stream_atype;
+    long streamID; // if type is stream and MASK_CHECKSTREAM. For CONF only
+    uint8_t stream_atype;
 
     // these have two entries. First is actual/measured, second is required (0 if dimension not active)
     // tests are specified by flags FPFLAG_STREAM_ENFORCE_1D/2D/3D/XSIZE/YSIZE/ZSIZE
-    uint32_t  stream_naxis[2];
-    uint32_t  stream_xsize[2];        // xsize
-    uint32_t  stream_ysize[2];        // ysize
-    uint32_t  stream_zsize[2];        // zsize
-    uint8_t   stream_sourceLocation;  // where has the stream been loaded from ?
+    uint32_t stream_naxis[2];
+    uint32_t stream_xsize[2];      // xsize
+    uint32_t stream_ysize[2];      // ysize
+    uint32_t stream_zsize[2];      // zsize
+    uint8_t stream_sourceLocation; // where has the stream been loaded from ?
 } FUNCTION_PARAMETER_SUBINFO_STREAM;
 
-
-
 typedef struct
 {
     long FPSNBparamMAX; // to be written by connect function
@@ -299,21 +262,17 @@ typedef struct
     long FPSNBparamUsed;
 } FUNCTION_PARAMETER_SUBINFO_FPS;
 
-
-
 typedef struct
 {
-    uint64_t fpflag;// 64 binary flags, see FUNCTION_PARAMETER_MASK_XXXX
+    uint64_t fpflag; // 64 binary flags, see FUNCTION_PARAMETER_MASK_XXXX
 
     // Parameter name
-    char keywordfull[FUNCTION_PARAMETER_KEYWORD_STRMAXLEN *
-                                                          FUNCTION_PARAMETER_KEYWORD_MAXLEVEL];
+    char keywordfull[FUNCTION_PARAMETER_KEYWORD_STRMAXLEN * FUNCTION_PARAMETER_KEYWORD_MAXLEVEL];
     char keyword[FUNCTION_PARAMETER_KEYWORD_MAXLEVEL][FUNCTION_PARAMETER_KEYWORD_STRMAXLEN];
     int keywordlevel; // number of levels in keyword
 
     // if this parameter value imported from another parameter, source is:
-    char keywordfrom[FUNCTION_PARAMETER_KEYWORD_STRMAXLEN *
-                                                          FUNCTION_PARAMETER_KEYWORD_MAXLEVEL];
+    char keywordfrom[FUNCTION_PARAMETER_KEYWORD_STRMAXLEN * FUNCTION_PARAMETER_KEYWORD_MAXLEVEL];
 
     char description[FUNCTION_PARAMETER_DESCR_STRMAXLEN];
 
@@ -323,14 +282,14 @@ typedef struct
     union
     {
         // value, min (inclusive), max (inclusive), current state (if different from request)
-        int32_t  i32[4];
+        int32_t i32[4];
         uint32_t ui32[4];
-        int64_t  i64[4];
+        int64_t i64[4];
         uint64_t ui64[4];
 
         // value, min, max, current state (if different from request)
         double f64[4];
-        float  f32[4];
+        float f32[4];
 
         // first value is set point, second is current state
         pid_t pid[2];
@@ -344,151 +303,124 @@ typedef struct
         // if TYPE = PROCESS, string[0] is tmux session, string[1] is launch command
     } val;
 
-
     union
     {
-        FUNCTION_PARAMETER_SUBINFO_STREAM stream;   // if type stream
-        FUNCTION_PARAMETER_SUBINFO_FPS    fps;      // if FPTYPE_FPSNAME
+        FUNCTION_PARAMETER_SUBINFO_STREAM stream; // if type stream
+        FUNCTION_PARAMETER_SUBINFO_FPS fps;       // if FPTYPE_FPSNAME
     } info;
 
-
     long cnt0; // increments when changed
 
 } FUNCTION_PARAMETER;
 
+#define STRINGMAXLEN_FPS_NAME 100
 
+#define FUNCTION_PARAMETER_STRUCT_MSG_SIZE 500
 
+#define FUNCTION_PARAMETER_STRUCT_STATUS_CONF 0x0001 // is configuration running ?
+#define FUNCTION_PARAMETER_STRUCT_STATUS_RUN 0x0002  // is process running ?
 
-#define STRINGMAXLEN_FPS_NAME      100
-
-#define FUNCTION_PARAMETER_STRUCT_MSG_SIZE  500
-
+#define FUNCTION_PARAMETER_STRUCT_STATUS_CMDCONF 0x0010 // should configuration be running ?
+#define FUNCTION_PARAMETER_STRUCT_STATUS_CMDRUN 0x0020  // should process be running ?
 
-
-#define FUNCTION_PARAMETER_STRUCT_STATUS_CONF       0x0001   // is configuration running ?
-#define FUNCTION_PARAMETER_STRUCT_STATUS_RUN        0x0002   // is process running ?
-
-#define FUNCTION_PARAMETER_STRUCT_STATUS_CMDCONF    0x0010   // should configuration be running ?
-#define FUNCTION_PARAMETER_STRUCT_STATUS_CMDRUN     0x0020   // should process be running ?
-
-#define FUNCTION_PARAMETER_STRUCT_STATUS_RUNLOOP    0x0100   // is process loop running ?
-#define FUNCTION_PARAMETER_STRUCT_STATUS_CHECKOK    0x0200   // Are parameter values OK to run loop process ? (1=OK, 0=not OK)
+#define FUNCTION_PARAMETER_STRUCT_STATUS_RUNLOOP 0x0100 // is process loop running ?
+#define FUNCTION_PARAMETER_STRUCT_STATUS_CHECKOK                                                                       \
+    0x0200 // Are parameter values OK to run loop process ? (1=OK, 0=not OK)
 
 // are tmux sessions online ?
-#define FUNCTION_PARAMETER_STRUCT_STATUS_TMUXCONF   0x1000
-#define FUNCTION_PARAMETER_STRUCT_STATUS_TMUXRUN    0x2000
-#define FUNCTION_PARAMETER_STRUCT_STATUS_TMUXCTRL   0x4000
-
-
+#define FUNCTION_PARAMETER_STRUCT_STATUS_TMUXCONF 0x1000
+#define FUNCTION_PARAMETER_STRUCT_STATUS_TMUXRUN 0x2000
+#define FUNCTION_PARAMETER_STRUCT_STATUS_TMUXCTRL 0x4000
 
-
-
-#define FUNCTION_PARAMETER_STRUCT_SIGNAL_CONFRUN    0x0001   // configuration process
+#define FUNCTION_PARAMETER_STRUCT_SIGNAL_CONFRUN 0x0001 // configuration process
 //#define FUNCTION_PARAMETER_STRUCT_SIGNAL_CONFSTOP   0x0002   // stop configuration process
-#define FUNCTION_PARAMETER_STRUCT_SIGNAL_UPDATE     0x0004   // re-run check of parameter
+#define FUNCTION_PARAMETER_STRUCT_SIGNAL_UPDATE 0x0004 // re-run check of parameter
 
-#define FUNCTION_PARAMETER_STRUCT_SIGNAL_CHECKED    0x0008   // CheckParametersAll been completed.
+#define FUNCTION_PARAMETER_STRUCT_SIGNAL_CHECKED 0x0008 // CheckParametersAll been completed.
 // Toggles to 1 upon update request
 // Toggles to 0 when update completed (in function CheckParametersAll)
 
-
-
-
-
 // ERROR AND WARNING MESSAGES
 
-#define FPS_NB_MSG                          100 // max number of messages
-#define FUNCTION_PARAMETER_STRUCT_MSG_LEN   500
+#define FPS_NB_MSG 100 // max number of messages
+#define FUNCTION_PARAMETER_STRUCT_MSG_LEN 500
 
-
-#define FPS_MSG_FLAG_NOTINITIALIZED         0x0001
-#define FPS_MSG_FLAG_BELOWMIN               0x0002
-#define FPS_MSG_FLAG_ABOVEMAX               0x0004
+#define FPS_MSG_FLAG_NOTINITIALIZED 0x0001
+#define FPS_MSG_FLAG_BELOWMIN 0x0002
+#define FPS_MSG_FLAG_ABOVEMAX 0x0004
 
 // by default, a message is a warning
-#define FPS_MSG_FLAG_ERROR                  0x0008  // if ERROR, then cannot start function
-#define FPS_MSG_FLAG_INFO                   0x0010
-
-
-
-#define FPS_CWD_STRLENMAX           200
-#define FPS_DIR_STRLENMAX           200
-#define FPS_SRCDIR_STRLENMAX        200
-#define FPS_PNAME_STRMAXLEN         100
-#define FPS_CALLPROGNAME_STRMAXLEN   80
-#define FPS_CALLFUNCNAME_STRMAXLEN  100
-#define FPS_DESCR_STRMAXLEN         200
-#define STRINGMAXLEN_FPS_DIRNAME    200
-
-#define FPS_MAXNB_MODULE      20
+#define FPS_MSG_FLAG_ERROR 0x0008 // if ERROR, then cannot start function
+#define FPS_MSG_FLAG_INFO 0x0010
+
+#define FPS_CWD_STRLENMAX 200
+#define FPS_DIR_STRLENMAX 200
+#define FPS_SRCDIR_STRLENMAX 200
+#define FPS_PNAME_STRMAXLEN 100
+#define FPS_CALLPROGNAME_STRMAXLEN 80
+#define FPS_CALLFUNCNAME_STRMAXLEN 100
+#define FPS_DESCR_STRMAXLEN 200
+#define STRINGMAXLEN_FPS_DIRNAME 200
+
+#define FPS_MAXNB_MODULE 20
 #define FPS_MODULE_STRMAXLEN 200
 
-
 // metadata
 typedef struct
 {
     // process name
     // Name can include numbers in the format -XX-YY to allow for multiple structures be created by the same process function and to pass arguments (XX, YY) to process function
-    char                name[STRINGMAXLEN_FPS_NAME];         // example: pname-01-32
-
-    char                description[FPS_DESCR_STRMAXLEN];
+    char name[STRINGMAXLEN_FPS_NAME]; // example: pname-01-32
 
+    char description[FPS_DESCR_STRMAXLEN];
 
     // where should processes run from ?
-    char                workdir[FPS_CWD_STRLENMAX];
+    char workdir[FPS_CWD_STRLENMAX];
 
     // [output] where should configurations and results be written to ?
-    char                datadir[FPS_DIR_STRLENMAX];
+    char datadir[FPS_DIR_STRLENMAX];
     // [input] directory for configuration
-    char                confdir[FPS_DIR_STRLENMAX];
+    char confdir[FPS_DIR_STRLENMAX];
 
     // source code file name
-    char				sourcefname[FPS_SRCDIR_STRLENMAX];
+    char sourcefname[FPS_SRCDIR_STRLENMAX];
     // souce code line
-    int					sourceline;
-
-
+    int sourceline;
 
     // the name and indices are automatically parsed in the following format
-    char                pname[FPS_PNAME_STRMAXLEN];          // example: pname
-    char                callprogname[FPS_CALLPROGNAME_STRMAXLEN];
-    char                callfuncname[FPS_CALLFUNCNAME_STRMAXLEN];
-    char                nameindexW[16][10];  // subnames
-    int                 NBnameindex;         // example: 2
+    char pname[FPS_PNAME_STRMAXLEN]; // example: pname
+    char callprogname[FPS_CALLPROGNAME_STRMAXLEN];
+    char callfuncname[FPS_CALLFUNCNAME_STRMAXLEN];
+    char nameindexW[16][10]; // subnames
+    int NBnameindex;         // example: 2
 
     // configuration will run in tmux session pname-XX:conf
     // process       will run in tmux session pname-XX:run
 
     // PID of process owning parameter structure configuration
-    pid_t               confpid;
-    struct timespec     confpidstarttime;
+    pid_t confpid;
+    struct timespec confpidstarttime;
 
     // PID of process running on this fps
-    pid_t               runpid;
-    struct timespec     runpidstarttime;
-
+    pid_t runpid;
+    struct timespec runpidstarttime;
 
     // shared objects (modules) required to be loaded
     int NBmodule;
     char modulename[FPS_MAXNB_MODULE][FPS_MODULE_STRMAXLEN];
 
-
     // Used to send signals to configuration process
-    uint64_t            signal;
+    uint64_t signal;
 
     // configuration wait timer value [us]
-    uint64_t            confwaitus;
-
-    uint32_t            status;          // conf and process status
-
+    uint64_t confwaitus;
 
+    uint32_t status; // conf and process status
 
     // size of parameter array (= max number of parameter supported)
     long NBparamMAX;
 
-
-    char
-    message[FPS_NB_MSG][FUNCTION_PARAMETER_STRUCT_MSG_LEN];
+    char message[FPS_NB_MSG][FUNCTION_PARAMETER_STRUCT_MSG_LEN];
 
     // to which entry does the message refer to ?
     int msgpindex[FPS_NB_MSG];
@@ -496,45 +428,34 @@ typedef struct
     // What is the nature of the message/error ?
     uint32_t msgcode[FPS_NB_MSG];
 
-    long                          msgcnt;
+    long msgcnt;
 
-    uint32_t                      conferrcnt;
+    uint32_t conferrcnt;
 
 } FUNCTION_PARAMETER_STRUCT_MD;
 
-
-
-
 // localstatus flags
 //
 // run configuration loop
 #define FPS_LOCALSTATUS_CONFLOOP 0x0001
 
-
-
 typedef struct
 {
     // these two structures are shared
     FUNCTION_PARAMETER_STRUCT_MD *md;
-    FUNCTION_PARAMETER           *parray;   // array of function parameters
+    FUNCTION_PARAMETER *parray; // array of function parameters
 
     // these variables are local to each process
-    uint16_t  localstatus;   // 1 if conf loop should be active
-    int       SMfd;
-    uint32_t  CMDmode;
+    uint16_t localstatus; // 1 if conf loop should be active
+    int SMfd;
+    uint32_t CMDmode;
 
-    long      NBparam;        // number of parameters in array
-    long      NBparamActive;  // number of active parameters
+    long NBparam;       // number of parameters in array
+    long NBparamActive; // number of active parameters
 
     CMDSETTINGS cmdset; // local copy of cmd settings
 } FUNCTION_PARAMETER_STRUCT;
 
-
-
-
-
-
-
 //
 // Tasks can be sequenced
 // Typically these are read from command fifo
@@ -542,28 +463,28 @@ typedef struct
 //
 
 // max number of entries in queues (total among all queues)
-#define NB_FPSCTRL_TASK_MAX             500
-#define NB_FPSCTRL_TASK_PURGESIZE        50
+#define NB_FPSCTRL_TASK_MAX 500
+#define NB_FPSCTRL_TASK_PURGESIZE 50
 
 // flags
-#define FPSTASK_STATUS_ACTIVE    0x0000000000000001   // is the task entry in the array used ?
-#define FPSTASK_STATUS_SHOW      0x0000000000000002
-#define FPSTASK_STATUS_RUNNING   0x0000000000000004
+#define FPSTASK_STATUS_ACTIVE 0x0000000000000001 // is the task entry in the array used ?
+#define FPSTASK_STATUS_SHOW 0x0000000000000002
+#define FPSTASK_STATUS_RUNNING 0x0000000000000004
 #define FPSTASK_STATUS_COMPLETED 0x0000000000000008
 
 // status (cumulative)
-#define FPSTASK_STATUS_WAITING      0x0000000000000010
-#define FPSTASK_STATUS_RECEIVED     0x0000000000000020
-#define FPSTASK_STATUS_CMDNOTFOUND  0x0000000000000040
-#define FPSTASK_STATUS_CMDFAIL      0x0000000000000080
-#define FPSTASK_STATUS_ERR_ARGTYPE  0x0000000000000100
+#define FPSTASK_STATUS_WAITING 0x0000000000000010
+#define FPSTASK_STATUS_RECEIVED 0x0000000000000020
+#define FPSTASK_STATUS_CMDNOTFOUND 0x0000000000000040
+#define FPSTASK_STATUS_CMDFAIL 0x0000000000000080
+#define FPSTASK_STATUS_ERR_ARGTYPE 0x0000000000000100
 #define FPSTASK_STATUS_ERR_TYPECONV 0x0000000000000200
-#define FPSTASK_STATUS_ERR_NBARG    0x0000000000000400
-#define FPSTASK_STATUS_ERR_NOFPS    0x0000000000000800
-#define FPSTASK_STATUS_CMDOK        0x0000000000001000
+#define FPSTASK_STATUS_ERR_NBARG 0x0000000000000400
+#define FPSTASK_STATUS_ERR_NOFPS 0x0000000000000800
+#define FPSTASK_STATUS_CMDOK 0x0000000000001000
 
 // use WAITONRUN to ensure the queue is blocked until the current run process is done
-#define FPSTASK_FLAG_WAITONRUN  0x0000000000000001
+#define FPSTASK_FLAG_WAITONRUN 0x0000000000000001
 #define FPSTASK_FLAG_WAITONCONF 0x0000000000000002
 
 // If ON, the task is a wait point, and will only proceed if the FPS pointed to by fpsindex is NOT running
@@ -579,15 +500,12 @@ typedef struct
 
 } FPSCTRL_TASK_QUEUE;
 
-
-
 typedef struct
 {
 
     char cmdstring[STRINGMAXLEN_FPS_CMDLINE];
 
-
-    uint64_t inputindex;  // order in which tasks are submitted
+    uint64_t inputindex; // order in which tasks are submitted
 
     // Tasks in separate queues can run in parallel (not waiting for last task to run new one)
     // Tasks within a queue run sequentially
@@ -597,7 +515,7 @@ typedef struct
     uint64_t status;
     uint64_t flag;
 
-    int fpsindex;  // used to track status
+    int fpsindex; // used to track status
 
     struct timespec creationtime;
     struct timespec activationtime;
@@ -605,55 +523,37 @@ typedef struct
 
 } FPSCTRL_TASK_ENTRY;
 
-
-
-
-
-
 // status of control / monitoring process
 //
 typedef struct
 {
-    int      exitloop;    // exit control loop if 1
-    int      fpsCTRL_DisplayMode; // Display mode
-    uint32_t mode;                // GUI mode
-    int      NBfps;               // Number of FPS entries
-    int      NBkwn;               // Number of keyword nodes
-    long     NBindex;
-    char     fpsnamemask[100];
-    int      nodeSelected;
-    int      run_display;
-    int      fpsindexSelected;
-    int      GUIlineSelected[100];
-    int      currentlevel;
-    int      directorynodeSelected;
-    int      pindexSelected;
-    char     fpsCTRLfifoname[200];
-    int      fpsCTRLfifofd;
-    int      direction;
+    int exitloop;            // exit control loop if 1
+    int fpsCTRL_DisplayMode; // Display mode
+    uint32_t mode;           // GUI mode
+    int NBfps;               // Number of FPS entries
+    int NBkwn;               // Number of keyword nodes
+    long NBindex;
+    char fpsnamemask[100];
+    int nodeSelected;
+    int run_display;
+    int fpsindexSelected;
+    int GUIlineSelected[100];
+    int currentlevel;
+    int directorynodeSelected;
+    int pindexSelected;
+    char fpsCTRLfifoname[200];
+    int fpsCTRLfifofd;
+    int direction;
 } FPSCTRL_PROCESS_VARS;
 
-
-
-
-
-
-
-
-
-
-
-
-
 #define NB_KEYWNODE_MAX 10000
 #define MAX_NB_CHILD 500
 
 typedef struct
 {
-    char keywordfull[FUNCTION_PARAMETER_KEYWORD_STRMAXLEN *
-                                                          FUNCTION_PARAMETER_KEYWORD_MAXLEVEL];
+    char keywordfull[FUNCTION_PARAMETER_KEYWORD_STRMAXLEN * FUNCTION_PARAMETER_KEYWORD_MAXLEVEL];
     char keyword[FUNCTION_PARAMETER_KEYWORD_MAXLEVEL][FUNCTION_PARAMETER_KEYWORD_STRMAXLEN];
-    int  keywordlevel;
+    int keywordlevel;
 
     int parent_index;
 
@@ -664,44 +564,31 @@ typedef struct
     int fpsindex;
     int pindex;
 
-
 } KEYWORD_TREE_NODE;
 
-
-
-
-
-
-
+#include "fpsCTRL_TUI.h"
+#include "fps_FPCONFexit.h"
+#include "fps_FPCONFloopstep.h"
+#include "fps_FPCONFsetup.h"
+#include "fps_RUNexit.h"
 #include "fps_add_entry.h"
 #include "fps_checkparameter.h"
 #include "fps_connect.h"
 #include "fps_connectExternalFPS.h"
-#include "fpsCTRL_TUI.h"
 #include "fps_disconnect.h"
 #include "fps_execFPScmd.h"
-#include "fps_FPCONFexit.h"
-#include "fps_FPCONFloopstep.h"
-#include "fps_FPCONFsetup.h"
 #include "fps_getFPSargs.h"
 #include "fps_load.h"
 #include "fps_outlog.h"
 #include "fps_paramvalue.h"
 #include "fps_processinfo_entries.h"
-#include "fps_RUNexit.h"
 #include "fps_save2disk.h"
 #include "fps_shmdirname.h"
 
-
-
-
-
-
 // ===========================
 // CONVENIENT MACROS FOR FPS
 // ===========================
 
-
 /** @defgroup fpsmacro          MACROS: Function parameter structure
  *
  * Frequently used function parameter structure (FPS) operations :
@@ -711,139 +598,144 @@ typedef struct
  * @{
  */
 
-
 /**
  * @brief Initialize function parameter structure (FPS)
  *
  * @param[in] VARfpsname FPS name
  * @param[in] VARCMDmode command code
  */
-#define FPS_SETUP_INIT(VARfpsname,VARCMDmode) FUNCTION_PARAMETER_STRUCT fps; do { \
-  fps.SMfd =  -1; \
-  fps = function_parameter_FPCONFsetup((VARfpsname), (VARCMDmode)); \
-  strncpy(fps.md->sourcefname, __FILE__, FPS_SRCDIR_STRLENMAX);\
-  fps.md->sourceline = __LINE__; \
-  { \
-    char msgstring[STRINGMAXLEN_FPS_LOGMSG]; \
-    SNPRINTF_CHECK(msgstring, STRINGMAXLEN_FPS_LOGMSG, "LOGSTART %s %d %s %d", (VARfpsname), (VARCMDmode), fps.md->sourcefname, fps.md->sourceline); \
-    functionparameter_outlog("FPSINIT", msgstring); \
-    functionparameter_outlog_namelink(); \
-  } \
-} while(0)
-
-
+#define FPS_SETUP_INIT(VARfpsname, VARCMDmode)                                                                         \
+    FUNCTION_PARAMETER_STRUCT fps;                                                                                     \
+    do                                                                                                                 \
+    {                                                                                                                  \
+        fps.SMfd = -1;                                                                                                 \
+        fps = function_parameter_FPCONFsetup((VARfpsname), (VARCMDmode));                                              \
+        strncpy(fps.md->sourcefname, __FILE__, FPS_SRCDIR_STRLENMAX);                                                  \
+        fps.md->sourceline = __LINE__;                                                                                 \
+        {                                                                                                              \
+            char msgstring[STRINGMAXLEN_FPS_LOGMSG];                                                                   \
+            SNPRINTF_CHECK(msgstring, STRINGMAXLEN_FPS_LOGMSG, "LOGSTART %s %d %s %d", (VARfpsname), (VARCMDmode),     \
+                           fps.md->sourcefname, fps.md->sourceline);                                                   \
+            functionparameter_outlog("FPSINIT", msgstring);                                                            \
+            functionparameter_outlog_namelink();                                                                       \
+        }                                                                                                              \
+    } while (0)
 
 /** @brief Connect to FPS
  *
  *
  */
-#define FPS_CONNECT( VARfpsname, VARCMDmode ) FUNCTION_PARAMETER_STRUCT fps; do { \
-  fps.SMfd = -1; \
-  if(function_parameter_struct_connect( (VARfpsname) , &fps, (VARCMDmode) ) == -1) { \
-    printf("ERROR: fps \"%s\" does not exist -> running without FPS interface\n", VARfpsname); \
-    return RETURN_FAILURE; \
-  }\
-} while(0)
-
-
+#define FPS_CONNECT(VARfpsname, VARCMDmode)                                                                            \
+    FUNCTION_PARAMETER_STRUCT fps;                                                                                     \
+    do                                                                                                                 \
+    {                                                                                                                  \
+        fps.SMfd = -1;                                                                                                 \
+        if (function_parameter_struct_connect((VARfpsname), &fps, (VARCMDmode)) == -1)                                 \
+        {                                                                                                              \
+            printf("ERROR: fps \"%s\" does not exist -> running without FPS interface\n", VARfpsname);                 \
+            return RETURN_FAILURE;                                                                                     \
+        }                                                                                                              \
+    } while (0)
 
 /** @brief Start FPS configuration loop
  */
-#define FPS_CONFLOOP_START if( ! fps.localstatus & FPS_LOCALSTATUS_CONFLOOP ) { \
-  return RETURN_SUCCESS; \
-} \
-while(fps.localstatus & FPS_LOCALSTATUS_CONFLOOP) { \
-{ \
-  struct timespec treq, trem; \
-  treq.tv_sec = 0; \
-  treq.tv_nsec = 50000; \
-  nanosleep(&treq, &trem); \
-  if(data.signal_INT == 1){fps.localstatus &= ~FPS_LOCALSTATUS_CONFLOOP;} \
-} \
-if(function_parameter_FPCONFloopstep(&fps) == 1) {
-
+#define FPS_CONFLOOP_START                                                                                             \
+    if (!fps.localstatus & FPS_LOCALSTATUS_CONFLOOP)                                                                   \
+    {                                                                                                                  \
+        return RETURN_SUCCESS;                                                                                         \
+    }                                                                                                                  \
+    while (fps.localstatus & FPS_LOCALSTATUS_CONFLOOP)                                                                 \
+    {                                                                                                                  \
+        {                                                                                                              \
+            struct timespec treq, trem;                                                                                \
+            treq.tv_sec = 0;                                                                                           \
+            treq.tv_nsec = 50000;                                                                                      \
+            nanosleep(&treq, &trem);                                                                                   \
+            if (data.signal_INT == 1)                                                                                  \
+            {                                                                                                          \
+                fps.localstatus &= ~FPS_LOCALSTATUS_CONFLOOP;                                                          \
+            }                                                                                                          \
+        }                                                                                                              \
+        if (function_parameter_FPCONFloopstep(&fps) == 1)                                                              \
+        {
 
 /** @brief End FPS configuration loop
  */
-#define FPS_CONFLOOP_END  functionparameter_CheckParametersAll(&fps);} \
-} \
-function_parameter_FPCONFexit(&fps);
-
-
+#define FPS_CONFLOOP_END                                                                                               \
+    functionparameter_CheckParametersAll(&fps);                                                                        \
+    }                                                                                                                  \
+    }                                                                                                                  \
+    function_parameter_FPCONFexit(&fps);
 
 /** @brief Combine initialization of FPS and procinfo for RUN process
  */
 
-#define FPSPROCINFOLOOP_RUNINIT(...) PROCESSINFO *processinfo;             \
-int processloopOK = 1;                                                     \
-do {                                                                       \
-char pinfodescr[200];                                                      \
-int slen = snprintf(pinfodescr, 200, __VA_ARGS__);                         \
-if(slen<1) {                                                               \
-    PRINT_ERROR("snprintf wrote <1 char");                                 \
-    abort();                                                               \
-}                                                                          \
-if(slen >= 200) {                                                          \
-    PRINT_ERROR("snprintf string truncation");                             \
-    abort();                                                               \
-}                                                                          \
-processinfo = processinfo_setup(data.FPS_name, pinfodescr, "startup", __FUNCTION__, __FILE__, __LINE__ ); \
-fps_to_processinfo(&fps, processinfo);                                     \
-} while(0)
-
-
-
-#define FPS_AUTORUN_SETUP(funcstring, shortname) FUNCTION_PARAMETER_STRUCT fps; \
-do { \
-sprintf(data.FPS_name, "%s-%06ld", (shortname), (long) getpid()); \
-data.FPS_CMDCODE = FPSCMDCODE_FPSINIT; \
-FPSCONF_##funcstring(); \
-function_parameter_struct_connect(data.FPS_name, &fps, FPSCONNECT_SIMPLE); \
-} while(0)
-
-
-
-
-
-#define FPS_EXECFUNCTION_STD static errno_t FPSEXECfunction() { \
-FUNCTION_PARAMETER_STRUCT fps;\
-sprintf(data.FPS_name, "%s-%06ld", CLIcmddata.key, (long) getpid());\
-data.FPS_CMDCODE = FPSCMDCODE_FPSINIT;\
-FPSCONFfunction();\
-function_parameter_struct_connect(data.FPS_name, &fps, FPSCONNECT_SIMPLE);\
-CLIargs_to_FPSparams_setval(farg, CLIcmddata.nbarg, &fps);\
-function_parameter_struct_disconnect(&fps);\
-FPSRUNfunction();\
-return RETURN_SUCCESS;\
-}
-
-
-#define FPS_CLIFUNCTION_STD static errno_t FPSCLIfunction(void) { \
-function_parameter_getFPSargs_from_CLIfunc(CLIcmddata.key);\
-if(data.FPS_CMDCODE != 0)\
-    {\
-        data.FPS_CONFfunc = FPSCONFfunction;\
-        data.FPS_RUNfunc  = FPSRUNfunction;\
-        function_parameter_execFPScmd();\
-        return RETURN_SUCCESS;\
-    }\
-    if(CLI_checkarg_array(farg, CLIcmddata.nbarg) == RETURN_SUCCESS)\
-    {\
-        FPSEXECfunction();\
-        return RETURN_SUCCESS;\
-    }\
-    else\
-    {\
-        return CLICMD_INVALID_ARG;\
-    }\
-}
-
-
-
-
-
-
-
+#define FPSPROCINFOLOOP_RUNINIT(...)                                                                                   \
+    PROCESSINFO *processinfo;                                                                                          \
+    int processloopOK = 1;                                                                                             \
+    do                                                                                                                 \
+    {                                                                                                                  \
+        char pinfodescr[200];                                                                                          \
+        int slen = snprintf(pinfodescr, 200, __VA_ARGS__);                                                             \
+        if (slen < 1)                                                                                                  \
+        {                                                                                                              \
+            PRINT_ERROR("snprintf wrote <1 char");                                                                     \
+            abort();                                                                                                   \
+        }                                                                                                              \
+        if (slen >= 200)                                                                                               \
+        {                                                                                                              \
+            PRINT_ERROR("snprintf string truncation");                                                                 \
+            abort();                                                                                                   \
+        }                                                                                                              \
+        processinfo = processinfo_setup(data.FPS_name, pinfodescr, "startup", __FUNCTION__, __FILE__, __LINE__);       \
+        fps_to_processinfo(&fps, processinfo);                                                                         \
+    } while (0)
+
+#define FPS_AUTORUN_SETUP(funcstring, shortname)                                                                       \
+    FUNCTION_PARAMETER_STRUCT fps;                                                                                     \
+    do                                                                                                                 \
+    {                                                                                                                  \
+        sprintf(data.FPS_name, "%s-%06ld", (shortname), (long)getpid());                                               \
+        data.FPS_CMDCODE = FPSCMDCODE_FPSINIT;                                                                         \
+        FPSCONF_##funcstring();                                                                                        \
+        function_parameter_struct_connect(data.FPS_name, &fps, FPSCONNECT_SIMPLE);                                     \
+    } while (0)
+
+#define FPS_EXECFUNCTION_STD                                                                                           \
+    static errno_t FPSEXECfunction()                                                                                   \
+    {                                                                                                                  \
+        FUNCTION_PARAMETER_STRUCT fps;                                                                                 \
+        sprintf(data.FPS_name, "%s-%06ld", CLIcmddata.key, (long)getpid());                                            \
+        data.FPS_CMDCODE = FPSCMDCODE_FPSINIT;                                                                         \
+        FPSCONFfunction();                                                                                             \
+        function_parameter_struct_connect(data.FPS_name, &fps, FPSCONNECT_SIMPLE);                                     \
+        CLIargs_to_FPSparams_setval(farg, CLIcmddata.nbarg, &fps);                                                     \
+        function_parameter_struct_disconnect(&fps);                                                                    \
+        FPSRUNfunction();                                                                                              \
+        return RETURN_SUCCESS;                                                                                         \
+    }
+
+#define FPS_CLIFUNCTION_STD                                                                                            \
+    static errno_t FPSCLIfunction(void)                                                                                \
+    {                                                                                                                  \
+        function_parameter_getFPSargs_from_CLIfunc(CLIcmddata.key);                                                    \
+        if (data.FPS_CMDCODE != 0)                                                                                     \
+        {                                                                                                              \
+            data.FPS_CONFfunc = FPSCONFfunction;                                                                       \
+            data.FPS_RUNfunc = FPSRUNfunction;                                                                         \
+            function_parameter_execFPScmd();                                                                           \
+            return RETURN_SUCCESS;                                                                                     \
+        }                                                                                                              \
+        if (CLI_checkarg_array(farg, CLIcmddata.nbarg) == RETURN_SUCCESS)                                              \
+        {                                                                                                              \
+            FPSEXECfunction();                                                                                         \
+            return RETURN_SUCCESS;                                                                                     \
+        }                                                                                                              \
+        else                                                                                                           \
+        {                                                                                                              \
+            return CLICMD_INVALID_ARG;                                                                                 \
+        }                                                                                                              \
+    }
 
 #define FPS_MAKE_CONF_FUNCNAME(x) FPSCONF_##x
 #define FPSCONF_FUNCTION_NAME(fncname) FPS_MAKE_CONF_FUNCNAME(fncname)
@@ -857,25 +749,6 @@ if(data.FPS_CMDCODE != 0)\
 #define FPS_MAKE_CLIADDCMD_FUNCNAME(x) FPSCLIADDCMD_##x
 #define FPSCLIADDCMD_FUNCTION_NAME(fncname) FPS_MAKE_CLIADDCMD_FUNCNAME(fncname)
 
-
-
-
-
-
-
-
-
-
-
-
-
-
 /** @} */ // end group fpsmacro
 
-
-
-
-
-
-
-#endif  // FUNCTION_PARAMETERS_H
+#endif // FUNCTION_PARAMETERS_H
diff --git a/src/CommandLineInterface/milkDebugTools.h b/src/CommandLineInterface/milkDebugTools.h
index efcfe907..675e7ae8 100644
--- a/src/CommandLineInterface/milkDebugTools.h
+++ b/src/CommandLineInterface/milkDebugTools.h
@@ -20,284 +20,309 @@ typedef int errno_t;
 
 // error mode
 // defines function behavior on error
-#define ERRMODE_NULL   0  // ignore error
-#define ERRMODE_WARN   1  // issue warning and continue
-#define ERRMODE_FAIL   2  // fail nicely if possible
-#define ERRMODE_ABORT  3  // abort process
-
-
-#define STRINGMAXLEN_DEFAULT       1000
-#define STRINGMAXLEN_ERRORMSG      1000
-#define STRINGMAXLEN_CLICMDLINE    1000  // CPU input command line
-#define STRINGMAXLEN_COMMAND       1000
-#define STRINGMAXLEN_STREAMNAME     100
-#define STRINGMAXLEN_IMGNAME        100
-#define STRINGMAXLEN_FILENAME       200  // without directory, includes extension
-#define STRINGMAXLEN_DIRNAME        800
-#define STRINGMAXLEN_FULLFILENAME  1000  // includes directory name
-#define STRINGMAXLEN_FUNCTIONNAME   200
-#define STRINGMAXLEN_FUNCTIONARGS  1000
-#define STRINGMAXLEN_SHMDIRNAME     200
+#define ERRMODE_NULL 0  // ignore error
+#define ERRMODE_WARN 1  // issue warning and continue
+#define ERRMODE_FAIL 2  // fail nicely if possible
+#define ERRMODE_ABORT 3 // abort process
+
+#define STRINGMAXLEN_DEFAULT 1000
+#define STRINGMAXLEN_ERRORMSG 1000
+#define STRINGMAXLEN_CLICMDLINE 1000 // CPU input command line
+#define STRINGMAXLEN_COMMAND 1000
+#define STRINGMAXLEN_STREAMNAME 100
+#define STRINGMAXLEN_IMGNAME 100
+#define STRINGMAXLEN_FILENAME 200 // without directory, includes extension
+#define STRINGMAXLEN_DIRNAME 800
+#define STRINGMAXLEN_FULLFILENAME 1000 // includes directory name
+#define STRINGMAXLEN_FUNCTIONNAME 200
+#define STRINGMAXLEN_FUNCTIONARGS 1000
+#define STRINGMAXLEN_SHMDIRNAME 200
 
 #define STRINGMAXLEN_FPSPROCESSTYPE 64
 
-
 #define xstr(a) zstr(a)
 #define zstr(a) #a
 
-
-
 //
 // ************ ERROR HANDLING **********************************
 //
 
-#define STRINGMAXLEN_FUNCERRORMSG  2000
-
-#define FUNC_RETURN_FAILURE(...) do { \
-char errmsg_funcretfailure[STRINGMAXLEN_FUNCERRORMSG]; \
-int errormsg_slen = snprintf(errmsg_funcretfailure, STRINGMAXLEN_FUNCERRORMSG, __VA_ARGS__); \
-if(errormsg_slen<1) {                                              \
-    printf("snprintf in FUNC_RETURN_FAILURE: wrote <1 char");      \
-    abort();                                                       \
-}                                                                  \
-if(errormsg_slen >= STRINGMAXLEN_FUNCERRORMSG) {                   \
-    printf("snprintf in FUNC_RETURN_FAILURE: string truncation");  \
-    abort();                                                       \
-}                                                                  \
-DEBUG_TRACEPOINT("%c[%d;%dm FERR %c[%dm %s", (char) 27, 1, 31, (char) 27, 0, errmsg_funcretfailure); \
-printf("\n");                                                      \
-printf("%c[%d;%dm ERROR %c[%dm [ %s %s %d ]\n", (char) 27, 1, 31, (char) 27, 0, __FILE__, __func__, __LINE__);     \
-printf("%c[%d;%dm ***** %c[%d;m %s\n", (char) 27, 1, 31, (char) 27, 0, data.testpoint.msg); \
-printf("%c[%d;%dm ***** %c[%d;m -> Function %s returns RETURN_FAILURE\n", (char) 27, 1, 31, (char) 27, 0, __func__); \
-DEBUG_TRACE_FEXIT();\
-return RETURN_FAILURE; \
-} while(0)
-
-
+#define STRINGMAXLEN_FUNCERRORMSG 2000
+
+#define FUNC_RETURN_FAILURE(...)                                                                                       \
+    do                                                                                                                 \
+    {                                                                                                                  \
+        char errmsg_funcretfailure[STRINGMAXLEN_FUNCERRORMSG];                                                         \
+        int errormsg_slen = snprintf(errmsg_funcretfailure, STRINGMAXLEN_FUNCERRORMSG, __VA_ARGS__);                   \
+        if (errormsg_slen < 1)                                                                                         \
+        {                                                                                                              \
+            printf("snprintf in FUNC_RETURN_FAILURE: wrote <1 char");                                                  \
+            abort();                                                                                                   \
+        }                                                                                                              \
+        if (errormsg_slen >= STRINGMAXLEN_FUNCERRORMSG)                                                                \
+        {                                                                                                              \
+            printf("snprintf in FUNC_RETURN_FAILURE: string truncation");                                              \
+            abort();                                                                                                   \
+        }                                                                                                              \
+        DEBUG_TRACEPOINT("%c[%d;%dm FERR %c[%dm %s", (char)27, 1, 31, (char)27, 0, errmsg_funcretfailure);             \
+        printf("\n");                                                                                                  \
+        printf("%c[%d;%dm ERROR %c[%dm [ %s %s %d ]\n", (char)27, 1, 31, (char)27, 0, __FILE__, __func__, __LINE__);   \
+        printf("%c[%d;%dm ***** %c[%d;m %s\n", (char)27, 1, 31, (char)27, 0, data.testpoint.msg);                      \
+        printf("%c[%d;%dm ***** %c[%d;m -> Function %s returns RETURN_FAILURE\n", (char)27, 1, 31, (char)27, 0,        \
+               __func__);                                                                                              \
+        DEBUG_TRACE_FEXIT();                                                                                           \
+        return RETURN_FAILURE;                                                                                         \
+    } while (0)
 
 // Check function call return value.
 // If not RETURN_SUCCESS, fail current (caller) function
 //
-#define FUNC_CHECK_RETURN(errval) do {                        \
-data.testpoint.linestack[data.testpoint.funclevel] = __LINE__; \
-errno_t retcheckvalue = errval;                                    \
-if(retcheckvalue != RETURN_SUCCESS) {                          \
-    char errmsg_funcretfailure[STRINGMAXLEN_FUNCERRORMSG]; \
-    int errormsg_slen = snprintf(errmsg_funcretfailure, STRINGMAXLEN_FUNCERRORMSG, "[%d] %s", retcheckvalue, xstr(errval)); \
-    if(errormsg_slen<1) {                                              \
-        printf("snprintf in FUNC_RETURN_FAILURE: wrote <1 char");      \
-        abort();                                                       \
-    }                                                                  \
-    if(errormsg_slen >= STRINGMAXLEN_FUNCERRORMSG) {                   \
-        printf("snprintf in FUNC_RETURN_FAILURE: string truncation");  \
-        abort();                                                       \
-    }                                                                    \
-    DEBUG_TRACEPOINT("%c[%d;%dm FCALLERR %c[%dm %s", (char) 27, 1, 31, (char) 27, 0, errmsg_funcretfailure); \
-    printf("\n");                                                      \
-printf("%c[%d;%dm > > > FCALLERR %c[%dm [ %s %s %d ]\n", (char) 27, 1, 31, (char) 27, 0, __FILE__, __func__, __LINE__); \
-    printf("%c[%d;%dm ***** %c[%d;m [rval = %d] %s\n", (char) 27, 1, 31, (char) 27, 0, retcheckvalue, xstr(errval)); \
-    printf("%c[%d;%dm ***** %c[%d;m -> Function %s returns RETURN_FAILURE\n", (char) 27, 1, 31, (char) 27, 0, __func__); \
-    DEBUG_TRACE_FEXIT();                                               \
-    return RETURN_FAILURE;                                             \
-}                                                                  \
-} while(0)
-
-
-
+#define FUNC_CHECK_RETURN(errval)                                                                                      \
+    do                                                                                                                 \
+    {                                                                                                                  \
+        data.testpoint.linestack[data.testpoint.funclevel] = __LINE__;                                                 \
+        errno_t retcheckvalue = errval;                                                                                \
+        if (retcheckvalue != RETURN_SUCCESS)                                                                           \
+        {                                                                                                              \
+            char errmsg_funcretfailure[STRINGMAXLEN_FUNCERRORMSG];                                                     \
+            int errormsg_slen =                                                                                        \
+                snprintf(errmsg_funcretfailure, STRINGMAXLEN_FUNCERRORMSG, "[%d] %s", retcheckvalue, xstr(errval));    \
+            if (errormsg_slen < 1)                                                                                     \
+            {                                                                                                          \
+                printf("snprintf in FUNC_RETURN_FAILURE: wrote <1 char");                                              \
+                abort();                                                                                               \
+            }                                                                                                          \
+            if (errormsg_slen >= STRINGMAXLEN_FUNCERRORMSG)                                                            \
+            {                                                                                                          \
+                printf("snprintf in FUNC_RETURN_FAILURE: string truncation");                                          \
+                abort();                                                                                               \
+            }                                                                                                          \
+            DEBUG_TRACEPOINT("%c[%d;%dm FCALLERR %c[%dm %s", (char)27, 1, 31, (char)27, 0, errmsg_funcretfailure);     \
+            printf("\n");                                                                                              \
+            printf("%c[%d;%dm > > > FCALLERR %c[%dm [ %s %s %d ]\n", (char)27, 1, 31, (char)27, 0, __FILE__, __func__, \
+                   __LINE__);                                                                                          \
+            printf("%c[%d;%dm ***** %c[%d;m [rval = %d] %s\n", (char)27, 1, 31, (char)27, 0, retcheckvalue,            \
+                   xstr(errval));                                                                                      \
+            printf("%c[%d;%dm ***** %c[%d;m -> Function %s returns RETURN_FAILURE\n", (char)27, 1, 31, (char)27, 0,    \
+                   __func__);                                                                                          \
+            DEBUG_TRACE_FEXIT();                                                                                       \
+            return RETURN_FAILURE;                                                                                     \
+        }                                                                                                              \
+    } while (0)
 
 /** @brief Print error (in red) and continue
  *  @ingroup errcheckmacro
  */
-#define PRINT_ERROR(...) do { \
-int print_error_slen = snprintf(data.testpoint.msg, STRINGMAXLEN_FUNCTIONARGS, __VA_ARGS__); \
-if(print_error_slen<1) {                                                    \
-    printf("snprintf in PRINT_ERROR: wrote <1 char");           \
-    abort();                                                    \
-}                                                               \
-if(print_error_slen >= STRINGMAXLEN_FUNCTIONARGS) {                         \
-    printf("snprintf in PRINT_ERROR: string truncation");       \
-    abort();                                                    \
-}\
-printf("ERROR: %c[%d;%dm %s %c[%d;m\n", (char) 27, 1, 31, data.testpoint.msg, (char) 27, 0); \
-print_error_slen = snprintf(data.testpoint.file, STRINGMAXLEN_FILENAME, "%s", __FILE__); \
-if(print_error_slen<1) {                                                    \
-    printf("snprintf in PRINT_ERROR: wrote <1 char");           \
-    abort();                                                    \
-}                                                               \
-if(print_error_slen >= STRINGMAXLEN_FILENAME) {                             \
-    printf("snprintf in PRINT_ERROR: string truncation");       \
-    abort();                                                    \
-}\
-print_error_slen = snprintf(data.testpoint.func, STRINGMAXLEN_FUNCTIONNAME, "%s", __func__); \
-if(print_error_slen<1) {                                                    \
-    printf("snprintf in PRINT_ERROR: wrote <1 char");           \
-    abort();                                                    \
-}                                                               \
-if(print_error_slen >= STRINGMAXLEN_FUNCTIONNAME) {                         \
-    printf("snprintf in PRINT_ERROR: string truncation");       \
-    abort();                                                    \
-}\
-data.testpoint.line = __LINE__; \
-clock_gettime(CLOCK_REALTIME, &data.testpoint.time); \
-} while(0)
-
-
+#define PRINT_ERROR(...)                                                                                               \
+    do                                                                                                                 \
+    {                                                                                                                  \
+        int print_error_slen = snprintf(data.testpoint.msg, STRINGMAXLEN_FUNCTIONARGS, __VA_ARGS__);                   \
+        if (print_error_slen < 1)                                                                                      \
+        {                                                                                                              \
+            printf("snprintf in PRINT_ERROR: wrote <1 char");                                                          \
+            abort();                                                                                                   \
+        }                                                                                                              \
+        if (print_error_slen >= STRINGMAXLEN_FUNCTIONARGS)                                                             \
+        {                                                                                                              \
+            printf("snprintf in PRINT_ERROR: string truncation");                                                      \
+            abort();                                                                                                   \
+        }                                                                                                              \
+        printf("ERROR: %c[%d;%dm %s %c[%d;m\n", (char)27, 1, 31, data.testpoint.msg, (char)27, 0);                     \
+        print_error_slen = snprintf(data.testpoint.file, STRINGMAXLEN_FILENAME, "%s", __FILE__);                       \
+        if (print_error_slen < 1)                                                                                      \
+        {                                                                                                              \
+            printf("snprintf in PRINT_ERROR: wrote <1 char");                                                          \
+            abort();                                                                                                   \
+        }                                                                                                              \
+        if (print_error_slen >= STRINGMAXLEN_FILENAME)                                                                 \
+        {                                                                                                              \
+            printf("snprintf in PRINT_ERROR: string truncation");                                                      \
+            abort();                                                                                                   \
+        }                                                                                                              \
+        print_error_slen = snprintf(data.testpoint.func, STRINGMAXLEN_FUNCTIONNAME, "%s", __func__);                   \
+        if (print_error_slen < 1)                                                                                      \
+        {                                                                                                              \
+            printf("snprintf in PRINT_ERROR: wrote <1 char");                                                          \
+            abort();                                                                                                   \
+        }                                                                                                              \
+        if (print_error_slen >= STRINGMAXLEN_FUNCTIONNAME)                                                             \
+        {                                                                                                              \
+            printf("snprintf in PRINT_ERROR: string truncation");                                                      \
+            abort();                                                                                                   \
+        }                                                                                                              \
+        data.testpoint.line = __LINE__;                                                                                \
+        clock_gettime(CLOCK_REALTIME, &data.testpoint.time);                                                           \
+    } while (0)
 
 /**
  * @brief Print warning and continue
  * @ingroup errcheckmacro
  */
-#define PRINT_WARNING(...) do { \
-char warnmessage[1000]; \
-snprintf(warnmessage, 1000, __VA_ARGS__); \
-fprintf(stderr, \
-"%c[%d;%dm WARNING [ FILE: %s   FUNCTION: %s  LINE: %d ]  %c[%d;m\n", \
-(char) 27, 1, 35, __FILE__, __func__, __LINE__, (char) 27, 0); \
-if(C_ERRNO != 0) \
-{ \
-char buff[256]; \
-if( strerror_r( errno, buff, 256 ) == 0 ) { \
-fprintf(stderr,"C Error: %s\n", buff ); \
-} else { \
-fprintf(stderr,"Unknown C Error\n"); \
-} \
-} else { \
-fprintf(stderr,"No C error (errno = 0)\n"); } \
-fprintf(stderr, "%c[%d;%dm ", (char) 27, 1, 35); \
-fprintf(stderr, "%s", warnmessage); \
-fprintf(stderr, " %c[%d;m\n", (char) 27, 0); \
-C_ERRNO = 0; \
-} while(0)
-
-
-
-
-
-
-
-
+#define PRINT_WARNING(...)                                                                                             \
+    do                                                                                                                 \
+    {                                                                                                                  \
+        char warnmessage[1000];                                                                                        \
+        snprintf(warnmessage, 1000, __VA_ARGS__);                                                                      \
+        fprintf(stderr, "%c[%d;%dm WARNING [ FILE: %s   FUNCTION: %s  LINE: %d ]  %c[%d;m\n", (char)27, 1, 35,         \
+                __FILE__, __func__, __LINE__, (char)27, 0);                                                            \
+        if (C_ERRNO != 0)                                                                                              \
+        {                                                                                                              \
+            char buff[256];                                                                                            \
+            if (strerror_r(errno, buff, 256) == 0)                                                                     \
+            {                                                                                                          \
+                fprintf(stderr, "C Error: %s\n", buff);                                                                \
+            }                                                                                                          \
+            else                                                                                                       \
+            {                                                                                                          \
+                fprintf(stderr, "Unknown C Error\n");                                                                  \
+            }                                                                                                          \
+        }                                                                                                              \
+        else                                                                                                           \
+        {                                                                                                              \
+            fprintf(stderr, "No C error (errno = 0)\n");                                                               \
+        }                                                                                                              \
+        fprintf(stderr, "%c[%d;%dm ", (char)27, 1, 35);                                                                \
+        fprintf(stderr, "%s", warnmessage);                                                                            \
+        fprintf(stderr, " %c[%d;m\n", (char)27, 0);                                                                    \
+        C_ERRNO = 0;                                                                                                   \
+    } while (0)
 
 // Enter function
 #if defined NDEBUG
 #define DEBUG_TRACE_FSTART(...)
 #else
-#define DEBUG_TRACE_FSTART(...) \
-int funclevel = data.testpoint.funclevel; \
-static int funccallcnt; \
-do { \
-if(data.testpoint.funclevel < MAXNB_FUNCSTACK) { \
-    strncpy(data.testpoint.funcstack[data.testpoint.funclevel], __func__, STRINGMAXLEN_FUNCSTAK_FUNCNAME-1);\
-    data.testpoint.fcntstack[data.testpoint.funclevel] = funccallcnt; \
-    data.testpoint.funccallcnt = funccallcnt; \
-}\
-funccallcnt++; \
-data.testpoint.funclevel++; \
-} while(0)
+#define DEBUG_TRACE_FSTART(...)                                                                                        \
+    int funclevel = data.testpoint.funclevel;                                                                          \
+    static int funccallcnt;                                                                                            \
+    do                                                                                                                 \
+    {                                                                                                                  \
+        if (data.testpoint.funclevel < MAXNB_FUNCSTACK)                                                                \
+        {                                                                                                              \
+            strncpy(data.testpoint.funcstack[data.testpoint.funclevel], __func__, STRINGMAXLEN_FUNCSTAK_FUNCNAME - 1); \
+            data.testpoint.fcntstack[data.testpoint.funclevel] = funccallcnt;                                          \
+            data.testpoint.funccallcnt = funccallcnt;                                                                  \
+        }                                                                                                              \
+        funccallcnt++;                                                                                                 \
+        data.testpoint.funclevel++;                                                                                    \
+    } while (0)
 #endif
 
 // Exit function
 #if defined NDEBUG
 #define DEBUG_TRACE_FEXIT(...)
 #else
-#define DEBUG_TRACE_FEXIT(...) do { \
-data.testpoint.funclevel--; \
-data.testpoint.funccallcnt = data.testpoint.fcntstack[data.testpoint.funclevel];\
-if(data.testpoint.funclevel>0) {\
-    if (data.testpoint.funclevel != funclevel) { \
-    PRINT_ERROR("function level mismatch - check source code"); \
-    abort(); \
-} \
-}\
-} while(0)
+#define DEBUG_TRACE_FEXIT(...)                                                                                         \
+    do                                                                                                                 \
+    {                                                                                                                  \
+        data.testpoint.funclevel--;                                                                                    \
+        data.testpoint.funccallcnt = data.testpoint.fcntstack[data.testpoint.funclevel];                               \
+        if (data.testpoint.funclevel > 0)                                                                              \
+        {                                                                                                              \
+            if (data.testpoint.funclevel != funclevel)                                                                 \
+            {                                                                                                          \
+                PRINT_ERROR("function level mismatch - check source code");                                            \
+                abort();                                                                                               \
+            }                                                                                                          \
+        }                                                                                                              \
+    } while (0)
 #endif
 
-
-
-
-
 /**
  * @ingroup debugmacro
  * @brief register trace point
  */
-#define DEBUG_TRACEPOINTRAW(...) do {                    \
-int slen = snprintf(data.testpoint.file, STRINGMAXLEN_FULLFILENAME, "%s", __FILE__);\
-if(slen<1) {                                                               \
-    PRINT_ERROR("snprintf wrote <1 char");                                 \
-    abort();                                                               \
-}                                                                          \
-if(slen >= STRINGMAXLEN_FULLFILENAME) {                                    \
-    PRINT_ERROR("snprintf string truncation");                             \
-    abort();                                                               \
-}                                                                          \
-slen = snprintf(data.testpoint.func, STRINGMAXLEN_FUNCTIONNAME, "%s", __func__);\
-if(slen<1) {                                                               \
-    PRINT_ERROR("snprintf wrote <1 char");                                 \
-    abort();                                                               \
-}                                                                          \
-if(slen >= STRINGMAXLEN_FUNCTIONNAME) {                                    \
-    PRINT_ERROR("snprintf string truncation");                             \
-    abort();                                                               \
-}                                                                          \
-data.testpoint.line = __LINE__;                       \
-clock_gettime(CLOCK_REALTIME, &data.testpoint.time);  \
-slen = snprintf(data.testpoint.msg, STRINGMAXLEN_FUNCTIONARGS, __VA_ARGS__);\
-if(slen<1) {                                                               \
-    PRINT_ERROR("snprintf wrote <1 char");                                 \
-    abort();                                                               \
-}                                                                          \
-if(slen >= STRINGMAXLEN_FUNCTIONARGS) {                                    \
-    PRINT_ERROR("snprintf string truncation");                             \
-    abort();                                                               \
-}                                                                          \
-data.testpoint.loopcnt = data.testpointloopcnt;                            \
-if(data.testpointarrayinit == 1) {                                         \
-memcpy(&data.testpointarray[data.testpointcnt], &data.testpoint, sizeof(CODETESTPOINT));\
-data.testpointcnt++;                                                       \
-if(data.testpointcnt == CODETESTPOINTARRAY_NBCNT) {                        \
-data.testpointcnt = 0;                                                     \
-data.testpointloopcnt++;                                                   \
-}\
-}\
-} while(0)
-
-
+#define DEBUG_TRACEPOINTRAW(...)                                                                                       \
+    do                                                                                                                 \
+    {                                                                                                                  \
+        int slen = snprintf(data.testpoint.file, STRINGMAXLEN_FULLFILENAME, "%s", __FILE__);                           \
+        if (slen < 1)                                                                                                  \
+        {                                                                                                              \
+            PRINT_ERROR("snprintf wrote <1 char");                                                                     \
+            abort();                                                                                                   \
+        }                                                                                                              \
+        if (slen >= STRINGMAXLEN_FULLFILENAME)                                                                         \
+        {                                                                                                              \
+            PRINT_ERROR("snprintf string truncation");                                                                 \
+            abort();                                                                                                   \
+        }                                                                                                              \
+        slen = snprintf(data.testpoint.func, STRINGMAXLEN_FUNCTIONNAME, "%s", __func__);                               \
+        if (slen < 1)                                                                                                  \
+        {                                                                                                              \
+            PRINT_ERROR("snprintf wrote <1 char");                                                                     \
+            abort();                                                                                                   \
+        }                                                                                                              \
+        if (slen >= STRINGMAXLEN_FUNCTIONNAME)                                                                         \
+        {                                                                                                              \
+            PRINT_ERROR("snprintf string truncation");                                                                 \
+            abort();                                                                                                   \
+        }                                                                                                              \
+        data.testpoint.line = __LINE__;                                                                                \
+        clock_gettime(CLOCK_REALTIME, &data.testpoint.time);                                                           \
+        slen = snprintf(data.testpoint.msg, STRINGMAXLEN_FUNCTIONARGS, __VA_ARGS__);                                   \
+        if (slen < 1)                                                                                                  \
+        {                                                                                                              \
+            PRINT_ERROR("snprintf wrote <1 char");                                                                     \
+            abort();                                                                                                   \
+        }                                                                                                              \
+        if (slen >= STRINGMAXLEN_FUNCTIONARGS)                                                                         \
+        {                                                                                                              \
+            PRINT_ERROR("snprintf string truncation");                                                                 \
+            abort();                                                                                                   \
+        }                                                                                                              \
+        data.testpoint.loopcnt = data.testpointloopcnt;                                                                \
+        if (data.testpointarrayinit == 1)                                                                              \
+        {                                                                                                              \
+            memcpy(&data.testpointarray[data.testpointcnt], &data.testpoint, sizeof(CODETESTPOINT));                   \
+            data.testpointcnt++;                                                                                       \
+            if (data.testpointcnt == CODETESTPOINTARRAY_NBCNT)                                                         \
+            {                                                                                                          \
+                data.testpointcnt = 0;                                                                                 \
+                data.testpointloopcnt++;                                                                               \
+            }                                                                                                          \
+        }                                                                                                              \
+    } while (0)
 
 #if defined NDEBUG
 #define DEBUG_TRACEPOINT_PRINT(...)
 #else
-#define DEBUG_TRACEPOINT_PRINT(...) do {                    \
-DEBUG_TRACEPOINTRAW(__VA_ARGS__);                              \
-printf("DEBUG MSG [%s %s  %d]: %s\n", data.testpoint.file, data.testpoint.func, data.testpoint.line, data.testpoint.msg);   \
-} while(0)
+#define DEBUG_TRACEPOINT_PRINT(...)                                                                                    \
+    do                                                                                                                 \
+    {                                                                                                                  \
+        DEBUG_TRACEPOINTRAW(__VA_ARGS__);                                                                              \
+        printf("DEBUG MSG [%s %s  %d]: %s\n", data.testpoint.file, data.testpoint.func, data.testpoint.line,           \
+               data.testpoint.msg);                                                                                    \
+    } while (0)
 #endif
 
-
 #if defined NDEBUG
 #define DEBUG_TRACEPOINT_LOG(...)
 #else
-#define DEBUG_TRACEPOINT_LOG(...) do {  \
-DEBUG_TRACEPOINTRAW(__VA_ARGS__);          \
-write_process_log();                    \
-} while(0)
+#define DEBUG_TRACEPOINT_LOG(...)                                                                                      \
+    do                                                                                                                 \
+    {                                                                                                                  \
+        DEBUG_TRACEPOINTRAW(__VA_ARGS__);                                                                              \
+        write_process_log();                                                                                           \
+    } while (0)
 #endif
 
-
-
 #if defined NDEBUG
 #define DEBUG_TRACEPOINT(...)
 #else
 #if defined DEBUGLOG
-#define DEBUG_TRACEPOINT(...) do {                    \
-DEBUG_TRACEPOINT_LOG(__VA_ARGS__);                              \
-} while(0)
+#define DEBUG_TRACEPOINT(...)                                                                                          \
+    do                                                                                                                 \
+    {                                                                                                                  \
+        DEBUG_TRACEPOINT_LOG(__VA_ARGS__);                                                                             \
+    } while (0)
 #else
-#define DEBUG_TRACEPOINT(...) do {                    \
-DEBUG_TRACEPOINTRAW(__VA_ARGS__);                              \
-} while(0)
+#define DEBUG_TRACEPOINT(...)                                                                                          \
+    do                                                                                                                 \
+    {                                                                                                                  \
+        DEBUG_TRACEPOINTRAW(__VA_ARGS__);                                                                              \
+    } while (0)
 #endif
 #endif
 
-
 /*
 #if defined DEBUGLOG \
 write_process_log(); \
@@ -307,75 +332,76 @@ printf("DEBUG MSG [%s %s  %d]: %s\n", data.testpoint.file, data.testpoint.func,
 #endif \
 */
 
-
-
 //
 // ************ ERROR-CHECKING FUNCTIONS **********************************
 //
 
-
-
-
 /**
  * @ingroup errcheckmacro
  * @brief system call with error checking and handling
  *
  */
-#define EXECUTE_SYSTEM_COMMAND(...) do {                                   \
-char syscommandstring[STRINGMAXLEN_COMMAND];                               \
-int slen = snprintf(syscommandstring, STRINGMAXLEN_COMMAND, __VA_ARGS__);  \
-if(slen<1) {                                                               \
-    PRINT_ERROR("snprintf wrote <1 char");                                 \
-    abort();                                                               \
-}                                                                          \
-if(slen >= STRINGMAXLEN_COMMAND) {                                         \
-    PRINT_ERROR("snprintf string truncation");                             \
-    abort();                                                               \
-}                                                                          \
-data.retvalue = system(syscommandstring);                                  \
-} while(0)
-
-
-#define EXECUTE_SYSTEM_COMMAND_ERRCHECK(...) do {                          \
-char syscommandstring[STRINGMAXLEN_COMMAND];                               \
-int slen = snprintf(syscommandstring, STRINGMAXLEN_COMMAND, __VA_ARGS__);  \
-if(slen<1) {                                                               \
-    PRINT_ERROR("snprintf wrote <1 char");                                 \
-    abort();                                                               \
-}                                                                          \
-if(slen >= STRINGMAXLEN_COMMAND) {                                         \
-    PRINT_ERROR("snprintf string truncation");                             \
-    abort();                                                               \
-}                                                                          \
-data.retvalue = system(syscommandstring);                                  \
-if(data.retvalue != 0)                                                     \
-{                                                                          \
-    PRINT_ERROR("system() error %d %s", data.retvalue, strerror(data.retvalue));\
-    abort();                                                               \
-}                                                                          \
-} while(0)
-
-
-
+#define EXECUTE_SYSTEM_COMMAND(...)                                                                                    \
+    do                                                                                                                 \
+    {                                                                                                                  \
+        char syscommandstring[STRINGMAXLEN_COMMAND];                                                                   \
+        int slen = snprintf(syscommandstring, STRINGMAXLEN_COMMAND, __VA_ARGS__);                                      \
+        if (slen < 1)                                                                                                  \
+        {                                                                                                              \
+            PRINT_ERROR("snprintf wrote <1 char");                                                                     \
+            abort();                                                                                                   \
+        }                                                                                                              \
+        if (slen >= STRINGMAXLEN_COMMAND)                                                                              \
+        {                                                                                                              \
+            PRINT_ERROR("snprintf string truncation");                                                                 \
+            abort();                                                                                                   \
+        }                                                                                                              \
+        data.retvalue = system(syscommandstring);                                                                      \
+    } while (0)
+
+#define EXECUTE_SYSTEM_COMMAND_ERRCHECK(...)                                                                           \
+    do                                                                                                                 \
+    {                                                                                                                  \
+        char syscommandstring[STRINGMAXLEN_COMMAND];                                                                   \
+        int slen = snprintf(syscommandstring, STRINGMAXLEN_COMMAND, __VA_ARGS__);                                      \
+        if (slen < 1)                                                                                                  \
+        {                                                                                                              \
+            PRINT_ERROR("snprintf wrote <1 char");                                                                     \
+            abort();                                                                                                   \
+        }                                                                                                              \
+        if (slen >= STRINGMAXLEN_COMMAND)                                                                              \
+        {                                                                                                              \
+            PRINT_ERROR("snprintf string truncation");                                                                 \
+            abort();                                                                                                   \
+        }                                                                                                              \
+        data.retvalue = system(syscommandstring);                                                                      \
+        if (data.retvalue != 0)                                                                                        \
+        {                                                                                                              \
+            PRINT_ERROR("system() error %d %s", data.retvalue, strerror(data.retvalue));                               \
+            abort();                                                                                                   \
+        }                                                                                                              \
+    } while (0)
 
 /**
  * @ingroup errcheckmacro
  * @brief snprintf with error checking and handling
  *
  */
-#define SNPRINTF_CHECK(string, maxlen, ...) do { \
-int slen = snprintf(string, maxlen, __VA_ARGS__); \
-if(slen<1) {                                                    \
-    PRINT_ERROR("snprintf wrote <1 char");                      \
-    abort();                                                    \
-}                                                               \
-if(slen >= maxlen) {                              \
-    PRINT_ERROR("snprintf string truncation");                  \
-    abort();                                                    \
-}                                                               \
-} while(0)
-
-
+#define SNPRINTF_CHECK(string, maxlen, ...)                                                                            \
+    do                                                                                                                 \
+    {                                                                                                                  \
+        int slen = snprintf(string, maxlen, __VA_ARGS__);                                                              \
+        if (slen < 1)                                                                                                  \
+        {                                                                                                              \
+            PRINT_ERROR("snprintf wrote <1 char");                                                                     \
+            abort();                                                                                                   \
+        }                                                                                                              \
+        if (slen >= maxlen)                                                                                            \
+        {                                                                                                              \
+            PRINT_ERROR("snprintf string truncation");                                                                 \
+            abort();                                                                                                   \
+        }                                                                                                              \
+    } while (0)
 
 /**
  * @ingroup errcheckmacro
@@ -393,35 +419,38 @@ if(slen >= maxlen) {                              \
  *
  *
  */
-#define WRITE_IMAGENAME(imname, ...) do { \
-int slen = snprintf(imname, STRINGMAXLEN_IMGNAME, __VA_ARGS__); \
-if(slen<1) {                                                    \
-    PRINT_ERROR("snprintf wrote <1 char");                      \
-    abort();                                                    \
-}                                                               \
-if(slen >= STRINGMAXLEN_IMGNAME) {                              \
-    PRINT_ERROR("snprintf string truncation");                  \
-    abort();                                                    \
-}                                                               \
-} while(0)
-
-
-#define CREATE_IMAGENAME(imname, ...) \
-char imname[STRINGMAXLEN_IMGNAME]; \
-do { \
-int slen = snprintf(imname, STRINGMAXLEN_IMGNAME, __VA_ARGS__); \
-if(slen<1) {                                                    \
-    PRINT_ERROR("snprintf wrote <1 char");                      \
-    abort();                                                    \
-}                                                               \
-if(slen >= STRINGMAXLEN_IMGNAME) {                              \
-    PRINT_ERROR("snprintf string truncation");                  \
-    abort();                                                    \
-}                                                               \
-} while(0)
-
-
-
+#define WRITE_IMAGENAME(imname, ...)                                                                                   \
+    do                                                                                                                 \
+    {                                                                                                                  \
+        int slen = snprintf(imname, STRINGMAXLEN_IMGNAME, __VA_ARGS__);                                                \
+        if (slen < 1)                                                                                                  \
+        {                                                                                                              \
+            PRINT_ERROR("snprintf wrote <1 char");                                                                     \
+            abort();                                                                                                   \
+        }                                                                                                              \
+        if (slen >= STRINGMAXLEN_IMGNAME)                                                                              \
+        {                                                                                                              \
+            PRINT_ERROR("snprintf string truncation");                                                                 \
+            abort();                                                                                                   \
+        }                                                                                                              \
+    } while (0)
+
+#define CREATE_IMAGENAME(imname, ...)                                                                                  \
+    char imname[STRINGMAXLEN_IMGNAME];                                                                                 \
+    do                                                                                                                 \
+    {                                                                                                                  \
+        int slen = snprintf(imname, STRINGMAXLEN_IMGNAME, __VA_ARGS__);                                                \
+        if (slen < 1)                                                                                                  \
+        {                                                                                                              \
+            PRINT_ERROR("snprintf wrote <1 char");                                                                     \
+            abort();                                                                                                   \
+        }                                                                                                              \
+        if (slen >= STRINGMAXLEN_IMGNAME)                                                                              \
+        {                                                                                                              \
+            PRINT_ERROR("snprintf string truncation");                                                                 \
+            abort();                                                                                                   \
+        }                                                                                                              \
+    } while (0)
 
 /**
  * @ingroup errcheckmacro
@@ -437,20 +466,21 @@ if(slen >= STRINGMAXLEN_IMGNAME) {                              \
  * @endcode
  *
  */
-#define WRITE_DIRNAME(dirname, ...) do { \
-int slen = snprintf(dirname, STRINGMAXLEN_DIRNAME, __VA_ARGS__); \
-if(slen<1) {                                                    \
-    PRINT_ERROR("snprintf wrote <1 char");                      \
-    abort();                                                    \
-}                                                               \
-if(slen >= STRINGMAXLEN_DIRNAME) {                              \
-    PRINT_ERROR("snprintf string truncation");                  \
-    abort();                                                    \
-}                                                               \
-} while(0)
-
-
-
+#define WRITE_DIRNAME(dirname, ...)                                                                                    \
+    do                                                                                                                 \
+    {                                                                                                                  \
+        int slen = snprintf(dirname, STRINGMAXLEN_DIRNAME, __VA_ARGS__);                                               \
+        if (slen < 1)                                                                                                  \
+        {                                                                                                              \
+            PRINT_ERROR("snprintf wrote <1 char");                                                                     \
+            abort();                                                                                                   \
+        }                                                                                                              \
+        if (slen >= STRINGMAXLEN_DIRNAME)                                                                              \
+        {                                                                                                              \
+            PRINT_ERROR("snprintf string truncation");                                                                 \
+            abort();                                                                                                   \
+        }                                                                                                              \
+    } while (0)
 
 /**
  * @ingroup errcheckmacro
@@ -466,20 +496,21 @@ if(slen >= STRINGMAXLEN_DIRNAME) {                              \
  * @endcode
  *
  */
-#define WRITE_FILENAME(fname, ...) do { \
-int slen = snprintf(fname, STRINGMAXLEN_FILENAME, __VA_ARGS__); \
-if(slen<1) {                                                    \
-    PRINT_ERROR("snprintf wrote <1 char");                      \
-    abort();                                                    \
-}                                                               \
-if(slen >= STRINGMAXLEN_FILENAME) {                              \
-    PRINT_ERROR("snprintf string truncation");                  \
-    abort();                                                    \
-}                                                               \
-} while(0)
-
-
-
+#define WRITE_FILENAME(fname, ...)                                                                                     \
+    do                                                                                                                 \
+    {                                                                                                                  \
+        int slen = snprintf(fname, STRINGMAXLEN_FILENAME, __VA_ARGS__);                                                \
+        if (slen < 1)                                                                                                  \
+        {                                                                                                              \
+            PRINT_ERROR("snprintf wrote <1 char");                                                                     \
+            abort();                                                                                                   \
+        }                                                                                                              \
+        if (slen >= STRINGMAXLEN_FILENAME)                                                                             \
+        {                                                                                                              \
+            PRINT_ERROR("snprintf string truncation");                                                                 \
+            abort();                                                                                                   \
+        }                                                                                                              \
+    } while (0)
 
 /**
  * @ingroup errcheckmacro
@@ -496,20 +527,21 @@ if(slen >= STRINGMAXLEN_FILENAME) {                              \
  * @endcode
  *
  */
-#define WRITE_FULLFILENAME(ffname, ...) do { \
-int slen = snprintf(ffname, STRINGMAXLEN_FULLFILENAME, __VA_ARGS__); \
-if(slen<1) {                                                    \
-    PRINT_ERROR("snprintf wrote <1 char");                      \
-    abort();                                                    \
-}                                                               \
-if(slen >= STRINGMAXLEN_FULLFILENAME) {                              \
-    PRINT_ERROR("snprintf string truncation");                  \
-    abort();                                                    \
-}                                                               \
-} while(0)
-
-
-
+#define WRITE_FULLFILENAME(ffname, ...)                                                                                \
+    do                                                                                                                 \
+    {                                                                                                                  \
+        int slen = snprintf(ffname, STRINGMAXLEN_FULLFILENAME, __VA_ARGS__);                                           \
+        if (slen < 1)                                                                                                  \
+        {                                                                                                              \
+            PRINT_ERROR("snprintf wrote <1 char");                                                                     \
+            abort();                                                                                                   \
+        }                                                                                                              \
+        if (slen >= STRINGMAXLEN_FULLFILENAME)                                                                         \
+        {                                                                                                              \
+            PRINT_ERROR("snprintf string truncation");                                                                 \
+            abort();                                                                                                   \
+        }                                                                                                              \
+    } while (0)
 
 /**
  * @ingroup errcheckmacro
@@ -524,35 +556,32 @@ if(slen >= STRINGMAXLEN_FULLFILENAME) {                              \
  * @endcode
  *
  */
-#define WRITE_STRING_TO_FILE(fname, ...) do { \
-FILE *fptmp;                                                                \
-fptmp = fopen(fname, "w");                                                  \
-if (fptmp == NULL) {                                                        \
-int errnum = errno;                                                         \
-PRINT_ERROR("fopen() returns NULL");                                        \
-fprintf(stderr, "Error opening file %s: %s\n", fname, strerror( errnum ));  \
-abort();                                                                    \
-} else {                                                                    \
-fprintf(fptmp, __VA_ARGS__);                                                \
-fclose(fptmp);                                                              \
-}                                                                           \
-} while(0)
-
-
-
-
-
-
+#define WRITE_STRING_TO_FILE(fname, ...)                                                                               \
+    do                                                                                                                 \
+    {                                                                                                                  \
+        FILE *fptmp;                                                                                                   \
+        fptmp = fopen(fname, "w");                                                                                     \
+        if (fptmp == NULL)                                                                                             \
+        {                                                                                                              \
+            int errnum = errno;                                                                                        \
+            PRINT_ERROR("fopen() returns NULL");                                                                       \
+            fprintf(stderr, "Error opening file %s: %s\n", fname, strerror(errnum));                                   \
+            abort();                                                                                                   \
+        }                                                                                                              \
+        else                                                                                                           \
+        {                                                                                                              \
+            fprintf(fptmp, __VA_ARGS__);                                                                               \
+            fclose(fptmp);                                                                                             \
+        }                                                                                                              \
+    } while (0)
 
 // *************************** FUNCTION RETURN VALUE *********************************************
 // For function returning type errno_t (= int)
 //
-#define RETURN_SUCCESS       0
-#define RETURN_FAILURE       1   // generic error code
-#define RETURN_MISSINGFILE   2
-
-#define RETURN_OTHER         3
-
+#define RETURN_SUCCESS 0
+#define RETURN_FAILURE 1 // generic error code
+#define RETURN_MISSINGFILE 2
 
+#define RETURN_OTHER 3
 
 #endif
diff --git a/src/CommandLineInterface/procCTRL_TUI.c b/src/CommandLineInterface/procCTRL_TUI.c
index 1fb6c274..11ea1126 100644
--- a/src/CommandLineInterface/procCTRL_TUI.c
+++ b/src/CommandLineInterface/procCTRL_TUI.c
@@ -10,74 +10,64 @@
  *
  */
 
-
 #ifndef __STDC_LIB_EXT1__
 typedef int errno_t;
 #endif
 
-
 static int CTRLscreenExitLine = 0; // for debugging
 
-
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE
 #endif
 
-
 /* =============================================================================================== */
 /* =============================================================================================== */
 /*                                        HEADER FILES                                             */
 /* =============================================================================================== */
 /* =============================================================================================== */
 
-
-#include <string.h>
-#include <stdlib.h>
+#include <malloc.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <sys/file.h>
-#include <malloc.h>
 #include <sys/mman.h> // mmap()
 
-#include <time.h>
 #include <signal.h>
-#include <termios.h>
 #include <sys/ioctl.h>
+#include <termios.h>
+#include <time.h>
 
-#include <unistd.h>    // getpid()
 #include <sys/types.h>
+#include <unistd.h> // getpid()
 
 #include <sys/stat.h>
 
-#include <ncurses.h>
-#include <fcntl.h>
 #include <ctype.h>
+#include <fcntl.h>
+#include <ncurses.h>
 
 #include <dirent.h>
 
-#include <wchar.h>
 #include <locale.h>
+#include <wchar.h>
 
 #include <pthread.h>
 
-
 #include "CommandLineInterface/timeutils.h"
 
 #include "CLIcore.h"
 #include "COREMOD_tools/COREMOD_tools.h"
 #include "TUItools.h"
 
-
 #define SHAREDPROCDIR data.shmdir
 
-
 #include <processtools.h>
 
 #ifdef USE_HWLOC
 #include <hwloc.h>
 #endif
 
-
-
 /* =============================================================================================== */
 /* =============================================================================================== */
 /*                                      DEFINES, MACROS                                            */
@@ -87,26 +77,21 @@ static int CTRLscreenExitLine = 0; // for debugging
 // shared memory access permission
 #define FILEMODE 0666
 
-
 // What do we want to compute/print ?
-#define CMDPROC_CONTEXTSWITCH	1
-#define CMDPROC_CPUUSE	1
-#define CMDPROC_MEMUSE	1
+#define CMDPROC_CONTEXTSWITCH 1
+#define CMDPROC_CPUUSE 1
+#define CMDPROC_MEMUSE 1
 
 #define CMDPROC_PROCSTAT 1
 
-
-
-#define PROCCTRL_DISPLAYMODE_HELP      1
-#define PROCCTRL_DISPLAYMODE_CTRL      2
+#define PROCCTRL_DISPLAYMODE_HELP 1
+#define PROCCTRL_DISPLAYMODE_CTRL 2
 #define PROCCTRL_DISPLAYMODE_RESOURCES 3
-#define PROCCTRL_DISPLAYMODE_TRIGGER   4
-#define PROCCTRL_DISPLAYMODE_TIMING    5
-#define PROCCTRL_DISPLAYMODE_HTOP      6
-#define PROCCTRL_DISPLAYMODE_IOTOP     7
-#define PROCCTRL_DISPLAYMODE_ATOP      8
-
-
+#define PROCCTRL_DISPLAYMODE_TRIGGER 4
+#define PROCCTRL_DISPLAYMODE_TIMING 5
+#define PROCCTRL_DISPLAYMODE_HTOP 6
+#define PROCCTRL_DISPLAYMODE_IOTOP 7
+#define PROCCTRL_DISPLAYMODE_ATOP 8
 
 /* =============================================================================================== */
 /* =============================================================================================== */
@@ -116,15 +101,8 @@ static int CTRLscreenExitLine = 0; // for debugging
 
 static short unsigned int wrow, wcol;
 
-
-
 static PROCESSINFOLIST *pinfolist;
 
-
-
-
-
-
 #define NBtopMax 5000
 
 /*
@@ -144,8 +122,6 @@ static char  toparray_COMMAND[NBtopMax][32];
 static int NBtopP; // number of processes scanned by top
 */
 
-
-
 // timing info collected to optimize this program
 static struct timespec t1;
 static struct timespec t2;
@@ -160,16 +136,12 @@ static double scantime_top;
 static double scantime_CPUload;
 static double scantime_CPUpcnt;
 
-
-
 /* =============================================================================================== */
 /* =============================================================================================== */
 /*                                    FUNCTIONS SOURCE CODE                                        */
 /* =============================================================================================== */
 /* =============================================================================================== */
 
-
-
 errno_t processinfo_procdirname(char *procdname)
 {
     int procdirOK = 0;
@@ -177,18 +149,18 @@ errno_t processinfo_procdirname(char *procdname)
 
     // first, we try the env variable if it exists
     char *MILK_PROC_DIR = getenv("MILK_PROC_DIR");
-    if(MILK_PROC_DIR != NULL)
+    if (MILK_PROC_DIR != NULL)
     {
         printf(" [ MILK_PROC_DIR ] '%s'\n", MILK_PROC_DIR);
 
         {
             int slen = snprintf(procdname, STRINGMAXLEN_FULLFILENAME, "%s", MILK_PROC_DIR);
-            if(slen < 1)
+            if (slen < 1)
             {
                 PRINT_ERROR("snprintf wrote <1 char");
                 abort(); // can't handle this error any other way
             }
-            if(slen >= STRINGMAXLEN_FULLFILENAME)
+            if (slen >= STRINGMAXLEN_FULLFILENAME)
             {
                 PRINT_ERROR("snprintf string truncation");
                 abort(); // can't handle this error any other way
@@ -197,7 +169,7 @@ errno_t processinfo_procdirname(char *procdname)
 
         // does this direcory exist ?
         tmpdir = opendir(procdname);
-        if(tmpdir) // directory exits
+        if (tmpdir) // directory exits
         {
             procdirOK = 1;
             closedir(tmpdir);
@@ -209,10 +181,10 @@ errno_t processinfo_procdirname(char *procdname)
     }
 
     // second, we try SHAREDPROCDIR default
-    if(procdirOK == 0)
+    if (procdirOK == 0)
     {
         tmpdir = opendir(SHAREDPROCDIR);
-        if(tmpdir) // directory exits
+        if (tmpdir) // directory exits
         {
             sprintf(procdname, "%s", SHAREDPROCDIR);
             procdirOK = 1;
@@ -221,10 +193,10 @@ errno_t processinfo_procdirname(char *procdname)
     }
 
     // if all above fails, set to /tmp
-    if(procdirOK == 0)
+    if (procdirOK == 0)
     {
         tmpdir = opendir("/tmp");
-        if(!tmpdir)
+        if (!tmpdir)
         {
             exit(EXIT_FAILURE);
         }
@@ -238,29 +210,20 @@ errno_t processinfo_procdirname(char *procdname)
     return RETURN_SUCCESS;
 }
 
-
-
 // High level processinfo function
 
 PROCESSINFO *processinfo_setup(
-    char *pinfoname,	// short name for the processinfo instance, avoid spaces, name should be human-readable
-    const char  *descriptionstring,
-    const char  *msgstring,
-    const char *functionname,
-    const char *filename,
-    int   linenumber
-)
+    char *pinfoname, // short name for the processinfo instance, avoid spaces, name should be human-readable
+    const char *descriptionstring, const char *msgstring, const char *functionname, const char *filename,
+    int linenumber)
 {
-    static PROCESSINFO
-    *processinfo; // Only one instance of processinfo created by process
+    static PROCESSINFO *processinfo; // Only one instance of processinfo created by process
     // subsequent calls to this function will re-use the same processinfo structure
 
     DEBUG_TRACEPOINT(" ");
 
-
-
     DEBUG_TRACEPOINT(" ");
-    if(data.processinfoActive == 0)
+    if (data.processinfoActive == 0)
     {
         //        PROCESSINFO *processinfo;
         DEBUG_TRACEPOINT(" ");
@@ -268,12 +231,12 @@ PROCESSINFO *processinfo_setup(
         char pinfoname0[STRINGMAXLEN_PROCESSINFO_NAME];
         {
             int slen = snprintf(pinfoname0, STRINGMAXLEN_PROCESSINFO_NAME, "%s", pinfoname);
-            if(slen < 1)
+            if (slen < 1)
             {
                 PRINT_ERROR("snprintf wrote <1 char");
                 abort(); // can't handle this error any other way
             }
-            if(slen >= STRINGMAXLEN_PROCESSINFO_NAME)
+            if (slen >= STRINGMAXLEN_PROCESSINFO_NAME)
             {
                 PRINT_ERROR("snprintf string truncation");
                 abort(); // can't handle this error any other way
@@ -284,41 +247,33 @@ PROCESSINFO *processinfo_setup(
 
         processinfo = processinfo_shm_create(pinfoname0, 0);
 
-
         processinfo_CatchSignals();
     }
 
-
     DEBUG_TRACEPOINT(" ");
 
     processinfo->loopstat = 0; // loop initialization
     strcpy(processinfo->source_FUNCTION, functionname);
-    strcpy(processinfo->source_FILE,     filename);
+    strcpy(processinfo->source_FILE, filename);
     processinfo->source_LINE = linenumber;
     strcpy(processinfo->description, descriptionstring);
     processinfo_WriteMessage(processinfo, msgstring);
     data.processinfoActive = 1;
 
-    processinfo->loopcntMax = -1;     // infinite loop
+    processinfo->loopcntMax = -1; // infinite loop
 
-    processinfo->MeasureTiming =  0;  // default: do not measure timing
-    processinfo->RT_priority   = -1;  // default: do not assign RT priority
+    processinfo->MeasureTiming = 0; // default: do not measure timing
+    processinfo->RT_priority = -1;  // default: do not assign RT priority
 
     DEBUG_TRACEPOINT(" ");
 
     return processinfo;
 }
 
-
-
-
 // report error
 // should be followed by return(EXIT_FAILURE) call
 //
-errno_t processinfo_error(
-    PROCESSINFO *processinfo,
-    char *errmsgstring
-)
+errno_t processinfo_error(PROCESSINFO *processinfo, char *errmsgstring)
 {
     processinfo->loopstat = 4; // ERROR
     processinfo_WriteMessage(processinfo, errmsgstring);
@@ -326,19 +281,12 @@ errno_t processinfo_error(
     return RETURN_SUCCESS;
 }
 
-
-
-
-
-
-errno_t processinfo_loopstart(
-    PROCESSINFO *processinfo
-)
+errno_t processinfo_loopstart(PROCESSINFO *processinfo)
 {
     processinfo->loopcnt = 0;
     processinfo->loopstat = 1;
 
-    if(processinfo->RT_priority > -1)
+    if (processinfo->RT_priority > -1)
     {
         struct sched_param schedpar;
         // ===========================
@@ -346,79 +294,66 @@ errno_t processinfo_loopstart(
         // ===========================
         schedpar.sched_priority = processinfo->RT_priority;
 
-        if(seteuid(data.euid) != 0)     //This goes up to maximum privileges
+        if (seteuid(data.euid) != 0) //This goes up to maximum privileges
         {
             PRINT_ERROR("seteuid error");
         }
         sched_setscheduler(0, SCHED_FIFO,
                            &schedpar); //other option is SCHED_RR, might be faster
-        if(seteuid(data.ruid) != 0)     //Go back to normal privileges
+        if (seteuid(data.ruid) != 0)   //Go back to normal privileges
         {
             PRINT_ERROR("seteuid error");
         }
     }
 
-
     return RETURN_SUCCESS;
 }
 
-
-
-
 // returns loop status
 // 0 if loop should exit, 1 otherwise
 
-int processinfo_loopstep(
-    PROCESSINFO *processinfo
-)
+int processinfo_loopstep(PROCESSINFO *processinfo)
 {
     int loopstatus = 1;
 
-    while(processinfo->CTRLval == 1)   // pause
+    while (processinfo->CTRLval == 1) // pause
     {
         usleep(50);
     }
-    if(processinfo->CTRLval == 2)   // single iteration
+    if (processinfo->CTRLval == 2) // single iteration
     {
         processinfo->CTRLval = 1;
     }
-    if(processinfo->CTRLval == 3)   // exit loop
+    if (processinfo->CTRLval == 3) // exit loop
     {
         loopstatus = 0;
     }
 
-    if(data.signal_INT == 1)    // CTRL-C
+    if (data.signal_INT == 1) // CTRL-C
     {
         loopstatus = 0;
     }
 
-    if(data.signal_HUP == 1)    // terminal has disappeared
+    if (data.signal_HUP == 1) // terminal has disappeared
     {
         loopstatus = 0;
     }
 
-    if(processinfo->loopcntMax != -1)
-        if(processinfo->loopcnt >= processinfo->loopcntMax - 1)
+    if (processinfo->loopcntMax != -1)
+        if (processinfo->loopcnt >= processinfo->loopcntMax - 1)
         {
             loopstatus = 0;
         }
 
-
     return loopstatus;
 }
 
-
-
-
-
-int processinfo_compute_status(
-    PROCESSINFO *processinfo
-)
+int processinfo_compute_status(PROCESSINFO *processinfo)
 {
     int compstatus = 1;
 
     // CTRLval = 5 will disable computations in loop (usually for testing)
-    if(processinfo->CTRLval == 5)
+    if (processinfo->CTRLval == 5)
     {
         compstatus = 0;
     }
@@ -426,15 +361,6 @@ int processinfo_compute_status(
     return compstatus;
 }
 
-
-
-
-
-
-
-
-
-
 /**
  * ## Purpose
  *
@@ -451,10 +377,10 @@ int processinfo_compute_status(
 
 long processinfo_shm_list_create()
 {
-    char  SM_fname[STRINGMAXLEN_FULLFILENAME];
+    char SM_fname[STRINGMAXLEN_FULLFILENAME];
     long pindex = 0;
 
-    char  procdname[STRINGMAXLEN_DIRNAME];
+    char procdname[STRINGMAXLEN_DIRNAME];
     processinfo_procdirname(procdname);
 
     WRITE_FULLFILENAME(SM_fname, "%s/processinfo.list.shm", procdname);
@@ -466,17 +392,17 @@ long processinfo_shm_list_create()
     struct stat buffer;
     int exists = stat(SM_fname, &buffer);
 
-    if(exists == -1)
+    if (exists == -1)
     {
         printf("CREATING PROCESSINFO LIST\n");
 
         size_t sharedsize = 0; // shared memory size in bytes
-        int SM_fd; // shared memory file descriptor
+        int SM_fd;             // shared memory file descriptor
 
         sharedsize = sizeof(PROCESSINFOLIST);
         umask(0);
-        SM_fd = open(SM_fname, O_RDWR | O_CREAT | O_TRUNC, (mode_t) FILEMODE);
-        if(SM_fd == -1)
+        SM_fd = open(SM_fname, O_RDWR | O_CREAT | O_TRUNC, (mode_t)FILEMODE);
+        if (SM_fd == -1)
         {
             perror("Error opening file for writing");
             exit(0);
@@ -484,7 +410,7 @@ long processinfo_shm_list_create()
 
         int result;
         result = lseek(SM_fd, sharedsize - 1, SEEK_SET);
-        if(result == -1)
+        if (result == -1)
         {
             close(SM_fd);
             fprintf(stderr, "Error calling lseek() to 'stretch' the file");
@@ -492,23 +418,22 @@ long processinfo_shm_list_create()
         }
 
         result = write(SM_fd, "", 1);
-        if(result != 1)
+        if (result != 1)
         {
             close(SM_fd);
             perror("Error writing last byte of the file");
             exit(0);
         }
 
-        pinfolist = (PROCESSINFOLIST *) mmap(0, sharedsize, PROT_READ | PROT_WRITE,
-                                             MAP_SHARED, SM_fd, 0);
-        if(pinfolist == MAP_FAILED)
+        pinfolist = (PROCESSINFOLIST *)mmap(0, sharedsize, PROT_READ | PROT_WRITE, MAP_SHARED, SM_fd, 0);
+        if (pinfolist == MAP_FAILED)
         {
             close(SM_fd);
             perror("Error mmapping the file");
             exit(0);
         }
 
-        for(pindex = 0; pindex < PROCESSINFOLISTSIZE; pindex++)
+        for (pindex = 0; pindex < PROCESSINFOLISTSIZE; pindex++)
         {
             pinfolist->active[pindex] = 0;
         }
@@ -521,29 +446,23 @@ long processinfo_shm_list_create()
         //struct stat file_stat;
 
         pinfolist = (PROCESSINFOLIST *)processinfo_shm_link(SM_fname, &SM_fd);
-        while((pinfolist->active[pindex] != 0) && (pindex < PROCESSINFOLISTSIZE))
+        while ((pinfolist->active[pindex] != 0) && (pindex < PROCESSINFOLISTSIZE))
         {
-            pindex ++;
+            pindex++;
         }
 
-        if(pindex == PROCESSINFOLISTSIZE)
+        if (pindex == PROCESSINFOLISTSIZE)
         {
             printf("ERROR: pindex reaches max value\n");
             exit(0);
         }
     }
 
-
     printf("pindex = %ld\n", pindex);
 
     return pindex;
 }
 
-
-
-
-
-
 /**
  * Create PROCESSINFO structure in shared memory
  *
@@ -552,41 +471,34 @@ long processinfo_shm_list_create()
  *
 */
 
-PROCESSINFO *processinfo_shm_create(
-    const char *pname,
-    int CTRLval
-)
+PROCESSINFO *processinfo_shm_create(const char *pname, int CTRLval)
 {
     size_t sharedsize = 0; // shared memory size in bytes
-    int SM_fd; // shared memory file descriptor
+    int SM_fd;             // shared memory file descriptor
     PROCESSINFO *pinfo;
 
-    static int LogFileCreated =
-        0; // toggles to 1 when created. To avoid re-creating file on same process
+    static int LogFileCreated = 0; // toggles to 1 when created. To avoid re-creating file on same process
 
     sharedsize = sizeof(PROCESSINFO);
 
-    char  SM_fname[STRINGMAXLEN_FULLFILENAME];
+    char SM_fname[STRINGMAXLEN_FULLFILENAME];
     pid_t PID;
 
-
     PID = getpid();
 
     long pindex;
     pindex = processinfo_shm_list_create();
 
     pinfolist->PIDarray[pindex] = PID;
-    strncpy(pinfolist->pnamearray[pindex], pname,
-            STRINGMAXLEN_PROCESSINFO_NAME - 1);
+    strncpy(pinfolist->pnamearray[pindex], pname, STRINGMAXLEN_PROCESSINFO_NAME - 1);
 
-    char  procdname[STRINGMAXLEN_FULLFILENAME];
+    char procdname[STRINGMAXLEN_FULLFILENAME];
     processinfo_procdirname(procdname);
 
-    WRITE_FULLFILENAME(SM_fname, "%s/proc.%s.%06d.shm", procdname, pname,
-                       (int) PID);
+    WRITE_FULLFILENAME(SM_fname, "%s/proc.%s.%06d.shm", procdname, pname, (int)PID);
     umask(0);
-    SM_fd = open(SM_fname, O_RDWR | O_CREAT | O_TRUNC, (mode_t) FILEMODE);
-    if(SM_fd == -1)
+    SM_fd = open(SM_fname, O_RDWR | O_CREAT | O_TRUNC, (mode_t)FILEMODE);
+    if (SM_fd == -1)
     {
         perror("Error opening file for writing");
         exit(0);
@@ -594,7 +506,7 @@ PROCESSINFO *processinfo_shm_create(
 
     int result;
     result = lseek(SM_fd, sharedsize - 1, SEEK_SET);
-    if(result == -1)
+    if (result == -1)
     {
         close(SM_fd);
         fprintf(stderr, "Error calling lseek() to 'stretch' the file");
@@ -602,16 +514,15 @@ PROCESSINFO *processinfo_shm_create(
     }
 
     result = write(SM_fd, "", 1);
-    if(result != 1)
+    if (result != 1)
     {
         close(SM_fd);
         perror("Error writing last byte of the file");
         exit(0);
     }
 
-    pinfo = (PROCESSINFO *) mmap(0, sharedsize, PROT_READ | PROT_WRITE, MAP_SHARED,
-                                 SM_fd, 0);
-    if(pinfo == MAP_FAILED)
+    pinfo = (PROCESSINFO *)mmap(0, sharedsize, PROT_READ | PROT_WRITE, MAP_SHARED, SM_fd, 0);
+    if (pinfo == MAP_FAILED)
     {
         close(SM_fd);
         perror("Error mmapping the file");
@@ -631,13 +542,13 @@ PROCESSINFO *processinfo_shm_create(
     int notmux = 0;
 
     fpout = popen("tmuxsessionname", "r");
-    if(fpout == NULL)
+    if (fpout == NULL)
     {
         printf("WARNING: cannot run command \"tmuxsessionname\"\n");
     }
     else
     {
-        if(fgets(tmuxname, 100, fpout) == NULL)
+        if (fgets(tmuxname, 100, fpout) == NULL)
         {
             //printf("WARNING: fgets error\n");
             notmux = 1;
@@ -645,13 +556,13 @@ PROCESSINFO *processinfo_shm_create(
         pclose(fpout);
     }
     // remove line feed
-    if(strlen(tmuxname) > 0)
+    if (strlen(tmuxname) > 0)
     {
         //  printf("tmux name : %s\n", tmuxname);
         //  printf("len: %d\n", (int) strlen(tmuxname));
         fflush(stdout);
 
-        if(tmuxname[strlen(tmuxname) - 1] == '\n')
+        if (tmuxname[strlen(tmuxname) - 1] == '\n')
         {
             tmuxname[strlen(tmuxname) - 1] = '\0';
         }
@@ -665,7 +576,7 @@ PROCESSINFO *processinfo_shm_create(
         notmux = 1;
     }
 
-    if(notmux == 1)
+    if (notmux == 1)
     {
         sprintf(tmuxname, " ");
     }
@@ -683,7 +594,6 @@ PROCESSINFO *processinfo_shm_create(
     // 3 : exit loop
     pinfo->CTRLval = CTRLval;
 
-
     pinfo->MeasureTiming = 1;
 
     // initialize timer indexes and counters
@@ -697,7 +607,6 @@ PROCESSINFO *processinfo_shm_create(
     data.pinfo = pinfo;
     pinfo->PID = PID;
 
-
     // create logfile
     //char logfilename[300];
     struct timespec tnow;
@@ -705,35 +614,26 @@ PROCESSINFO *processinfo_shm_create(
     clock_gettime(CLOCK_REALTIME, &tnow);
 
     {
-        int slen =  snprintf(pinfo->logfilename,
-                             STRINGMAXLEN_PROCESSINFO_LOGFILENAME,
-                             "%s/proc.%s.%06d.%09ld.logfile",
-                             procdname,
-                             pinfo->name,
-                             (int) pinfo->PID,
-                             tnow.tv_sec);
-        if(slen < 1)
+        int slen = snprintf(pinfo->logfilename, STRINGMAXLEN_PROCESSINFO_LOGFILENAME, "%s/proc.%s.%06d.%09ld.logfile",
+                            procdname, pinfo->name, (int)pinfo->PID, tnow.tv_sec);
+        if (slen < 1)
         {
             PRINT_ERROR("snprintf wrote <1 char");
             abort();
         }
-        if(slen >= STRINGMAXLEN_PROCESSINFO_LOGFILENAME)
+        if (slen >= STRINGMAXLEN_PROCESSINFO_LOGFILENAME)
         {
             PRINT_ERROR("snprintf string truncation");
             abort();
         }
     }
 
-
-
-
-    if(LogFileCreated == 0)
+    if (LogFileCreated == 0)
     {
         pinfo->logFile = fopen(pinfo->logfilename, "w");
         LogFileCreated = 1;
     }
 
-
     char msgstring[300];
     sprintf(msgstring, "LOG START %s", pinfo->logfilename);
     processinfo_WriteMessage(pinfo, msgstring);
@@ -741,14 +641,12 @@ PROCESSINFO *processinfo_shm_create(
     return pinfo;
 }
 
-
-
 PROCESSINFO *processinfo_shm_link(const char *pname, int *fd)
 {
     struct stat file_stat;
 
     *fd = open(pname, O_RDWR);
-    if(*fd == -1)
+    if (*fd == -1)
     {
         perror("Error opening file");
         exit(0);
@@ -756,9 +654,8 @@ PROCESSINFO *processinfo_shm_link(const char *pname, int *fd)
     fstat(*fd, &file_stat);
     //printf("[%d] File %s size: %zd\n", __LINE__, pname, file_stat.st_size);
 
-    PROCESSINFO *pinfolist = (PROCESSINFO *) mmap(0, file_stat.st_size,
-                             PROT_READ | PROT_WRITE, MAP_SHARED, *fd, 0);
-    if(pinfolist == MAP_FAILED)
+    PROCESSINFO *pinfolist = (PROCESSINFO *)mmap(0, file_stat.st_size, PROT_READ | PROT_WRITE, MAP_SHARED, *fd, 0);
+    if (pinfolist == MAP_FAILED)
     {
         close(*fd);
         fprintf(stderr, "Error mmapping the file");
@@ -777,15 +674,10 @@ int processinfo_shm_close(PROCESSINFO *pinfo, int fd)
     return EXIT_SUCCESS;
 }
 
-
-
-
-
-
 int processinfo_cleanExit(PROCESSINFO *processinfo)
 {
 
-    if(processinfo->loopstat != 4)
+    if (processinfo->loopstat != 4)
     {
         struct timespec tstop;
         struct tm *tstoptm;
@@ -794,20 +686,18 @@ int processinfo_cleanExit(PROCESSINFO *processinfo)
         clock_gettime(CLOCK_REALTIME, &tstop);
         tstoptm = gmtime(&tstop.tv_sec);
 
-        if(processinfo->CTRLval == 3)   // loop exit from processinfo control
+        if (processinfo->CTRLval == 3) // loop exit from processinfo control
         {
-            sprintf(msgstring, "CTRLexit %02d:%02d:%02d.%03d", tstoptm->tm_hour,
-                    tstoptm->tm_min, tstoptm->tm_sec, (int)(0.000001 * (tstop.tv_nsec)));
-            strncpy(processinfo->statusmsg, msgstring,
-                    STRINGMAXLEN_PROCESSINFO_STATUSMSG - 1);
+            sprintf(msgstring, "CTRLexit %02d:%02d:%02d.%03d", tstoptm->tm_hour, tstoptm->tm_min, tstoptm->tm_sec,
+                    (int)(0.000001 * (tstop.tv_nsec)));
+            strncpy(processinfo->statusmsg, msgstring, STRINGMAXLEN_PROCESSINFO_STATUSMSG - 1);
         }
 
-        if(processinfo->loopstat == 1)
+        if (processinfo->loopstat == 1)
         {
-            sprintf(msgstring, "Loop exit %02d:%02d:%02d.%03d", tstoptm->tm_hour,
-                    tstoptm->tm_min, tstoptm->tm_sec, (int)(0.000001 * (tstop.tv_nsec)));
-            strncpy(processinfo->statusmsg, msgstring,
-                    STRINGMAXLEN_PROCESSINFO_STATUSMSG - 1);
+            sprintf(msgstring, "Loop exit %02d:%02d:%02d.%03d", tstoptm->tm_hour, tstoptm->tm_min, tstoptm->tm_sec,
+                    (int)(0.000001 * (tstop.tv_nsec)));
+            strncpy(processinfo->statusmsg, msgstring, STRINGMAXLEN_PROCESSINFO_STATUSMSG - 1);
         }
 
         processinfo->loopstat = 3; // clean exit
@@ -816,183 +706,175 @@ int processinfo_cleanExit(PROCESSINFO *processinfo)
     return 0;
 }
 
-
-
-
-
-
 int processinfo_SIGexit(PROCESSINFO *processinfo, int SignalNumber)
 {
-    char       timestring[200];
-    struct     timespec tstop;
+    char timestring[200];
+    struct timespec tstop;
     struct tm *tstoptm;
-    char       msgstring[STRINGMAXLEN_PROCESSINFO_STATUSMSG];
+    char msgstring[STRINGMAXLEN_PROCESSINFO_STATUSMSG];
 
     clock_gettime(CLOCK_REALTIME, &tstop);
     tstoptm = gmtime(&tstop.tv_sec);
 
-    sprintf(timestring, "%02d:%02d:%02d.%03d", tstoptm->tm_hour, tstoptm->tm_min,
-            tstoptm->tm_sec, (int)(0.000001 * (tstop.tv_nsec)));
+    sprintf(timestring, "%02d:%02d:%02d.%03d", tstoptm->tm_hour, tstoptm->tm_min, tstoptm->tm_sec,
+            (int)(0.000001 * (tstop.tv_nsec)));
     processinfo->loopstat = 3; // clean exit
 
-
     char SIGstr[12];
     int SIGflag = 0;
-    switch(SignalNumber)
+    switch (SignalNumber)
     {
 
-        case SIGHUP :  // Hangup detected on controlling terminal or death of controlling process
-            strcpy(SIGstr, "SIGHUP");
-            SIGflag = 1;
-            break;
-
-        case SIGINT :  // Interrupt from keyboard
-            strcpy(SIGstr, "SIGINT");
-            SIGflag = 1;
-            break;
-
-        case SIGQUIT :  // Quit from keyboard
-            strcpy(SIGstr, "SIGQUIT");
-            SIGflag = 1;
-            break;
-
-        case SIGILL :  // Illegal Instruction
-            strcpy(SIGstr, "SIGILL");
-            SIGflag = 1;
-            break;
-
-        case SIGABRT :  // Abort signal from abort
-            strcpy(SIGstr, "SIGABRT");
-            SIGflag = 1;
-            break;
-
-        case SIGFPE :  // Floating-point exception
-            strcpy(SIGstr, "SIGFPE");
-            SIGflag = 1;
-            break;
-
-        case SIGKILL :  // Kill signal
-            strcpy(SIGstr, "SIGKILL");
-            SIGflag = 1;
-            break;
-
-        case SIGSEGV :  // Invalid memory reference
-            strcpy(SIGstr, "SIGSEGV");
-            SIGflag = 1;
-            break;
-
-        case SIGPIPE :  // Broken pipe: write to pipe with no readers
-            strcpy(SIGstr, "SIGPIPE");
-            SIGflag = 1;
-            break;
-
-        case SIGALRM :  // Timer signal from alarm
-            strcpy(SIGstr, "SIGALRM");
-            SIGflag = 1;
-            break;
-
-        case SIGTERM :  // Termination signal
-            strcpy(SIGstr, "SIGTERM");
-            SIGflag = 1;
-            break;
-
-        case SIGUSR1 :  // User-defined signal 1
-            strcpy(SIGstr, "SIGUSR1");
-            SIGflag = 1;
-            break;
-
-        case SIGUSR2 :  // User-defined signal 1
-            strcpy(SIGstr, "SIGUSR2");
-            SIGflag = 1;
-            break;
-
-        case SIGCHLD :  // Child stopped or terminated
-            strcpy(SIGstr, "SIGCHLD");
-            SIGflag = 1;
-            break;
-
-        case SIGCONT :  // Continue if stoppedshmimTCPtransmit
-            strcpy(SIGstr, "SIGCONT");
-            SIGflag = 1;
-            break;
-
-        case SIGSTOP :  // Stop process
-            strcpy(SIGstr, "SIGSTOP");
-            SIGflag = 1;
-            break;
-
-        case SIGTSTP :  // Stop typed at terminal
-            strcpy(SIGstr, "SIGTSTP");
-            SIGflag = 1;
-            break;
-
-        case SIGTTIN :  // Terminal input for background process
-            strcpy(SIGstr, "SIGTTIN");
-            SIGflag = 1;
-            break;
-
-        case SIGTTOU :  // Terminal output for background process
-            strcpy(SIGstr, "SIGTTOU");
-            SIGflag = 1;
-            break;
-
-        case SIGBUS :  // Bus error (bad memory access)
-            strcpy(SIGstr, "SIGBUS");
-            SIGflag = 1;
-            break;
-
-        case SIGPOLL :  // Pollable event (Sys V).
-            strcpy(SIGstr, "SIGPOLL");
-            SIGflag = 1;
-            break;
-
-        case SIGPROF :  // Profiling timer expired
-            strcpy(SIGstr, "SIGPROF");
-            SIGflag = 1;
-            break;
-
-        case SIGSYS :  // Bad system call (SVr4)
-            strcpy(SIGstr, "SIGSYS");
-            SIGflag = 1;
-            break;
-
-        case SIGTRAP :  // Trace/breakpoint trap
-            strcpy(SIGstr, "SIGTRAP");
-            SIGflag = 1;
-            break;
-
-        case SIGURG :  // Urgent condition on socket (4.2BSD)
-            strcpy(SIGstr, "SIGURG");
-            SIGflag = 1;
-            break;
-
-        case SIGVTALRM :  // Virtual alarm clock (4.2BSD)
-            strcpy(SIGstr, "SIGVTALRM");
-            SIGflag = 1;
-            break;
-
-        case SIGXCPU :  // CPU time limit exceeded (4.2BSD)
-            strcpy(SIGstr, "SIGXCPU");
-            SIGflag = 1;
-            break;
-
-        case SIGXFSZ :  // File size limit exceeded (4.2BSD)
-            strcpy(SIGstr, "SIGXFSZ");
-            SIGflag = 1;
-            break;
+    case SIGHUP: // Hangup detected on controlling terminal or death of controlling process
+        strcpy(SIGstr, "SIGHUP");
+        SIGflag = 1;
+        break;
+
+    case SIGINT: // Interrupt from keyboard
+        strcpy(SIGstr, "SIGINT");
+        SIGflag = 1;
+        break;
+
+    case SIGQUIT: // Quit from keyboard
+        strcpy(SIGstr, "SIGQUIT");
+        SIGflag = 1;
+        break;
+
+    case SIGILL: // Illegal Instruction
+        strcpy(SIGstr, "SIGILL");
+        SIGflag = 1;
+        break;
+
+    case SIGABRT: // Abort signal from abort
+        strcpy(SIGstr, "SIGABRT");
+        SIGflag = 1;
+        break;
+
+    case SIGFPE: // Floating-point exception
+        strcpy(SIGstr, "SIGFPE");
+        SIGflag = 1;
+        break;
+
+    case SIGKILL: // Kill signal
+        strcpy(SIGstr, "SIGKILL");
+        SIGflag = 1;
+        break;
+
+    case SIGSEGV: // Invalid memory reference
+        strcpy(SIGstr, "SIGSEGV");
+        SIGflag = 1;
+        break;
+
+    case SIGPIPE: // Broken pipe: write to pipe with no readers
+        strcpy(SIGstr, "SIGPIPE");
+        SIGflag = 1;
+        break;
+
+    case SIGALRM: // Timer signal from alarm
+        strcpy(SIGstr, "SIGALRM");
+        SIGflag = 1;
+        break;
+
+    case SIGTERM: // Termination signal
+        strcpy(SIGstr, "SIGTERM");
+        SIGflag = 1;
+        break;
+
+    case SIGUSR1: // User-defined signal 1
+        strcpy(SIGstr, "SIGUSR1");
+        SIGflag = 1;
+        break;
+
+    case SIGUSR2: // User-defined signal 1
+        strcpy(SIGstr, "SIGUSR2");
+        SIGflag = 1;
+        break;
+
+    case SIGCHLD: // Child stopped or terminated
+        strcpy(SIGstr, "SIGCHLD");
+        SIGflag = 1;
+        break;
+
+    case SIGCONT: // Continue if stoppedshmimTCPtransmit
+        strcpy(SIGstr, "SIGCONT");
+        SIGflag = 1;
+        break;
+
+    case SIGSTOP: // Stop process
+        strcpy(SIGstr, "SIGSTOP");
+        SIGflag = 1;
+        break;
+
+    case SIGTSTP: // Stop typed at terminal
+        strcpy(SIGstr, "SIGTSTP");
+        SIGflag = 1;
+        break;
+
+    case SIGTTIN: // Terminal input for background process
+        strcpy(SIGstr, "SIGTTIN");
+        SIGflag = 1;
+        break;
+
+    case SIGTTOU: // Terminal output for background process
+        strcpy(SIGstr, "SIGTTOU");
+        SIGflag = 1;
+        break;
+
+    case SIGBUS: // Bus error (bad memory access)
+        strcpy(SIGstr, "SIGBUS");
+        SIGflag = 1;
+        break;
+
+    case SIGPOLL: // Pollable event (Sys V).
+        strcpy(SIGstr, "SIGPOLL");
+        SIGflag = 1;
+        break;
+
+    case SIGPROF: // Profiling timer expired
+        strcpy(SIGstr, "SIGPROF");
+        SIGflag = 1;
+        break;
+
+    case SIGSYS: // Bad system call (SVr4)
+        strcpy(SIGstr, "SIGSYS");
+        SIGflag = 1;
+        break;
+
+    case SIGTRAP: // Trace/breakpoint trap
+        strcpy(SIGstr, "SIGTRAP");
+        SIGflag = 1;
+        break;
+
+    case SIGURG: // Urgent condition on socket (4.2BSD)
+        strcpy(SIGstr, "SIGURG");
+        SIGflag = 1;
+        break;
+
+    case SIGVTALRM: // Virtual alarm clock (4.2BSD)
+        strcpy(SIGstr, "SIGVTALRM");
+        SIGflag = 1;
+        break;
+
+    case SIGXCPU: // CPU time limit exceeded (4.2BSD)
+        strcpy(SIGstr, "SIGXCPU");
+        SIGflag = 1;
+        break;
+
+    case SIGXFSZ: // File size limit exceeded (4.2BSD)
+        strcpy(SIGstr, "SIGXFSZ");
+        SIGflag = 1;
+        break;
     }
 
-
-    if(SIGflag == 1)
+    if (SIGflag == 1)
     {
-        int slen = snprintf(msgstring, STRINGMAXLEN_PROCESSINFO_STATUSMSG, "%s at %s",
-                            SIGstr, timestring);
-        if(slen < 1)
+        int slen = snprintf(msgstring, STRINGMAXLEN_PROCESSINFO_STATUSMSG, "%s at %s", SIGstr, timestring);
+        if (slen < 1)
         {
             PRINT_ERROR("snprintf wrote <1 char");
             abort(); // can't handle this error any other way
         }
-        if(slen >= STRINGMAXLEN_PROCESSINFO_STATUSMSG)
+        if (slen >= STRINGMAXLEN_PROCESSINFO_STATUSMSG)
         {
             PRINT_ERROR("snprintf string truncation");
             abort(); // can't handle this error any other way
@@ -1004,16 +886,7 @@ int processinfo_SIGexit(PROCESSINFO *processinfo, int SignalNumber)
     return 0;
 }
 
-
-
-
-
-
-
-int processinfo_WriteMessage(
-    PROCESSINFO *processinfo,
-    const char  *msgstring
-)
+int processinfo_WriteMessage(PROCESSINFO *processinfo, const char *msgstring)
 {
     struct timespec tnow;
     struct tm *tmnow;
@@ -1027,54 +900,47 @@ int processinfo_WriteMessage(
 
     DEBUG_TRACEPOINT(" ");
 
-    fprintf(processinfo->logFile,
-            "%02d:%02d:%02d.%06d  %8ld.%09ld  %06d  %s\n",
-            tmnow->tm_hour, tmnow->tm_min, tmnow->tm_sec, (int)(0.001 * (tnow.tv_nsec)),
-            tnow.tv_sec, tnow.tv_nsec,
-            (int) processinfo->PID,
-            msgstring);
+    fprintf(processinfo->logFile, "%02d:%02d:%02d.%06d  %8ld.%09ld  %06d  %s\n", tmnow->tm_hour, tmnow->tm_min,
+            tmnow->tm_sec, (int)(0.001 * (tnow.tv_nsec)), tnow.tv_sec, tnow.tv_nsec, (int)processinfo->PID, msgstring);
 
     DEBUG_TRACEPOINT(" ");
     fflush(processinfo->logFile);
     return 0;
 }
 
-
-
-
 int processinfo_CatchSignals()
 {
-    if(sigaction(SIGTERM, &data.sigact, NULL) == -1)
+    if (sigaction(SIGTERM, &data.sigact, NULL) == -1)
     {
         printf("\ncan't catch SIGTERM\n");
     }
 
-    if(sigaction(SIGINT, &data.sigact, NULL) == -1)
+    if (sigaction(SIGINT, &data.sigact, NULL) == -1)
     {
         printf("\ncan't catch SIGINT\n");
     }
 
-    if(sigaction(SIGABRT, &data.sigact, NULL) == -1)
+    if (sigaction(SIGABRT, &data.sigact, NULL) == -1)
     {
         printf("\ncan't catch SIGABRT\n");
     }
 
-    if(sigaction(SIGBUS, &data.sigact, NULL) == -1)
+    if (sigaction(SIGBUS, &data.sigact, NULL) == -1)
     {
         printf("\ncan't catch SIGBUS\n");
     }
 
-    if(sigaction(SIGSEGV, &data.sigact, NULL) == -1)
+    if (sigaction(SIGSEGV, &data.sigact, NULL) == -1)
     {
         printf("\ncan't catch SIGSEGV\n");
     }
 
-    if(sigaction(SIGHUP, &data.sigact, NULL) == -1)
+    if (sigaction(SIGHUP, &data.sigact, NULL) == -1)
     {
         printf("\ncan't catch SIGHUP\n");
     }
 
-    if(sigaction(SIGPIPE, &data.sigact, NULL) == -1)
+    if (sigaction(SIGPIPE, &data.sigact, NULL) == -1)
     {
         printf("\ncan't catch SIGPIPE\n");
     }
@@ -1082,50 +948,48 @@ int processinfo_CatchSignals()
     return 0;
 }
 
-
-
 int processinfo_ProcessSignals(PROCESSINFO *processinfo)
 {
     int loopOK = 1;
     // process signals
 
-    if(data.signal_TERM == 1)
+    if (data.signal_TERM == 1)
     {
         loopOK = 0;
         processinfo_SIGexit(processinfo, SIGTERM);
     }
 
-    if(data.signal_INT == 1)
+    if (data.signal_INT == 1)
     {
         loopOK = 0;
         processinfo_SIGexit(processinfo, SIGINT);
     }
 
-    if(data.signal_ABRT == 1)
+    if (data.signal_ABRT == 1)
     {
         loopOK = 0;
         processinfo_SIGexit(processinfo, SIGABRT);
     }
 
-    if(data.signal_BUS == 1)
+    if (data.signal_BUS == 1)
     {
         loopOK = 0;
         processinfo_SIGexit(processinfo, SIGBUS);
     }
 
-    if(data.signal_SEGV == 1)
+    if (data.signal_SEGV == 1)
     {
         loopOK = 0;
         processinfo_SIGexit(processinfo, SIGSEGV);
     }
 
-    if(data.signal_HUP == 1)
+    if (data.signal_HUP == 1)
     {
         loopOK = 0;
         processinfo_SIGexit(processinfo, SIGHUP);
     }
 
-    if(data.signal_PIPE == 1)
+    if (data.signal_PIPE == 1)
     {
         loopOK = 0;
         processinfo_SIGexit(processinfo, SIGPIPE);
@@ -1134,42 +998,34 @@ int processinfo_ProcessSignals(PROCESSINFO *processinfo)
     return loopOK;
 }
 
-
-
-
-
 /** @brief Update ouput stream at completion of processinfo-enabled loop iteration
  *
  */
-errno_t processinfo_update_output_stream(
-    PROCESSINFO *processinfo,
-    imageID outstreamID
-)
+errno_t processinfo_update_output_stream(PROCESSINFO *processinfo, imageID outstreamID)
 {
-    if(data.image[outstreamID].md[0].shared == 1)
+    if (data.image[outstreamID].md[0].shared == 1)
     {
         imageID IDin;
 
-
         DEBUG_TRACEPOINT(" ");
 
-        if(processinfo != NULL)
+        if (processinfo != NULL)
         {
             IDin = processinfo->triggerstreamID;
             DEBUG_TRACEPOINT("trigger IDin = %ld", IDin);
 
-            if(IDin > -1)
+            if (IDin > -1)
             {
                 int sptisize = data.image[IDin].md[0].NBproctrace - 1;
 
                 // copy streamproctrace from input to output
-                memcpy(&data.image[outstreamID].streamproctrace[1],
-                       &data.image[IDin].streamproctrace[0], sizeof(STREAM_PROC_TRACE)*sptisize);
+                memcpy(&data.image[outstreamID].streamproctrace[1], &data.image[IDin].streamproctrace[0],
+                       sizeof(STREAM_PROC_TRACE) * sptisize);
             }
 
             DEBUG_TRACEPOINT("timing");
             struct timespec ts;
-            if(clock_gettime(CLOCK_REALTIME, &ts) == -1)
+            if (clock_gettime(CLOCK_REALTIME, &ts) == -1)
             {
                 perror("clock_gettime");
                 exit(EXIT_FAILURE);
@@ -1177,33 +1033,26 @@ errno_t processinfo_update_output_stream(
 
             // write first streamproctrace entry
             DEBUG_TRACEPOINT("trigger info");
-            data.image[outstreamID].streamproctrace[0].triggermode      =
-                processinfo->triggermode;
+            data.image[outstreamID].streamproctrace[0].triggermode = processinfo->triggermode;
 
-            data.image[outstreamID].streamproctrace[0].procwrite_PID    = getpid();
+            data.image[outstreamID].streamproctrace[0].procwrite_PID = getpid();
 
-            data.image[outstreamID].streamproctrace[0].trigger_inode    =
-                processinfo->triggerstreaminode;
+            data.image[outstreamID].streamproctrace[0].trigger_inode = processinfo->triggerstreaminode;
 
-            data.image[outstreamID].streamproctrace[0].ts_procstart     =
-                processinfo->texecstart[processinfo->timerindex];
+            data.image[outstreamID].streamproctrace[0].ts_procstart = processinfo->texecstart[processinfo->timerindex];
 
-            data.image[outstreamID].streamproctrace[0].ts_streamupdate  = ts;
+            data.image[outstreamID].streamproctrace[0].ts_streamupdate = ts;
 
-            data.image[outstreamID].streamproctrace[0].trigsemindex     =
-                processinfo->triggersem;
+            data.image[outstreamID].streamproctrace[0].trigsemindex = processinfo->triggersem;
 
-            data.image[outstreamID].streamproctrace[0].triggerstatus    =
-                processinfo->triggerstatus;
+            data.image[outstreamID].streamproctrace[0].triggerstatus = processinfo->triggerstatus;
 
-            if(IDin > -1)
+            if (IDin > -1)
             {
-                data.image[outstreamID].streamproctrace[0].cnt0             =
-                    data.image[IDin].md[0].cnt0;
+                data.image[outstreamID].streamproctrace[0].cnt0 = data.image[IDin].md[0].cnt0;
             }
         }
         DEBUG_TRACEPOINT(" ");
-
     }
 
     ImageStreamIO_UpdateIm(&data.image[outstreamID]);
@@ -1211,36 +1060,27 @@ errno_t processinfo_update_output_stream(
     return RETURN_SUCCESS;
 }
 
-
-
-
-
-
-
-int processinfo_exec_start(
-    PROCESSINFO *processinfo
-)
+int processinfo_exec_start(PROCESSINFO *processinfo)
 {
     DEBUG_TRACEPOINT(" ");
-    if(processinfo->MeasureTiming == 1)
+    if (processinfo->MeasureTiming == 1)
     {
 
-        processinfo->timerindex ++;
-        if(processinfo->timerindex == PROCESSINFO_NBtimer)
+        processinfo->timerindex++;
+        if (processinfo->timerindex == PROCESSINFO_NBtimer)
         {
             processinfo->timerindex = 0;
             processinfo->timingbuffercnt++;
         }
 
-        clock_gettime(CLOCK_REALTIME,
-                      &processinfo->texecstart[processinfo->timerindex]);
+        clock_gettime(CLOCK_REALTIME, &processinfo->texecstart[processinfo->timerindex]);
 
-        if(processinfo->dtiter_limit_enable != 0)
+        if (processinfo->dtiter_limit_enable != 0)
         {
             long dtiter;
             int timerindexlast;
 
-            if(processinfo->timerindex == 0)
+            if (processinfo->timerindex == 0)
             {
                 timerindexlast = PROCESSINFO_NBtimer - 1;
             }
@@ -1251,29 +1091,24 @@ int processinfo_exec_start(
 
             dtiter = processinfo->texecstart[processinfo->timerindex].tv_nsec -
                      processinfo->texecstart[timerindexlast].tv_nsec;
-            dtiter += 1000000000 * (processinfo->texecstart[processinfo->timerindex].tv_sec
-                                    - processinfo->texecstart[timerindexlast].tv_sec);
-
+            dtiter += 1000000000 * (processinfo->texecstart[processinfo->timerindex].tv_sec -
+                                    processinfo->texecstart[timerindexlast].tv_sec);
 
-
-            if(dtiter > processinfo->dtiter_limit_value)
+            if (dtiter > processinfo->dtiter_limit_value)
             {
                 char msgstring[STRINGMAXLEN_PROCESSINFO_STATUSMSG];
 
                 {
-                    int slen = snprintf(msgstring,
-                                        STRINGMAXLEN_PROCESSINFO_STATUSMSG,
-                                        "dtiter %4ld  %4d %6.1f us  > %6.1f us",
-                                        processinfo->dtiter_limit_cnt,
-                                        processinfo->timerindex,
-                                        0.001 * dtiter,
-                                        0.001 * processinfo->dtiter_limit_value);
-                    if(slen < 1)
+                    int slen =
+                        snprintf(msgstring, STRINGMAXLEN_PROCESSINFO_STATUSMSG, "dtiter %4ld  %4d %6.1f us  > %6.1f us",
+                                 processinfo->dtiter_limit_cnt, processinfo->timerindex, 0.001 * dtiter,
+                                 0.001 * processinfo->dtiter_limit_value);
+                    if (slen < 1)
                     {
                         PRINT_ERROR("snprintf wrote <1 char");
                         abort(); // can't handle this error any other way
                     }
-                    if(slen >= STRINGMAXLEN_PROCESSINFO_STATUSMSG)
+                    if (slen >= STRINGMAXLEN_PROCESSINFO_STATUSMSG)
                     {
                         PRINT_ERROR("snprintf string truncation");
                         abort(); // can't handle this error any other way
@@ -1282,13 +1117,13 @@ int processinfo_exec_start(
 
                 processinfo_WriteMessage(processinfo, msgstring);
 
-                if(processinfo->dtiter_limit_enable == 2)   // pause process due to timing limit
+                if (processinfo->dtiter_limit_enable == 2) // pause process due to timing limit
                 {
                     processinfo->CTRLval = 1;
                     sprintf(msgstring, "dtiter lim -> paused");
                     processinfo_WriteMessage(processinfo, msgstring);
                 }
-                processinfo->dtiter_limit_cnt ++;
+                processinfo->dtiter_limit_cnt++;
             }
         }
     }
@@ -1296,21 +1131,16 @@ int processinfo_exec_start(
     return 0;
 }
 
-
-
-int processinfo_exec_end(
-    PROCESSINFO *processinfo
-)
+int processinfo_exec_end(PROCESSINFO *processinfo)
 {
     int loopOK = 1;
 
-    DEBUG_TRACEPOINT("End of execution loop, measure timing = %d",
-                     processinfo->MeasureTiming);
-    if(processinfo->MeasureTiming == 1)
+    DEBUG_TRACEPOINT("End of execution loop, measure timing = %d", processinfo->MeasureTiming);
+    if (processinfo->MeasureTiming == 1)
     {
         clock_gettime(CLOCK_REALTIME, &processinfo->texecend[processinfo->timerindex]);
 
-        if(processinfo->dtexec_limit_enable != 0)
+        if (processinfo->dtexec_limit_enable != 0)
         {
             long dtexec;
 
@@ -1319,23 +1149,21 @@ int processinfo_exec_end(
             dtexec += 1000000000 * (processinfo->texecend[processinfo->timerindex].tv_sec -
                                     processinfo->texecend[processinfo->timerindex].tv_sec);
 
-            if(dtexec > processinfo->dtexec_limit_value)
+            if (dtexec > processinfo->dtexec_limit_value)
             {
                 char msgstring[STRINGMAXLEN_PROCESSINFO_STATUSMSG];
 
                 {
-                    int slen = snprintf(msgstring,
-                                        STRINGMAXLEN_PROCESSINFO_STATUSMSG,
-                                        "dtexec %4ld  %4d %6.1f us  > %6.1f us",
-                                        processinfo->dtexec_limit_cnt,
-                                        processinfo->timerindex,
-                                        0.001 * dtexec, 0.001 * processinfo->dtexec_limit_value);
-                    if(slen < 1)
+                    int slen =
+                        snprintf(msgstring, STRINGMAXLEN_PROCESSINFO_STATUSMSG, "dtexec %4ld  %4d %6.1f us  > %6.1f us",
+                                 processinfo->dtexec_limit_cnt, processinfo->timerindex, 0.001 * dtexec,
+                                 0.001 * processinfo->dtexec_limit_value);
+                    if (slen < 1)
                     {
                         PRINT_ERROR("snprintf wrote <1 char");
                         abort(); // can't handle this error any other way
                     }
-                    if(slen >= STRINGMAXLEN_PROCESSINFO_STATUSMSG)
+                    if (slen >= STRINGMAXLEN_PROCESSINFO_STATUSMSG)
                     {
                         PRINT_ERROR("snprintf string truncation");
                         abort(); // can't handle this error any other way
@@ -1343,18 +1171,17 @@ int processinfo_exec_end(
                 }
                 processinfo_WriteMessage(processinfo, msgstring);
 
-                if(processinfo->dtexec_limit_enable == 2)   // pause process due to timing limit
+                if (processinfo->dtexec_limit_enable == 2) // pause process due to timing limit
                 {
                     processinfo->CTRLval = 1;
                     {
-                        int slen = snprintf(msgstring, STRINGMAXLEN_PROCESSINFO_STATUSMSG,
-                                            "dtexec lim -> paused");
-                        if(slen < 1)
+                        int slen = snprintf(msgstring, STRINGMAXLEN_PROCESSINFO_STATUSMSG, "dtexec lim -> paused");
+                        if (slen < 1)
                         {
                             PRINT_ERROR("snprintf wrote <1 char");
                             abort(); // can't handle this error any other way
                         }
-                        if(slen >= STRINGMAXLEN_PROCESSINFO_STATUSMSG)
+                        if (slen >= STRINGMAXLEN_PROCESSINFO_STATUSMSG)
                         {
                             PRINT_ERROR("snprintf string truncation");
                             abort(); // can't handle this error any other way
@@ -1363,7 +1190,7 @@ int processinfo_exec_end(
 
                     processinfo_WriteMessage(processinfo, msgstring);
                 }
-                processinfo->dtexec_limit_cnt ++;
+                processinfo->dtexec_limit_cnt++;
             }
         }
     }
@@ -1372,14 +1199,9 @@ int processinfo_exec_end(
 
     processinfo->loopcnt++;
 
-    return loopOK;  // returns 0 if signal stops loop
+    return loopOK; // returns 0 if signal stops loop
 }
 
-
-
-
-
-
 /**
  * ## Purpose
  *
@@ -1400,7 +1222,7 @@ int GetNumberCPUs(PROCINFOPROC *pinfop)
 
     static int initStatus = 0;
 
-    if(initStatus == 0)
+    if (initStatus == 0)
     {
         initStatus = 1;
         unsigned int depth = 0;
@@ -1430,8 +1252,7 @@ int GetNumberCPUs(PROCINFOPROC *pinfop)
             pinfop->CPUids[pu_index] = obj->os_index;
             ++pu_index;
             obj = obj->next_cousin;
-        }
-        while(obj != NULL);
+        } while (obj != NULL);
 
         hwloc_topology_destroy(topology);
     }
@@ -1445,13 +1266,13 @@ int GetNumberCPUs(PROCINFOPROC *pinfop)
     //unsigned int tmp_index = 0;
 
     fpout = popen("getconf _NPROCESSORS_ONLN", "r");
-    if(fpout == NULL)
+    if (fpout == NULL)
     {
         printf("WARNING: cannot run command \"tmuxsessionname\"\n");
     }
     else
     {
-        if(fgets(outstring, 16, fpout) == NULL)
+        if (fgets(outstring, 16, fpout) == NULL)
         {
             printf("WARNING: fgets error\n");
         }
@@ -1459,18 +1280,16 @@ int GetNumberCPUs(PROCINFOPROC *pinfop)
     }
     pinfop->NBcpus = atoi(outstring);
 
-    fpout = popen("cat /proc/cpuinfo |grep \"physical id\" | awk '{ print $NF }'",
-                  "r");
+    fpout = popen("cat /proc/cpuinfo |grep \"physical id\" | awk '{ print $NF }'", "r");
     pu_index = 0;
     pinfop->NBcpusocket = 1;
-    while((fgets(buf, sizeof(buf), fpout) != NULL)  &&
-            (pu_index < pinfop->NBcpus))
+    while ((fgets(buf, sizeof(buf), fpout) != NULL) && (pu_index < pinfop->NBcpus))
     {
         pinfop->CPUids[pu_index] = pu_index;
         pinfop->CPUphys[pu_index] = atoi(buf);
 
         //printf("cpu %2d belongs to Physical CPU %d\n", pu_index, pinfop->CPUphys[pu_index] );
-        if(pinfop->CPUphys[pu_index] + 1 > pinfop->NBcpusocket)
+        if (pinfop->CPUphys[pu_index] + 1 > pinfop->NBcpusocket)
         {
             pinfop->NBcpusocket = pinfop->CPUphys[pu_index] + 1;
         }
@@ -1480,13 +1299,9 @@ int GetNumberCPUs(PROCINFOPROC *pinfop)
 
 #endif
 
-    return(pinfop->NBcpus);
+    return (pinfop->NBcpus);
 }
 
-
-
-
-
 // unused
 /*
 
@@ -1549,34 +1364,30 @@ static long getTopOutput()
 
 */
 
-
-
-
-
 static int GetCPUloads(PROCINFOPROC *pinfop)
 {
-    char      *line = NULL;
-    size_t     maxstrlen = 256;
-    FILE      *fp;
-    ssize_t    read;
-    int        cpu;
-    long long  vall0, vall1, vall2, vall3, vall4, vall5, vall6, vall7, vall8;
-    long long  v0, v1, v2, v3, v4, v5, v6, v7, v8;
-    char       string0[80];
+    char *line = NULL;
+    size_t maxstrlen = 256;
+    FILE *fp;
+    ssize_t read;
+    int cpu;
+    long long vall0, vall1, vall2, vall3, vall4, vall5, vall6, vall7, vall8;
+    long long v0, v1, v2, v3, v4, v5, v6, v7, v8;
+    char string0[80];
 
     static int cnt = 0;
 
     clock_gettime(CLOCK_REALTIME, &t1);
 
     line = (char *)malloc(sizeof(char) * maxstrlen);
-    if(line == NULL)
+    if (line == NULL)
     {
         PRINT_ERROR("malloc returns NULL pointer");
         abort();
     }
 
     fp = fopen("/proc/stat", "r");
-    if(fp == NULL)
+    if (fp == NULL)
     {
         exit(EXIT_FAILURE);
     }
@@ -1584,19 +1395,17 @@ static int GetCPUloads(PROCINFOPROC *pinfop)
     cpu = 0;
 
     read = getline(&line, &maxstrlen, fp);
-    if(read == -1)
+    if (read == -1)
     {
         printf("[%s][%d]  ERROR: cannot read file\n", __FILE__, __LINE__);
         exit(EXIT_SUCCESS);
     }
 
-    while(((read = getline(&line, &maxstrlen, fp)) != -1)
-            && (cpu < pinfop->NBcpus))
+    while (((read = getline(&line, &maxstrlen, fp)) != -1) && (cpu < pinfop->NBcpus))
     {
 
-        sscanf(line, "%s %lld %lld %lld %lld %lld %lld %lld %lld %lld",
-               string0, &vall0, &vall1, &vall2, &vall3, &vall4, &vall5, &vall6, &vall7,
-               &vall8);
+        sscanf(line, "%s %lld %lld %lld %lld %lld %lld %lld %lld %lld", string0, &vall0, &vall1, &vall2, &vall3, &vall4,
+               &vall5, &vall6, &vall7, &vall8);
 
         v0 = vall0 - pinfop->CPUcnt0[cpu];
         v1 = vall1 - pinfop->CPUcnt1[cpu];
@@ -1618,8 +1427,7 @@ static int GetCPUloads(PROCINFOPROC *pinfop)
         pinfop->CPUcnt7[cpu] = vall7;
         pinfop->CPUcnt8[cpu] = vall8;
 
-        pinfop->CPUload[cpu] = (1.0 * v0 + v1 + v2 + v4 + v5 + v6) /
-                               (v0 + v1 + v2 + v3 + v4 + v5 + v6 + v7 + v8);
+        pinfop->CPUload[cpu] = (1.0 * v0 + v1 + v2 + v4 + v5 + v6) / (v0 + v1 + v2 + v3 + v4 + v5 + v6 + v7 + v8);
         cpu++;
     }
     free(line);
@@ -1628,7 +1436,6 @@ static int GetCPUloads(PROCINFOPROC *pinfop)
     tdiff = timespec_diff(t1, t2);
     scantime_CPUload += 1.0 * tdiff.tv_sec + 1.0e-9 * tdiff.tv_nsec;
 
-
     clock_gettime(CLOCK_REALTIME, &t1);
 
     // number of process per CPU -> we can get that from ps
@@ -1644,49 +1451,49 @@ static int GetCPUloads(PROCINFOPROC *pinfop)
     //    sprintf(command, "echo \"%5d CREATE\" >> cmdlog.txt\n", cnt);
     //    system(command);
 
-
-    EXECUTE_SYSTEM_COMMAND("{ if [ ! -f %s/_psOKlock ]; then touch %s/_psOKlock; ps -e -o pid,psr,cpu,cmd > %s; fi; rm %s/_psOKlock &> /dev/null; }",
+    EXECUTE_SYSTEM_COMMAND("{ if [ ! -f %s/_psOKlock ]; then touch %s/_psOKlock; ps -e -o pid,psr,cpu,cmd > %s; fi; rm "
+                           "%s/_psOKlock &> /dev/null; }",
                            procdname, procdname, psoutfname, procdname);
 
     //    sprintf(command, "echo \"%5d CREATED\" >> cmdlog.txt\n", cnt);
     //    system(command);
 
-
     // read and process psoutfname file
 
-    if(access(psoutfname, F_OK) != -1)
+    if (access(psoutfname, F_OK) != -1)
     {
 
         //        sprintf(command, "echo \"%5d READ\" >> cmdlog.txt\n", cnt);
         //        system(command);
 
-        for(cpu = 0; cpu < pinfop->NBcpus; cpu++)
+        for (cpu = 0; cpu < pinfop->NBcpus; cpu++)
         {
             char outstring[STRINGMAXLEN_DEFAULT];
             FILE *fpout;
             {
-                int slen = snprintf(command, STRINGMAXLEN_COMMAND,
-                                    "CORENUM=%d; cat %s | grep -E  \"^[[:space:]][[:digit:]]+[[:space:]]+${CORENUM}\"|wc -l",
-                                    cpu, psoutfname);
-                if(slen < 1)
+                int slen =
+                    snprintf(command, STRINGMAXLEN_COMMAND,
+                             "CORENUM=%d; cat %s | grep -E  \"^[[:space:]][[:digit:]]+[[:space:]]+${CORENUM}\"|wc -l",
+                             cpu, psoutfname);
+                if (slen < 1)
                 {
                     PRINT_ERROR("snprintf wrote <1 char");
                     abort(); // can't handle this error any other way
                 }
-                if(slen >= STRINGMAXLEN_COMMAND)
+                if (slen >= STRINGMAXLEN_COMMAND)
                 {
                     PRINT_ERROR("snprintf string truncation");
                     abort(); // can't handle this error any other way
                 }
             }
             fpout = popen(command, "r");
-            if(fpout == NULL)
+            if (fpout == NULL)
             {
                 printf("WARNING: cannot run command \"%s\"\n", command);
             }
             else
             {
-                if(fgets(outstring, STRINGMAXLEN_DEFAULT, fpout) == NULL)
+                if (fgets(outstring, STRINGMAXLEN_DEFAULT, fpout) == NULL)
                 {
                     printf("WARNING: fgets error\n");
                 }
@@ -1700,29 +1507,13 @@ static int GetCPUloads(PROCINFOPROC *pinfop)
     }
     cnt++;
 
-
     clock_gettime(CLOCK_REALTIME, &t2);
     tdiff = timespec_diff(t1, t2);
     scantime_CPUpcnt += 1.0 * tdiff.tv_sec + 1.0e-9 * tdiff.tv_nsec;
 
-    return(cpu);
+    return (cpu);
 }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 // for Display Modes 2 and 3
 //
 
@@ -1733,7 +1524,6 @@ static int PIDcollectSystemInfo(PROCESSINFODISP *pinfodisp, int level)
     FILE *fp;
     char fname[STRINGMAXLEN_FULLFILENAME];
 
-
     DEBUG_TRACEPOINT(" ");
 
     // cpuset
@@ -1747,11 +1537,11 @@ static int PIDcollectSystemInfo(PROCESSINFODISP *pinfodisp, int level)
     WRITE_FULLFILENAME(fname, "/proc/%d/task/%d/cpuset", PID, PID);
 
     fp = fopen(fname, "r");
-    if(fp == NULL)
+    if (fp == NULL)
     {
         return -1;
     }
-    if(fscanf(fp, "%s", pinfodisp->cpuset) != 1)
+    if (fscanf(fp, "%s", pinfodisp->cpuset) != 1)
     {
         PRINT_ERROR("fscanf returns value != 1");
     }
@@ -1760,18 +1550,16 @@ static int PIDcollectSystemInfo(PROCESSINFODISP *pinfodisp, int level)
     tdiff = timespec_diff(t1, t2);
     scantime_cpuset += 1.0 * tdiff.tv_sec + 1.0e-9 * tdiff.tv_nsec;
 
-
     char *line = NULL;
     size_t len = 0;
     ssize_t read;
     char string0[200];
     char string1[300];
 
-
     DEBUG_TRACEPOINT(" ");
 
     clock_gettime(CLOCK_REALTIME, &t1);
-    if(level == 0)
+    if (level == 0)
     {
         //FILE *fpout;
         //char command[200];
@@ -1791,14 +1579,14 @@ static int PIDcollectSystemInfo(PROCESSINFODISP *pinfodisp, int level)
         //sprintf(dirname, "/proc/%d/task/", PID);
         dp = opendir(dirname);
 
-        if(dp != NULL)
+        if (dp != NULL)
         {
-            while((ep = readdir(dp)))
+            while ((ep = readdir(dp)))
             {
-                if(ep->d_name[0] != '.')
+                if (ep->d_name[0] != '.')
                 {
                     int subPID = atoi(ep->d_name);
-                    if(subPID != PID)
+                    if (subPID != PID)
                     {
                         pinfodisp->subprocPIDarray[pinfodisp->NBsubprocesses] = atoi(ep->d_name);
                         pinfodisp->NBsubprocesses++;
@@ -1819,49 +1607,47 @@ static int PIDcollectSystemInfo(PROCESSINFODISP *pinfodisp, int level)
     tdiff = timespec_diff(t1, t2);
     scantime_pstree += 1.0 * tdiff.tv_sec + 1.0e-9 * tdiff.tv_nsec;
 
-
     // read /proc/PID/status
 #ifdef CMDPROC_PROCSTAT
-    for(int spindex = 0; spindex < pinfodisp->NBsubprocesses; spindex++)
+    for (int spindex = 0; spindex < pinfodisp->NBsubprocesses; spindex++)
     {
         clock_gettime(CLOCK_REALTIME, &t1);
         PID = pinfodisp->subprocPIDarray[spindex];
 
-
         WRITE_FULLFILENAME(fname, "/proc/%d/status", PID);
         fp = fopen(fname, "r");
-        if(fp == NULL)
+        if (fp == NULL)
         {
             return -1;
         }
 
-        while((read = getline(&line, &len, fp)) != -1)
+        while ((read = getline(&line, &len, fp)) != -1)
         {
-            if(sscanf(line, "%31[^:]: %s", string0, string1) == 2)
+            if (sscanf(line, "%31[^:]: %s", string0, string1) == 2)
             {
-                if(spindex == 0)
+                if (spindex == 0)
                 {
-                    if(strcmp(string0, "Cpus_allowed_list") == 0)
+                    if (strcmp(string0, "Cpus_allowed_list") == 0)
                     {
                         strcpy(pinfodisp->cpusallowed, string1);
                     }
 
-                    if(strcmp(string0, "Threads") == 0)
+                    if (strcmp(string0, "Threads") == 0)
                     {
                         pinfodisp->threads = atoi(string1);
                     }
                 }
 
-                if(strcmp(string0, "VmRSS") == 0)
+                if (strcmp(string0, "VmRSS") == 0)
                 {
                     pinfodisp->VmRSSarray[spindex] = atol(string1);
                 }
 
-                if(strcmp(string0, "nonvoluntary_ctxt_switches") == 0)
+                if (strcmp(string0, "nonvoluntary_ctxt_switches") == 0)
                 {
                     pinfodisp->ctxtsw_nonvoluntary[spindex] = atoi(string1);
                 }
-                if(strcmp(string0, "voluntary_ctxt_switches") == 0)
+                if (strcmp(string0, "voluntary_ctxt_switches") == 0)
                 {
                     pinfodisp->ctxtsw_voluntary[spindex] = atoi(string1);
                 }
@@ -1869,7 +1655,7 @@ static int PIDcollectSystemInfo(PROCESSINFODISP *pinfodisp, int level)
         }
 
         fclose(fp);
-        if(line)
+        if (line)
         {
             free(line);
         }
@@ -1880,18 +1666,13 @@ static int PIDcollectSystemInfo(PROCESSINFODISP *pinfodisp, int level)
         tdiff = timespec_diff(t1, t2);
         scantime_status += 1.0 * tdiff.tv_sec + 1.0e-9 * tdiff.tv_nsec;
 
-
-
-
-
         // read /proc/PID/stat
         clock_gettime(CLOCK_REALTIME, &t1);
         WRITE_FULLFILENAME(fname, "/proc/%d/stat", PID);
 
-        int           stat_pid;       // (1) The process ID.
-        char
-        stat_comm[20];  // (2) The filename of the executable, in parentheses.
-        char          stat_state;     // (3)
+        int stat_pid;       // (1) The process ID.
+        char stat_comm[20]; // (2) The filename of the executable, in parentheses.
+        char stat_state;    // (3)
         /* One of the following characters, indicating process state:
                             R  Running
                             S  Sleeping in an interruptible wait
@@ -1907,31 +1688,27 @@ static int PIDcollectSystemInfo(PROCESSINFODISP *pinfodisp, int level)
                             W  Waking (Linux 2.6.33 to 3.13 only)
                             P  Parked (Linux 3.9 to 3.13 only)
                     */
-        int           stat_ppid;      // (4) The PID of the parent of this process.
-        int           stat_pgrp;      // (5) The process group ID of the process
-        int           stat_session;   // (6) The session ID of the process
-        int           stat_tty_nr;    // (7) The controlling terminal of the process
-        int
-        stat_tpgid;     // (8) The ID of the foreground process group of the controlling terminal of the process
-        unsigned int  stat_flags;     // (9) The kernel flags word of the process
-        unsigned long
-        stat_minflt;    // (10) The number of minor faults the process has made which have not required loading a memory page from disk
-        unsigned long
-        stat_cminflt;   // (11) The number of minor faults that the process's waited-for children have made
+        int stat_ppid;    // (4) The PID of the parent of this process.
+        int stat_pgrp;    // (5) The process group ID of the process
+        int stat_session; // (6) The session ID of the process
+        int stat_tty_nr;  // (7) The controlling terminal of the process
+        int stat_tpgid;   // (8) The ID of the foreground process group of the controlling terminal of the process
+        unsigned int stat_flags; // (9) The kernel flags word of the process
         unsigned long
-        stat_majflt;    // (12) The number of major faults the process has made which have required loading a memory page from disk
+            stat_minflt; // (10) The number of minor faults the process has made which have not required loading a memory page from disk
+        unsigned long stat_cminflt; // (11) The number of minor faults that the process's waited-for children have made
         unsigned long
-        stat_cmajflt;   // (13) The number of major faults that the process's waited-for children have made
+            stat_majflt; // (12) The number of major faults the process has made which have required loading a memory page from disk
+        unsigned long stat_cmajflt; // (13) The number of major faults that the process's waited-for children have made
         unsigned long
-        stat_utime;     // (14) Amount of time that this process has been scheduled in user mode, measured in clock ticks (divide by sysconf(_SC_CLK_TCK)).
+            stat_utime; // (14) Amount of time that this process has been scheduled in user mode, measured in clock ticks (divide by sysconf(_SC_CLK_TCK)).
         unsigned long
-        stat_stime;     // (15) Amount of time that this process has been scheduled in kernel mode, measured in clock ticks
+            stat_stime; // (15) Amount of time that this process has been scheduled in kernel mode, measured in clock ticks
         long
-        stat_cutime;       // (16) Amount of time that this process's waited-for children have been scheduled in user mode, measured in clock ticks
+            stat_cutime; // (16) Amount of time that this process's waited-for children have been scheduled in user mode, measured in clock ticks
         long
-        stat_cstime;       // (17) Amount of time that this process's waited-for children have been scheduled in kernel mode, measured in clock ticks
-        long
-        stat_priority;     // (18) (Explanation for Linux 2.6) For processes running a
+            stat_cstime; // (17) Amount of time that this process's waited-for children have been scheduled in kernel mode, measured in clock ticks
+        long stat_priority; // (18) (Explanation for Linux 2.6) For processes running a
         /*                  real-time scheduling policy (policy below; see
                             sched_setscheduler(2)), this is the negated schedul‐
                             ing priority, minus one; that is, a number in the
@@ -1946,135 +1723,80 @@ static int PIDcollectSystemInfo(PROCESSINFODISP *pinfodisp, int level)
                             Before Linux 2.6, this was a scaled value based on
                             the scheduler weighting given to this process.*/
         long
-        stat_nice;         // (19) The nice value (see setpriority(2)), a value in the range 19 (low priority) to -20 (high priority)
-        long          stat_num_threads;  // (20) Number of threads in this process
-        long          stat_itrealvalue;  // (21) hard coded as 0
-        unsigned long long
-        stat_starttime; // (22) The time the process started after system boot in clock ticks
-        unsigned long stat_vsize;        // (23)  Virtual memory size in bytes
-        long
-        stat_rss;          // (24) Resident Set Size: number of pages the process has in real memory
-        unsigned long
-        stat_rsslim;       // (25) Current soft limit in bytes on the rss of the process
-        unsigned long
-        stat_startcode;    // (26) The address above which program text can run
-        unsigned long
-        stat_endcode;      // (27) The address below which program text can run
-        unsigned long
-        stat_startstack;   // (28) The address of the start (i.e., bottom) of the stack
-        unsigned long
-        stat_kstkesp;      // (29) The current value of ESP (stack pointer), as found in the kernel stack page for the process
-        unsigned long stat_kstkeip;      // (30) The current EIP (instruction pointer)
-        unsigned long
-        stat_signal;       // (31) The bitmap of pending signals, displayed as a decimal number.  Obsolete, because it does not provide information on real-time signals; use /proc/[pid]/status instead
+            stat_nice; // (19) The nice value (see setpriority(2)), a value in the range 19 (low priority) to -20 (high priority)
+        long stat_num_threads;             // (20) Number of threads in this process
+        long stat_itrealvalue;             // (21) hard coded as 0
+        unsigned long long stat_starttime; // (22) The time the process started after system boot in clock ticks
+        unsigned long stat_vsize;          // (23)  Virtual memory size in bytes
+        long stat_rss;                     // (24) Resident Set Size: number of pages the process has in real memory
+        unsigned long stat_rsslim;         // (25) Current soft limit in bytes on the rss of the process
+        unsigned long stat_startcode;      // (26) The address above which program text can run
+        unsigned long stat_endcode;        // (27) The address below which program text can run
+        unsigned long stat_startstack;     // (28) The address of the start (i.e., bottom) of the stack
         unsigned long
-        stat_blocked;      // (32) The bitmap of blocked signals, displayed as a decimal number.  Obsolete, because it does not provide information on real-time signals; use /proc/[pid]/status instead.
+            stat_kstkesp; // (29) The current value of ESP (stack pointer), as found in the kernel stack page for the process
+        unsigned long stat_kstkeip; // (30) The current EIP (instruction pointer)
         unsigned long
-        stat_sigignore;    // (33) The bitmap of ignored signals, displayed as a decimal number.  Obsolete, because it does not provide information on real-time signals; use /proc/[pid]/status instead.
+            stat_signal; // (31) The bitmap of pending signals, displayed as a decimal number.  Obsolete, because it does not provide information on real-time signals; use /proc/[pid]/status instead
         unsigned long
-        stat_sigcatch;     // (34) The bitmap of ignored signals, displayed as a decimal number.  Obsolete, because it does not provide information on real-time signals; use /proc/[pid]/status instead.
+            stat_blocked; // (32) The bitmap of blocked signals, displayed as a decimal number.  Obsolete, because it does not provide information on real-time signals; use /proc/[pid]/status instead.
         unsigned long
-        stat_wchan;        // (35) This is the "channel" in which the process is waiting.  It is the address of a location in the kernel where the process is sleeping.  The corresponding symbolic name can be found in /proc/[pid]/wchan.
+            stat_sigignore; // (33) The bitmap of ignored signals, displayed as a decimal number.  Obsolete, because it does not provide information on real-time signals; use /proc/[pid]/status instead.
         unsigned long
-        stat_nswap;        // (36) Number of pages swapped (not maintained)
+            stat_sigcatch; // (34) The bitmap of ignored signals, displayed as a decimal number.  Obsolete, because it does not provide information on real-time signals; use /proc/[pid]/status instead.
         unsigned long
-        stat_cnswap;       // (37) Cumulative nswap for child processes (not maintained)
-        int           stat_exit_signal;  // (38) Signal to be sent to parent when we die
-        int           stat_processor;    // (39) CPU number last executed on
+            stat_wchan; // (35) This is the "channel" in which the process is waiting.  It is the address of a location in the kernel where the process is sleeping.  The corresponding symbolic name can be found in /proc/[pid]/wchan.
+        unsigned long stat_nswap;  // (36) Number of pages swapped (not maintained)
+        unsigned long stat_cnswap; // (37) Cumulative nswap for child processes (not maintained)
+        int stat_exit_signal;      // (38) Signal to be sent to parent when we die
+        int stat_processor;        // (39) CPU number last executed on
         unsigned int
-        stat_rt_priority;  // (40) Real-time scheduling priority, a number in the range 1 to 99 for processes scheduled under a real-time policy, or 0, for non-real-time processes (see  sched_setscheduler(2)).
-        unsigned int
-        stat_policy;       // (41) Scheduling policy (see sched_setscheduler(2))
-        unsigned long long
-        stat_delayacct_blkio_ticks; // (42) Aggregated block I/O delays, measured in clock ticks
+            stat_rt_priority; // (40) Real-time scheduling priority, a number in the range 1 to 99 for processes scheduled under a real-time policy, or 0, for non-real-time processes (see  sched_setscheduler(2)).
+        unsigned int stat_policy;                      // (41) Scheduling policy (see sched_setscheduler(2))
+        unsigned long long stat_delayacct_blkio_ticks; // (42) Aggregated block I/O delays, measured in clock ticks
         unsigned long
-        stat_guest_time;   // (43) Guest time of the process (time spent running a virtual CPU for a guest operating system), measured in clock ticks
+            stat_guest_time; // (43) Guest time of the process (time spent running a virtual CPU for a guest operating system), measured in clock ticks
         long
-        stat_cguest_time;  // (44) Guest time of the process's children, measured in clock ticks (divide by sysconf(_SC_CLK_TCK)).
-        unsigned long
-        stat_start_data;   // (45) Address above which program initialized and uninitialized (BSS) data are placed
-        unsigned long
-        stat_end_data;     // (46) ddress below which program initialized and uninitialized (BSS) data are placed
-        unsigned long
-        stat_start_brk;    // (47) Address above which program heap can be expanded with brk(2)
+            stat_cguest_time; // (44) Guest time of the process's children, measured in clock ticks (divide by sysconf(_SC_CLK_TCK)).
         unsigned long
-        stat_arg_start;    // (48) Address above which program command-line arguments (argv) are placed
+            stat_start_data; // (45) Address above which program initialized and uninitialized (BSS) data are placed
         unsigned long
-        stat_arg_end;      // (49) Address below program command-line arguments (argv) are placed
-        unsigned long
-        stat_env_start;    // (50) Address above which program environment is placed
-        unsigned long
-        stat_env_end;      // (51) Address below which program environment is placed
-        long
-        stat_exit_code;    // (52) The thread's exit status in the form reported by waitpid(2)
-
-
-
-
+            stat_end_data; // (46) ddress below which program initialized and uninitialized (BSS) data are placed
+        unsigned long stat_start_brk; // (47) Address above which program heap can be expanded with brk(2)
+        unsigned long stat_arg_start; // (48) Address above which program command-line arguments (argv) are placed
+        unsigned long stat_arg_end;   // (49) Address below program command-line arguments (argv) are placed
+        unsigned long stat_env_start; // (50) Address above which program environment is placed
+        unsigned long stat_env_end;   // (51) Address below which program environment is placed
+        long stat_exit_code;          // (52) The thread's exit status in the form reported by waitpid(2)
 
         fp = fopen(fname, "r");
         int Nfields;
-        if(fp == NULL)
+        if (fp == NULL)
         {
             return -1;
         }
 
-        Nfields = fscanf(fp,
-                         "%d %s %c %d %d %d %d %d %u %lu %lu %lu %lu %lu %lu %ld %ld %ld %ld %ld %ld %llu %lu %ld %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %d %d %u %u %llu %lu %ld %lu %lu %lu %lu %lu %lu %lu %ld\n",
-                         &stat_pid,      //  1
-                         stat_comm,
-                         &stat_state,
-                         &stat_ppid,
-                         &stat_pgrp,
-                         &stat_session,
-                         &stat_tty_nr,
-                         &stat_tpgid,
-                         &stat_flags,
-                         &stat_minflt,   //  10
-                         &stat_cminflt,
-                         &stat_majflt,
-                         &stat_cmajflt,
-                         &stat_utime,
-                         &stat_stime,
-                         &stat_cutime,
-                         &stat_cstime,
-                         &stat_priority,
-                         &stat_nice,
-                         &stat_num_threads,  // 20
-                         &stat_itrealvalue,
-                         &stat_starttime,
-                         &stat_vsize,
-                         &stat_rss,
-                         &stat_rsslim,
-                         &stat_startcode,
-                         &stat_endcode,
-                         &stat_startstack,
-                         &stat_kstkesp,
-                         &stat_kstkeip,  // 30
-                         &stat_signal,
-                         &stat_blocked,
-                         &stat_sigignore,
-                         &stat_sigcatch,
-                         &stat_wchan,
-                         &stat_nswap,
-                         &stat_cnswap,
-                         &stat_exit_signal,
-                         &stat_processor,
-                         &stat_rt_priority,  // 40
-                         &stat_policy,
-                         &stat_delayacct_blkio_ticks,
-                         &stat_guest_time,
-                         &stat_cguest_time,
-                         &stat_start_data,
-                         &stat_end_data,
-                         &stat_start_brk,
-                         &stat_arg_start,
-                         &stat_arg_end,
-                         &stat_env_start,   // 50
-                         &stat_env_end,
-                         &stat_exit_code
-                        );
-        if(Nfields != 52)
+        Nfields = fscanf(
+            fp,
+            "%d %s %c %d %d %d %d %d %u %lu %lu %lu %lu %lu %lu %ld %ld %ld %ld %ld %ld %llu %lu %ld %lu %lu %lu %lu "
+            "%lu %lu %lu %lu %lu %lu %lu %lu %lu %d %d %u %u %llu %lu %ld %lu %lu %lu %lu %lu %lu %lu %ld\n",
+            &stat_pid, //  1
+            stat_comm, &stat_state, &stat_ppid, &stat_pgrp, &stat_session, &stat_tty_nr, &stat_tpgid, &stat_flags,
+            &stat_minflt, //  10
+            &stat_cminflt, &stat_majflt, &stat_cmajflt, &stat_utime, &stat_stime, &stat_cutime, &stat_cstime,
+            &stat_priority, &stat_nice,
+            &stat_num_threads, // 20
+            &stat_itrealvalue, &stat_starttime, &stat_vsize, &stat_rss, &stat_rsslim, &stat_startcode, &stat_endcode,
+            &stat_startstack, &stat_kstkesp,
+            &stat_kstkeip, // 30
+            &stat_signal, &stat_blocked, &stat_sigignore, &stat_sigcatch, &stat_wchan, &stat_nswap, &stat_cnswap,
+            &stat_exit_signal, &stat_processor,
+            &stat_rt_priority, // 40
+            &stat_policy, &stat_delayacct_blkio_ticks, &stat_guest_time, &stat_cguest_time, &stat_start_data,
+            &stat_end_data, &stat_start_brk, &stat_arg_start, &stat_arg_end,
+            &stat_env_start, // 50
+            &stat_env_end, &stat_exit_code);
+        if (Nfields != 52)
         {
             PRINT_ERROR("fscanf returns value != 1");
             pinfodisp->processorarray[spindex] = stat_processor;
@@ -2098,18 +1820,11 @@ static int PIDcollectSystemInfo(PROCESSINFODISP *pinfodisp, int level)
     }
 #endif
 
-
     DEBUG_TRACEPOINT(" ");
 
     return 0;
-
 }
 
-
-
-
-
-
 /**
  * ## Purpose
  *
@@ -2132,32 +1847,29 @@ int processinfo_CPUsets_List(STRINGLISTENTRY *CPUsetList)
     char word1[200];
     int NBset = 0;
 
-
     char fname[STRINGMAXLEN_FILENAME];
-    WRITE_FILENAME(fname, "%s/.csetlist.%ld", SHAREDPROCDIR, (long) getpid());
+    WRITE_FILENAME(fname, "%s/.csetlist.%ld", SHAREDPROCDIR, (long)getpid());
 
-    EXECUTE_SYSTEM_COMMAND("cset set -l | awk '/root/{stop=1} stop==1{print $0}' > %s",
-                           fname);
+    EXECUTE_SYSTEM_COMMAND("cset set -l | awk '/root/{stop=1} stop==1{print $0}' > %s", fname);
 
     // first scan: get number of entries
     fp = fopen(fname, "r");
-    while(NBset < NBsetMax)
+    while (NBset < NBsetMax)
     {
-        if(fgets(line, 199, fp) == NULL)
+        if (fgets(line, 199, fp) == NULL)
         {
             break;
         }
         NBset++;
-//		printf("%3d: %s", NBset, line);
+        //		printf("%3d: %s", NBset, line);
     }
     fclose(fp);
 
-
     setindex = 0;
     fp = fopen(fname, "r");
-    while(1)
+    while (1)
     {
-        if(fgets(line, 199, fp) == NULL)
+        if (fgets(line, 199, fp) == NULL)
         {
             break;
         }
@@ -2173,10 +1885,6 @@ int processinfo_CPUsets_List(STRINGLISTENTRY *CPUsetList)
     return NBset;
 }
 
-
-
-
-
 int processinfo_SelectFromList(STRINGLISTENTRY *StringList, int NBelem)
 {
     int selected = 0;
@@ -2188,39 +1896,37 @@ int processinfo_SelectFromList(STRINGLISTENTRY *StringList, int NBelem)
 
     printf("%d entries in list:\n", NBelem);
     fflush(stdout);
-    for(i = 0; i < NBelem; i++)
+    for (i = 0; i < NBelem; i++)
     {
-        printf("   %3ld   : %16s   %s\n", i, StringList[i].name,
-               StringList[i].description);
+        printf("   %3ld   : %16s   %s\n", i, StringList[i].name, StringList[i].description);
         fflush(stdout);
     }
 
-
     inputOK = 0;
 
-    while(inputOK == 0)
+    while (inputOK == 0)
     {
         printf("\nEnter a number: ");
         fflush(stdout);
 
         int stringindex = 0;
         char c;
-        while(((c = getchar()) != 13) && (stringindex < strlenmax - 1))
+        while (((c = getchar()) != 13) && (stringindex < strlenmax - 1))
         {
             buff[stringindex] = c;
-            if(c == 127) // delete key
+            if (c == 127) // delete key
             {
                 putchar(0x8);
                 putchar(' ');
                 putchar(0x8);
-                stringindex --;
+                stringindex--;
             }
             else
             {
-                putchar(c);  // echo on screen
+                putchar(c); // echo on screen
                 stringindex++;
             }
-            if(stringindex < 0)
+            if (stringindex < 0)
             {
                 stringindex = 0;
             }
@@ -2229,7 +1935,7 @@ int processinfo_SelectFromList(STRINGLISTENTRY *StringList, int NBelem)
 
         selected = strtol(buff, &p, strlenmax);
 
-        if((selected < 0) || (selected > NBelem - 1))
+        if ((selected < 0) || (selected > NBelem - 1))
         {
             printf("\nError: number not valid. Must be >= 0 and < %d\n", NBelem);
             inputOK = 0;
@@ -2242,21 +1948,9 @@ int processinfo_SelectFromList(STRINGLISTENTRY *StringList, int NBelem)
 
     printf("Selected entry : %s\n", StringList[selected].name);
 
-
     return selected;
 }
 
-
-
-
-
-
-
-
-
-
-
-
 /**
  * ## Purpose
  *
@@ -2267,13 +1961,11 @@ int processinfo_SelectFromList(STRINGLISTENTRY *StringList, int NBelem)
  * Runs in background loop as thread initiated by processinfo_CTRL
  *
  */
-void *processinfo_scan(
-    void *thptr
-)
+void *processinfo_scan(void *thptr)
 {
     PROCINFOPROC *pinfop;
 
-    pinfop = (PROCINFOPROC *) thptr;
+    pinfop = (PROCINFOPROC *)thptr;
 
     long pindex;
     long pindexdisp;
@@ -2281,21 +1973,20 @@ void *processinfo_scan(
     pinfop->loopcnt = 0;
 
     // timing
-    static int       firstIter = 1;
-    static struct    timespec t0;
-    struct timespec  t1;
-    double           tdiffv;
-    struct timespec  tdiff;
+    static int firstIter = 1;
+    static struct timespec t0;
+    struct timespec t1;
+    double tdiffv;
+    struct timespec tdiff;
 
-
-    char  procdname[200];
+    char procdname[200];
     processinfo_procdirname(procdname);
 
     pinfop->scanPID = getpid();
 
     pinfop->scandebugline = __LINE__;
 
-    while(pinfop->loop == 1)
+    while (pinfop->loop == 1)
     {
         DEBUG_TRACEPOINT(" ");
 
@@ -2305,7 +1996,7 @@ void *processinfo_scan(
 
         // timing measurement
         clock_gettime(CLOCK_REALTIME, &t1);
-        if(firstIter == 1)
+        if (firstIter == 1)
         {
             tdiffv = 0.1;
             firstIter = 0;
@@ -2320,19 +2011,17 @@ void *processinfo_scan(
 
         DEBUG_TRACEPOINT(" ");
 
-
-
         pinfop->scandebugline = __LINE__;
 
-        pinfop->SCANBLOCK_requested = 1;  // request scan
+        pinfop->SCANBLOCK_requested = 1; // request scan
         //system("echo \"scanblock request write 1\" > steplog.sRQw1.txt");//TEST
 
-        while(pinfop->SCANBLOCK_OK == 0)    // wait for display to OK scan
+        while (pinfop->SCANBLOCK_OK == 0) // wait for display to OK scan
         {
             //system("echo \"scanblock OK read 0\" > steplog.sOKr0.txt");//TEST
             usleep(100);
             pinfop->scandebugline = __LINE__;
-            if(pinfop->loop == 0)
+            if (pinfop->loop == 0)
             {
                 int line = __LINE__;
                 pthread_exit(&line);
@@ -2350,14 +2039,14 @@ void *processinfo_scan(
 
         DEBUG_TRACEPOINT(" ");
 
-        for(pindex = 0; pindex < pinfop->NBpinfodisp; pindex++)
+        for (pindex = 0; pindex < pinfop->NBpinfodisp; pindex++)
         {
-            if(pinfop->loop == 1)
+            if (pinfop->loop == 1)
             {
 
                 DEBUG_TRACEPOINT("pindex %ld / %ld", pindex, pinfop->NBpinfodisp);
 
-                char SM_fname[STRINGMAXLEN_FULLFILENAME];    // shared memory file name
+                char SM_fname[STRINGMAXLEN_FULLFILENAME]; // shared memory file name
                 struct stat file_stat;
 
                 pinfop->scandebugline = __LINE__;
@@ -2365,37 +2054,33 @@ void *processinfo_scan(
                 DEBUG_TRACEPOINT("pindex %ld / %ld", pindex, pinfop->NBpinfodisp);
 
                 // SHOULD WE (RE)LOAD ?
-                if(pinfolist->active[pindex] == 0)   // inactive
+                if (pinfolist->active[pindex] == 0) // inactive
                 {
                     pinfop->updatearray[pindex] = 0;
                 }
 
-                if((pinfolist->active[pindex] == 1)
-                        || (pinfolist->active[pindex] == 2))   // active or crashed
+                if ((pinfolist->active[pindex] == 1) || (pinfolist->active[pindex] == 2)) // active or crashed
                 {
                     pinfop->updatearray[pindex] = 1;
-
                 }
                 //    if(pinfolist->active[pindex] == 2) // mmap crashed, file may still be present
                 //        updatearray[pindex] = 1;
 
-                if(pinfolist->active[pindex] == 3)   // file has gone away
+                if (pinfolist->active[pindex] == 3) // file has gone away
                 {
                     pinfop->updatearray[pindex] = 0;
                 }
 
                 DEBUG_TRACEPOINT(" ");
 
-
                 pinfop->scandebugline = __LINE__;
 
-
                 // check if process info file exists
-                WRITE_FULLFILENAME(SM_fname, "%s/proc.%s.%06d.shm", procdname,
-                                   pinfolist->pnamearray[pindex], (int) pinfolist->PIDarray[pindex]);
+                WRITE_FULLFILENAME(SM_fname, "%s/proc.%s.%06d.shm", procdname, pinfolist->pnamearray[pindex],
+                                   (int)pinfolist->PIDarray[pindex]);
 
                 // Does file exist ?
-                if(stat(SM_fname, &file_stat) == -1 && errno == ENOENT)
+                if (stat(SM_fname, &file_stat) == -1 && errno == ENOENT)
                 {
                     // if not, don't (re)load and remove from process info list
                     pinfolist->active[pindex] = 0;
@@ -2404,15 +2089,14 @@ void *processinfo_scan(
 
                 DEBUG_TRACEPOINT(" ");
 
-
-                if(pinfolist->active[pindex] == 1)
+                if (pinfolist->active[pindex] == 1)
                 {
                     // check if process still exists
                     struct stat sts;
                     char procfname[STRINGMAXLEN_FULLFILENAME];
 
-                    WRITE_FULLFILENAME(procfname, "/proc/%d", (int) pinfolist->PIDarray[pindex]);
-                    if(stat(procfname, &sts) == -1 && errno == ENOENT)
+                    WRITE_FULLFILENAME(procfname, "/proc/%d", (int)pinfolist->PIDarray[pindex]);
+                    if (stat(procfname, &sts) == -1 && errno == ENOENT)
                     {
                         // process doesn't exist -> flag as inactive
                         pinfolist->active[pindex] = 2;
@@ -2423,7 +2107,7 @@ void *processinfo_scan(
 
                 pinfop->scandebugline = __LINE__;
 
-                if((pindex < pinfop->NBpinfodisp) && (pinfop->updatearray[pindex] == 1))
+                if ((pindex < pinfop->NBpinfodisp) && (pinfop->updatearray[pindex] == 1))
                 {
                     // (RE)LOAD
                     //struct stat file_stat;
@@ -2431,21 +2115,18 @@ void *processinfo_scan(
                     DEBUG_TRACEPOINT(" ");
 
                     // if already mmapped, first unmap
-                    if(pinfop->pinfommapped[pindex] == 1)
+                    if (pinfop->pinfommapped[pindex] == 1)
                     {
                         processinfo_shm_close(pinfop->pinfoarray[pindex], pinfop->fdarray[pindex]);
                         pinfop->pinfommapped[pindex] = 0;
                     }
 
-
                     DEBUG_TRACEPOINT(" ");
 
-
                     // COLLECT INFORMATION FROM PROCESSINFO FILE
-                    pinfop->pinfoarray[pindex] = processinfo_shm_link(SM_fname,
-                                                 &pinfop->fdarray[pindex]);
+                    pinfop->pinfoarray[pindex] = processinfo_shm_link(SM_fname, &pinfop->fdarray[pindex]);
 
-                    if(pinfop->pinfoarray[pindex] == MAP_FAILED)
+                    if (pinfop->pinfoarray[pindex] == MAP_FAILED)
                     {
                         close(pinfop->fdarray[pindex]);
                         endwin();
@@ -2456,16 +2137,14 @@ void *processinfo_scan(
                     else
                     {
                         pinfop->pinfommapped[pindex] = 1;
-                        strncpy(pinfop->pinfodisp[pindex].name, pinfop->pinfoarray[pindex]->name,
-                                40 - 1);
+                        strncpy(pinfop->pinfodisp[pindex].name, pinfop->pinfoarray[pindex]->name, 40 - 1);
 
                         struct tm *createtm;
-                        createtm      = gmtime(&pinfop->pinfoarray[pindex]->createtime.tv_sec);
+                        createtm = gmtime(&pinfop->pinfoarray[pindex]->createtime.tv_sec);
                         pinfop->pinfodisp[pindex].createtime_hr = createtm->tm_hour;
                         pinfop->pinfodisp[pindex].createtime_min = createtm->tm_min;
                         pinfop->pinfodisp[pindex].createtime_sec = createtm->tm_sec;
-                        pinfop->pinfodisp[pindex].createtime_ns =
-                            pinfop->pinfoarray[pindex]->createtime.tv_nsec;
+                        pinfop->pinfodisp[pindex].createtime_ns = pinfop->pinfoarray[pindex]->createtime.tv_nsec;
 
                         pinfop->pinfodisp[pindex].loopcnt = pinfop->pinfoarray[pindex]->loopcnt;
                     }
@@ -2475,12 +2154,11 @@ void *processinfo_scan(
                     pinfop->pinfodisp[pindex].active = pinfolist->active[pindex];
                     pinfop->pinfodisp[pindex].PID = pinfolist->PIDarray[pindex];
 
-                    pinfop->pinfodisp[pindex].updatecnt ++;
+                    pinfop->pinfodisp[pindex].updatecnt++;
 
                     // pinfop->updatearray[pindex] == 0; // by default, no need to re-connect
 
                     DEBUG_TRACEPOINT(" ");
-
                 }
 
                 pinfop->scandebugline = __LINE__;
@@ -2492,7 +2170,6 @@ void *processinfo_scan(
             }
         }
 
-
         /** ### Build a time-sorted list of processes
           *
           *
@@ -2503,41 +2180,41 @@ void *processinfo_scan(
         DEBUG_TRACEPOINT(" ");
 
         pinfop->NBpindexActive = 0;
-        for(pindex = 0; pindex < PROCESSINFOLISTSIZE; pindex++)
-            if(pinfolist->active[pindex] != 0)
+        for (pindex = 0; pindex < PROCESSINFOLISTSIZE; pindex++)
+            if (pinfolist->active[pindex] != 0)
             {
                 pinfop->pindexActive[pinfop->NBpindexActive] = pindex;
                 pinfop->NBpindexActive++;
             }
 
-        if(pinfop->NBpindexActive > 0)
+        if (pinfop->NBpindexActive > 0)
         {
 
             double *timearray;
             long *indexarray;
-            timearray  = (double *) malloc(sizeof(double) * pinfop->NBpindexActive);
-            if(timearray == NULL)
+            timearray = (double *)malloc(sizeof(double) * pinfop->NBpindexActive);
+            if (timearray == NULL)
             {
                 PRINT_ERROR("malloc returns NULL pointer");
                 abort();
             }
-            indexarray = (long *)   malloc(sizeof(long)  * pinfop->NBpindexActive);
-            if(indexarray == NULL)
+            indexarray = (long *)malloc(sizeof(long) * pinfop->NBpindexActive);
+            if (indexarray == NULL)
             {
                 PRINT_ERROR("malloc returns NULL pointer");
                 abort();
             }
             int listcnt = 0;
-            for(index = 0; index < pinfop->NBpindexActive; index++)
+            for (index = 0; index < pinfop->NBpindexActive; index++)
             {
                 pindex = pinfop->pindexActive[index];
-                if(pinfop->pinfommapped[pindex] == 1)
+                if (pinfop->pinfommapped[pindex] == 1)
                 {
                     indexarray[index] = pindex;
                     // minus sign for most recent first
                     //TUI_printfw("index  %ld  ->  pindex  %ld\n", index, pindex);
-                    timearray[index] = -1.0 * pinfop->pinfoarray[pindex]->createtime.tv_sec - 1.0e-9
-                                       * pinfop->pinfoarray[pindex]->createtime.tv_nsec;
+                    timearray[index] = -1.0 * pinfop->pinfoarray[pindex]->createtime.tv_sec -
+                                       1.0e-9 * pinfop->pinfoarray[pindex]->createtime.tv_nsec;
                     listcnt++;
                 }
             }
@@ -2546,7 +2223,7 @@ void *processinfo_scan(
             pinfop->NBpindexActive = listcnt;
             quick_sort2l_double(timearray, indexarray, pinfop->NBpindexActive);
 
-            for(index = 0; index < pinfop->NBpindexActive; index++)
+            for (index = 0; index < pinfop->NBpindexActive; index++)
             {
                 pinfop->sorted_pindex_time[index] = indexarray[index];
             }
@@ -2555,7 +2232,6 @@ void *processinfo_scan(
 
             free(timearray);
             free(indexarray);
-
         }
 
         pinfop->scandebugline = __LINE__;
@@ -2563,95 +2239,82 @@ void *processinfo_scan(
         pinfop->SCANBLOCK_OK = 0; // let display thread we're done
         //system("echo \"scanblock OK write 0\" > steplog.sOKw0.txt");//TEST
 
-
-
-
-
-
         pinfop->scandebugline = __LINE__;
 
         DEBUG_TRACEPOINT(" ");
 
-
-
-        if(pinfop->DisplayMode ==
-                PROCCTRL_DISPLAYMODE_RESOURCES)   // only compute of displayed processes
+        if (pinfop->DisplayMode == PROCCTRL_DISPLAYMODE_RESOURCES) // only compute of displayed processes
         {
             DEBUG_TRACEPOINT(" ");
             pinfop->scandebugline = __LINE__;
             GetCPUloads(pinfop);
             pinfop->scandebugline = __LINE__;
             // collect required info for display
-            for(pindexdisp = 0; pindexdisp < pinfop->NBpinfodisp ; pindexdisp++)
+            for (pindexdisp = 0; pindexdisp < pinfop->NBpinfodisp; pindexdisp++)
             {
-                if(pinfop->loop == 1)
+                if (pinfop->loop == 1)
                 {
                     DEBUG_TRACEPOINT(" ");
 
-                    if(pinfolist->active[pindexdisp] != 0)
+                    if (pinfolist->active[pindexdisp] != 0)
                     {
                         pinfop->scandebugline = __LINE__;
 
-                        if(pinfop->pinfodisp[pindexdisp].NBsubprocesses !=
-                                0)   // pinfop->pinfodisp[pindex].NBsubprocesses should never be zero - should be at least 1 (for main process)
+                        if (pinfop->pinfodisp[pindexdisp].NBsubprocesses !=
+                            0) // pinfop->pinfodisp[pindex].NBsubprocesses should never be zero - should be at least 1 (for main process)
                         {
 
                             int spindex; // sub process index, 0 for main
 
-                            if(pinfop->psysinfostatus[pindexdisp] != -1)
+                            if (pinfop->psysinfostatus[pindexdisp] != -1)
                             {
-                                for(spindex = 0; spindex < pinfop->pinfodisp[pindexdisp].NBsubprocesses;
-                                        spindex++)
+                                for (spindex = 0; spindex < pinfop->pinfodisp[pindexdisp].NBsubprocesses; spindex++)
                                 {
                                     // place info in subprocess arrays
                                     pinfop->pinfodisp[pindexdisp].sampletimearray_prev[spindex] =
                                         pinfop->pinfodisp[pindexdisp].sampletimearray[spindex];
                                     // Context Switches
 
-                                    pinfop->pinfodisp[pindexdisp].ctxtsw_voluntary_prev[spindex]    =
+                                    pinfop->pinfodisp[pindexdisp].ctxtsw_voluntary_prev[spindex] =
                                         pinfop->pinfodisp[pindexdisp].ctxtsw_voluntary[spindex];
                                     pinfop->pinfodisp[pindexdisp].ctxtsw_nonvoluntary_prev[spindex] =
                                         pinfop->pinfodisp[pindexdisp].ctxtsw_nonvoluntary[spindex];
 
-
                                     // CPU use
                                     pinfop->pinfodisp[pindexdisp].cpuloadcntarray_prev[spindex] =
                                         pinfop->pinfodisp[pindexdisp].cpuloadcntarray[spindex];
-
                                 }
                             }
 
-
                             pinfop->scandebugline = __LINE__;
 
-                            pinfop->psysinfostatus[pindex] = PIDcollectSystemInfo(&
-                                                             (pinfop->pinfodisp[pindexdisp]), 0);
+                            pinfop->psysinfostatus[pindex] = PIDcollectSystemInfo(&(pinfop->pinfodisp[pindexdisp]), 0);
 
-                            if(pinfop->psysinfostatus[pindexdisp] != -1)
+                            if (pinfop->psysinfostatus[pindexdisp] != -1)
                             {
                                 char cpuliststring[200];
                                 char cpustring[16];
 
-                                for(spindex = 0; spindex < pinfop->pinfodisp[pindexdisp].NBsubprocesses;
-                                        spindex++)
+                                for (spindex = 0; spindex < pinfop->pinfodisp[pindexdisp].NBsubprocesses; spindex++)
                                 {
-                                    if(pinfop->pinfodisp[pindexdisp].sampletimearray[spindex] !=
-                                            pinfop->pinfodisp[pindexdisp].sampletimearray_prev[spindex])
+                                    if (pinfop->pinfodisp[pindexdisp].sampletimearray[spindex] !=
+                                        pinfop->pinfodisp[pindexdisp].sampletimearray_prev[spindex])
                                     {
                                         // get CPU and MEM load
 
                                         // THIS DOES NOT WORK ON TICKLESS KERNEL
                                         pinfop->pinfodisp[pindexdisp].subprocCPUloadarray[spindex] =
-                                            100.0 * (
-                                                (1.0 * pinfop->pinfodisp[pindexdisp].cpuloadcntarray[spindex]
-                                                 - pinfop->pinfodisp[pindexdisp].cpuloadcntarray_prev[spindex])
-                                                / sysconf(_SC_CLK_TCK))
-                                            / (pinfop->pinfodisp[pindexdisp].sampletimearray[spindex]
-                                               - pinfop->pinfodisp[pindexdisp].sampletimearray_prev[spindex]);
+                                            100.0 *
+                                            ((1.0 * pinfop->pinfodisp[pindexdisp].cpuloadcntarray[spindex] -
+                                              pinfop->pinfodisp[pindexdisp].cpuloadcntarray_prev[spindex]) /
+                                             sysconf(_SC_CLK_TCK)) /
+                                            (pinfop->pinfodisp[pindexdisp].sampletimearray[spindex] -
+                                             pinfop->pinfodisp[pindexdisp].sampletimearray_prev[spindex]);
 
                                         pinfop->pinfodisp[pindexdisp].subprocCPUloadarray_timeaveraged[spindex] =
-                                            0.9 * pinfop->pinfodisp[pindexdisp].subprocCPUloadarray_timeaveraged[spindex]
-                                            + 0.1 * pinfop->pinfodisp[pindexdisp].subprocCPUloadarray[spindex];
+                                            0.9 * pinfop->pinfodisp[pindexdisp]
+                                                      .subprocCPUloadarray_timeaveraged[spindex] +
+                                            0.1 * pinfop->pinfodisp[pindexdisp].subprocCPUloadarray[spindex];
                                     }
                                 }
 
@@ -2660,23 +2323,22 @@ void *processinfo_scan(
                                 pinfop->scandebugline = __LINE__;
 
                                 int cpu;
-                                for(cpu = 0; cpu < pinfop->NBcpus; cpu++)
+                                for (cpu = 0; cpu < pinfop->NBcpus; cpu++)
                                 {
                                     int cpuOK = 0;
                                     int cpumin, cpumax;
 
                                     sprintf(cpustring, ",%d,", pinfop->CPUids[cpu]);
-                                    if(strstr(cpuliststring, cpustring) != NULL)
+                                    if (strstr(cpuliststring, cpustring) != NULL)
                                     {
                                         cpuOK = 1;
                                     }
 
-
-                                    for(cpumin = 0; cpumin <= pinfop->CPUids[cpu]; cpumin++)
-                                        for(cpumax = pinfop->CPUids[cpu]; cpumax < pinfop->NBcpus; cpumax++)
+                                    for (cpumin = 0; cpumin <= pinfop->CPUids[cpu]; cpumin++)
+                                        for (cpumax = pinfop->CPUids[cpu]; cpumax < pinfop->NBcpus; cpumax++)
                                         {
                                             sprintf(cpustring, ",%d-%d,", cpumin, cpumax);
-                                            if(strstr(cpuliststring, cpustring) != NULL)
+                                            if (strstr(cpuliststring, cpustring) != NULL)
                                             {
                                                 cpuOK = 1;
                                             }
@@ -2684,9 +2346,7 @@ void *processinfo_scan(
                                     pinfop->pinfodisp[pindexdisp].cpuOKarray[cpu] = cpuOK;
                                 }
                             }
-
                         }
-
                     }
                 }
                 else
@@ -2701,30 +2361,26 @@ void *processinfo_scan(
 
         } // end of DisplayMode PROCCTRL_DISPLAYMODE_RESOURCES
 
-
         DEBUG_TRACEPOINT(" ");
 
-
         pinfop->loopcnt++;
 
-
         int loopcntiter = 0;
         int NBloopcntiter = 10;
-        while((pinfop->loop == 1) && (loopcntiter < NBloopcntiter))
+        while ((pinfop->loop == 1) && (loopcntiter < NBloopcntiter))
         {
             usleep(pinfop->twaitus / NBloopcntiter);
             loopcntiter++;
         }
 
-        if(pinfop->loop == 0)
+        if (pinfop->loop == 0)
         {
             int line = __LINE__;
             pthread_exit(&line);
         }
     }
 
-
-    if(pinfop->loop == 0)
+    if (pinfop->loop == 0)
     {
         int line = __LINE__;
         pthread_exit(&line);
@@ -2733,11 +2389,6 @@ void *processinfo_scan(
     return NULL;
 }
 
-
-
-
-
-
 void processinfo_CTRLscreen_atexit()
 {
     //echo();
@@ -2746,11 +2397,6 @@ void processinfo_CTRLscreen_atexit()
     printf("EXIT from processinfo_CTRLscreen at line %d\n", CTRLscreenExitLine);
 }
 
-
-
-
-
-
 /*
 void processinfo_CTRLscreen_handle_winch(int __attribute__((unused)) sig)
 {
@@ -2771,8 +2417,6 @@ void processinfo_CTRLscreen_handle_winch(int __attribute__((unused)) sig)
 }
 */
 
-
-
 /**
  * ## Purpose
  *
@@ -2789,14 +2433,14 @@ errno_t processinfo_CTRLscreen()
     long pindex, index;
 
     PROCINFOPROC
-    procinfoproc;  // Main structure - holds everything that needs to be shared with other functions and scan thread
+    procinfoproc; // Main structure - holds everything that needs to be shared with other functions and scan thread
     pthread_t threadscan;
 
     int cpusocket;
 
     char pselected_FILE[200];
     char pselected_FUNCTION[200];
-    int  pselected_LINE;
+    int pselected_LINE;
 
     // timers
     struct timespec t1loop;
@@ -2811,14 +2455,12 @@ errno_t processinfo_CTRLscreen()
     struct timespec t06loop;
     struct timespec t07loop;
 
-
     float frequ = 32.0; // Hz
-    char  monstring[200];
+    char monstring[200];
 
     // list of active indices
-    int   pindexActiveSelected;
-    int   pindexSelected;
-
+    int pindexActiveSelected;
+    int pindexSelected;
 
     int listindex;
 
@@ -2826,7 +2468,7 @@ errno_t processinfo_CTRLscreen()
 
     DEBUG_TRACEPOINT(" ");
 
-    char  procdname[200];
+    char procdname[200];
     processinfo_procdirname(procdname);
 
     processinfo_CatchSignals();
@@ -2846,27 +2488,26 @@ errno_t processinfo_CTRLscreen()
         setlocale(LC_ALL, "");
     */
 
-
     // initialize procinfoproc entries
     procinfoproc.loopcnt = 0;
-    for(pindex = 0; pindex < PROCESSINFOLISTSIZE; pindex++)
+    for (pindex = 0; pindex < PROCESSINFOLISTSIZE; pindex++)
     {
-        procinfoproc.pinfoarray[pindex]         = NULL;
-        procinfoproc.pinfommapped[pindex]       = 0; // 1 if mmapped, 0 otherwise
-        procinfoproc.PIDarray[pindex]           = 0; // used to track changes
-        procinfoproc.updatearray[pindex]        = 1; // initialize: load all
-        procinfoproc.fdarray[pindex]            = 0; // file descriptors
-        procinfoproc.loopcntarray[pindex]       = 0;
+        procinfoproc.pinfoarray[pindex] = NULL;
+        procinfoproc.pinfommapped[pindex] = 0; // 1 if mmapped, 0 otherwise
+        procinfoproc.PIDarray[pindex] = 0;     // used to track changes
+        procinfoproc.updatearray[pindex] = 1;  // initialize: load all
+        procinfoproc.fdarray[pindex] = 0;      // file descriptors
+        procinfoproc.loopcntarray[pindex] = 0;
         procinfoproc.loopcntoffsetarray[pindex] = 0;
-        procinfoproc.selectedarray[pindex]      = 0; // initially not selected
+        procinfoproc.selectedarray[pindex] = 0; // initially not selected
         procinfoproc.sorted_pindex_time[pindex] = pindex;
 
-        procinfoproc.pindexActive[pindex]       = 0;
-        procinfoproc.psysinfostatus[pindex]     = 0;
+        procinfoproc.pindexActive[pindex] = 0;
+        procinfoproc.psysinfostatus[pindex] = 0;
     }
-    procinfoproc.NBcpus      = 1;
+    procinfoproc.NBcpus = 1;
     procinfoproc.NBcpusocket = 1;
-    for(int cpu = 0; cpu < MAXNBCPU; cpu++)
+    for (int cpu = 0; cpu < MAXNBCPU; cpu++)
     {
 
         procinfoproc.CPUload[cpu] = 0.0;
@@ -2881,16 +2522,15 @@ errno_t processinfo_CTRLscreen()
         procinfoproc.CPUcnt7[cpu] = 0;
         procinfoproc.CPUcnt8[cpu] = 0;
 
-        procinfoproc.CPUids[cpu]  = cpu;
+        procinfoproc.CPUids[cpu] = cpu;
         procinfoproc.CPUphys[cpu] = 0;
         procinfoproc.CPUpcnt[cpu] = 0;
-
     }
 
     STRINGLISTENTRY *CPUsetList;
     int NBCPUset;
     CPUsetList = (STRINGLISTENTRY *)malloc(sizeof(STRINGLISTENTRY) * 1000);
-    if(CPUsetList == NULL)
+    if (CPUsetList == NULL)
     {
         PRINT_ERROR("malloc returns NULL pointer");
         abort();
@@ -2900,32 +2540,28 @@ errno_t processinfo_CTRLscreen()
 
     // Create / read process list
     //
-    if(processinfo_shm_list_create() == 0)
+    if (processinfo_shm_list_create() == 0)
     {
         printf("==== NO PROCESS TO DISPLAY ====\n");
         //return(0);
     }
 
-
-
     // copy pointer
     procinfoproc.pinfolist = pinfolist;
 
     procinfoproc.NBcpus = GetNumberCPUs(&procinfoproc);
     GetCPUloads(&procinfoproc);
 
-
-
     // default: use ncurses
     TUI_set_screenprintmode(SCREENPRINT_NCURSES);
 
-    if(getenv("MILK_TUIPRINT_STDIO"))
+    if (getenv("MILK_TUIPRINT_STDIO"))
     {
         // use stdio instead of ncurses
         TUI_set_screenprintmode(SCREENPRINT_STDIO);
     }
 
-    if(getenv("MILK_TUIPRINT_NONE"))
+    if (getenv("MILK_TUIPRINT_NONE"))
     {
         TUI_set_screenprintmode(SCREENPRINT_NONE);
     }
@@ -2934,33 +2570,30 @@ errno_t processinfo_CTRLscreen()
     // INITIALIZE ncurses
     //initncurses();
 
-
     //atexit( processinfo_CTRLscreen_atexit );
 
     // set print string lengths
     char string[200]; // string to be printed. Used to keep track of total length
 
-    int pstrlen_status  = 10;
-    int pstrlen_pid     =  7;
-    int pstrlen_pname   = 25;
-    int pstrlen_state   =  5;
+    int pstrlen_status = 10;
+    int pstrlen_pid = 7;
+    int pstrlen_pname = 25;
+    int pstrlen_state = 5;
     // Clevel :  2
     // tstart : 12
-    int pstrlen_tmux    = 16;
+    int pstrlen_tmux = 16;
     int pstrlen_loopcnt = 10;
-    int pstrlen_descr   = 25;
+    int pstrlen_descr = 25;
 
-    int pstrlen_msg     = 35;
+    int pstrlen_msg = 35;
 
-    int pstrlen_cset    = 10;
+    int pstrlen_cset = 10;
 
-    int pstrlen_inode     = 10;
+    int pstrlen_inode = 10;
     int pstrlen_trigstreamname = 16;
-    int pstrlen_missedfr  = 4;
+    int pstrlen_missedfr = 4;
     int pstrlen_missedfrc = 12;
-    int pstrlen_tocnt     = 10;
-
-
+    int pstrlen_tocnt = 10;
 
     clear();
 
@@ -2974,74 +2607,65 @@ errno_t processinfo_CTRLscreen()
     dup2(newstderr, STDERR_FILENO);
     close(newstderr);
 
-
-
-
     procinfoproc.NBpinfodisp = wrow - 5;
-    procinfoproc.pinfodisp = (PROCESSINFODISP *) malloc(sizeof(
-                                 PROCESSINFODISP) * procinfoproc.NBpinfodisp);
-    if(procinfoproc.pinfodisp == NULL)
+    procinfoproc.pinfodisp = (PROCESSINFODISP *)malloc(sizeof(PROCESSINFODISP) * procinfoproc.NBpinfodisp);
+    if (procinfoproc.pinfodisp == NULL)
     {
         PRINT_ERROR("malloc returns NULL pointer");
         abort();
     }
 
-    for(pindex = 0; pindex < procinfoproc.NBpinfodisp; pindex++)
+    for (pindex = 0; pindex < procinfoproc.NBpinfodisp; pindex++)
     {
-        procinfoproc.pinfodisp[pindex].NBsubprocesses =
-            1;  // by default, each process is assumed to be single-threaded
+        procinfoproc.pinfodisp[pindex].NBsubprocesses = 1; // by default, each process is assumed to be single-threaded
 
-        procinfoproc.pinfodisp[pindex].active         = 0;
-        procinfoproc.pinfodisp[pindex].PID            = 0;
+        procinfoproc.pinfodisp[pindex].active = 0;
+        procinfoproc.pinfodisp[pindex].PID = 0;
         strcpy(procinfoproc.pinfodisp[pindex].name, "null");
-        procinfoproc.pinfodisp[pindex].updatecnt      = 0;
+        procinfoproc.pinfodisp[pindex].updatecnt = 0;
 
-        procinfoproc.pinfodisp[pindex].loopcnt         = 0;
-        procinfoproc.pinfodisp[pindex].loopstat        = 0;
+        procinfoproc.pinfodisp[pindex].loopcnt = 0;
+        procinfoproc.pinfodisp[pindex].loopstat = 0;
 
-        procinfoproc.pinfodisp[pindex].createtime_hr   = 0;
-        procinfoproc.pinfodisp[pindex].createtime_min  = 0;
-        procinfoproc.pinfodisp[pindex].createtime_sec  = 0;
-        procinfoproc.pinfodisp[pindex].createtime_ns   = 0;
+        procinfoproc.pinfodisp[pindex].createtime_hr = 0;
+        procinfoproc.pinfodisp[pindex].createtime_min = 0;
+        procinfoproc.pinfodisp[pindex].createtime_sec = 0;
+        procinfoproc.pinfodisp[pindex].createtime_ns = 0;
 
         strcpy(procinfoproc.pinfodisp[pindex].cpuset, "null");
         strcpy(procinfoproc.pinfodisp[pindex].cpusallowed, "null");
-        for(int cpu = 0; cpu < MAXNBCPU; cpu++)
+        for (int cpu = 0; cpu < MAXNBCPU; cpu++)
         {
             procinfoproc.pinfodisp[pindex].cpuOKarray[cpu] = 0;
         }
-        procinfoproc.pinfodisp[pindex].threads         = 0;
-
-
-        procinfoproc.pinfodisp[pindex].rt_priority     = 0;
-        procinfoproc.pinfodisp[pindex].memload         = 0.0;
+        procinfoproc.pinfodisp[pindex].threads = 0;
 
+        procinfoproc.pinfodisp[pindex].rt_priority = 0;
+        procinfoproc.pinfodisp[pindex].memload = 0.0;
 
         strcpy(procinfoproc.pinfodisp[pindex].statusmsg, "");
         strcpy(procinfoproc.pinfodisp[pindex].tmuxname, "");
 
-
         procinfoproc.pinfodisp[pindex].NBsubprocesses = 1;
-        for(int spi = 0; spi < MAXNBSUBPROCESS; spi++)
+        for (int spi = 0; spi < MAXNBSUBPROCESS; spi++)
         {
-            procinfoproc.pinfodisp[pindex].sampletimearray[spi]          = 0.0;
-            procinfoproc.pinfodisp[pindex].sampletimearray_prev[spi]     = 0.0;
+            procinfoproc.pinfodisp[pindex].sampletimearray[spi] = 0.0;
+            procinfoproc.pinfodisp[pindex].sampletimearray_prev[spi] = 0.0;
 
-            procinfoproc.pinfodisp[pindex].ctxtsw_voluntary[spi]         = 0;
-            procinfoproc.pinfodisp[pindex].ctxtsw_nonvoluntary[spi]      = 0;
-            procinfoproc.pinfodisp[pindex].ctxtsw_voluntary_prev[spi]    = 0;
+            procinfoproc.pinfodisp[pindex].ctxtsw_voluntary[spi] = 0;
+            procinfoproc.pinfodisp[pindex].ctxtsw_nonvoluntary[spi] = 0;
+            procinfoproc.pinfodisp[pindex].ctxtsw_voluntary_prev[spi] = 0;
             procinfoproc.pinfodisp[pindex].ctxtsw_nonvoluntary_prev[spi] = 0;
 
-            procinfoproc.pinfodisp[pindex].cpuloadcntarray[spi]          = 0;
-            procinfoproc.pinfodisp[pindex].cpuloadcntarray_prev[spi]     = 0;
-            procinfoproc.pinfodisp[pindex].subprocCPUloadarray[spi]      = 0.0;
+            procinfoproc.pinfodisp[pindex].cpuloadcntarray[spi] = 0;
+            procinfoproc.pinfodisp[pindex].cpuloadcntarray_prev[spi] = 0;
+            procinfoproc.pinfodisp[pindex].subprocCPUloadarray[spi] = 0.0;
             procinfoproc.pinfodisp[pindex].subprocCPUloadarray_timeaveraged[spi] = 0.0;
 
-            procinfoproc.pinfodisp[pindex].VmRSSarray[spi]               = 0;
-            procinfoproc.pinfodisp[pindex].processorarray[spi]           = 0;
-
-            procinfoproc.pinfodisp[pindex].subprocPIDarray[spi]          = 0;
+            procinfoproc.pinfodisp[pindex].VmRSSarray[spi] = 0;
+            procinfoproc.pinfodisp[pindex].processorarray[spi] = 0;
 
+            procinfoproc.pinfodisp[pindex].subprocPIDarray[spi] = 0;
         }
     }
 
@@ -3058,53 +2682,45 @@ errno_t processinfo_CTRLscreen()
     procinfoproc.SCANBLOCK_requested = 0;
     procinfoproc.SCANBLOCK_OK = 0;
 
-    pthread_create(&threadscan, NULL, processinfo_scan, (void *) &procinfoproc);
-
-
-
+    pthread_create(&threadscan, NULL, processinfo_scan, (void *)&procinfoproc);
 
     // wait for first scan to be completed
     procinfoproc.SCANBLOCK_OK = 1;
-    while(procinfoproc.loopcnt < 1)
+    while (procinfoproc.loopcnt < 1)
     {
         //printf("procinfoproc.loopcnt  = %ld\n", (long) procinfoproc.loopcnt);
         usleep(10000);
     }
 
-
-
-
     int loopOK = 1;
     int freeze = 0;
     long cnt = 0;
     int MonMode = 0;
-    int TimeSorted =
-        1;  // by default, sort processes by start time (most recent at top)
+    int TimeSorted = 1; // by default, sort processes by start time (most recent at top)
     int dispindexMax = 0;
 
-
     clear();
     int Xexit = 0; // toggles to 1 when users types x
 
     pindexSelected = 0;
     int pindexSelectedOK = 0; // no process selected by cursor
 
-    while(loopOK == 1)
+    while (loopOK == 1)
     {
         int pid;
         //char command[200];
 
         DEBUG_TRACEPOINT(" ");
 
-        if(procinfoproc.SCANBLOCK_requested == 1)
+        if (procinfoproc.SCANBLOCK_requested == 1)
         {
             //system("echo \"scanblock request read 1\" > steplog.dQRr1.txt");//TEST
 
-            procinfoproc.SCANBLOCK_OK = 1;  // issue OK to scan thread
+            procinfoproc.SCANBLOCK_OK = 1; // issue OK to scan thread
             //system("echo \"scanblock OK write 1\" > steplog.dOKw1.txt");//TEST
 
             // wait for scan thread to have completed scan
-            while(procinfoproc.SCANBLOCK_OK == 1)
+            while (procinfoproc.SCANBLOCK_OK == 1)
             {
                 //system("echo \"scanblock OK read 1\" > steplog.dOKr1.txt");//TEST
                 usleep(100);
@@ -3114,7 +2730,6 @@ errno_t processinfo_CTRLscreen()
         //		else
         //			system("echo \"scanblock request read 0\" > steplog.dQRr0.txt");//TEST
 
-
         usleep((long)(1000000.0 / frequ));
         int ch = getch();
 
@@ -3130,8 +2745,7 @@ errno_t processinfo_CTRLscreen()
 
         DEBUG_TRACEPOINT(" ");
 
-
-        if(freeze == 0)
+        if (freeze == 0)
         {
             //attron(A_BOLD);
             sprintf(monstring, "Mode %d   PRESS x TO STOP MONITOR", MonMode);
@@ -3141,252 +2755,229 @@ errno_t processinfo_CTRLscreen()
         }
 
         int selectedOK = 0; // goes to 1 if at least one process is selected
-        switch(ch)
+        switch (ch)
         {
-            case 'f':     // Freeze screen (toggle)
-                if(freeze == 0)
-                {
-                    freeze = 1;
-                }
-                else
-                {
-                    freeze = 0;
-                }
-                break;
-
-            case 'x':     // Exit control screen
-                loopOK = 0;
-                Xexit = 1;
-                break;
-
-            case ' ':     // Mark current PID as selected (if none selected, other commands only apply to highlighted process)
-                pindex = pindexSelected;
-                if(procinfoproc.selectedarray[pindex] == 1)
-                {
-                    procinfoproc.selectedarray[pindex] = 0;
-                }
-                else
-                {
-                    procinfoproc.selectedarray[pindex] = 1;
-                }
-                break;
-
-            case 'u':    // undelect all
-                for(index = 0; index < procinfoproc.NBpindexActive; index++)
-                {
-                    pindex = procinfoproc.pindexActive[index];
-                    procinfoproc.selectedarray[pindex] = 0;
-                }
-                break;
-
-
-
-
-            case KEY_UP:
-                pindexActiveSelected --;
-                if(pindexActiveSelected < 0)
-                {
-                    pindexActiveSelected = 0;
-                }
-                if(TimeSorted == 0)
-                {
-                    pindexSelected = procinfoproc.pindexActive[pindexActiveSelected];
-                }
-                else
-                {
-                    pindexSelected = procinfoproc.sorted_pindex_time[pindexActiveSelected];
-                }
-                break;
-
-            case KEY_DOWN:
-                pindexActiveSelected ++;
-                if(pindexActiveSelected > procinfoproc.NBpindexActive - 1)
-                {
-                    pindexActiveSelected = procinfoproc.NBpindexActive - 1;
-                }
-                if(TimeSorted == 0)
-                {
-                    pindexSelected = procinfoproc.pindexActive[pindexActiveSelected];
-                }
-                else
-                {
-                    pindexSelected = procinfoproc.sorted_pindex_time[pindexActiveSelected];
-                }
-                break;
-
-
-            case KEY_RIGHT:
-                procinfoproc.DisplayDetailedMode = 1;
-                break;
+        case 'f': // Freeze screen (toggle)
+            if (freeze == 0)
+            {
+                freeze = 1;
+            }
+            else
+            {
+                freeze = 0;
+            }
+            break;
 
+        case 'x': // Exit control screen
+            loopOK = 0;
+            Xexit = 1;
+            break;
 
-            case KEY_LEFT:
-                procinfoproc.DisplayDetailedMode = 0;
-                break;
+        case ' ': // Mark current PID as selected (if none selected, other commands only apply to highlighted process)
+            pindex = pindexSelected;
+            if (procinfoproc.selectedarray[pindex] == 1)
+            {
+                procinfoproc.selectedarray[pindex] = 0;
+            }
+            else
+            {
+                procinfoproc.selectedarray[pindex] = 1;
+            }
+            break;
 
+        case 'u': // undelect all
+            for (index = 0; index < procinfoproc.NBpindexActive; index++)
+            {
+                pindex = procinfoproc.pindexActive[index];
+                procinfoproc.selectedarray[pindex] = 0;
+            }
+            break;
 
-            case KEY_PPAGE:
-                pindexActiveSelected -= 10;
-                if(pindexActiveSelected < 0)
-                {
-                    pindexActiveSelected = 0;
-                }
-                if(TimeSorted == 0)
-                {
-                    pindexSelected = procinfoproc.pindexActive[pindexActiveSelected];
-                }
-                else
-                {
-                    pindexSelected = procinfoproc.sorted_pindex_time[pindexActiveSelected];
-                }
-                break;
+        case KEY_UP:
+            pindexActiveSelected--;
+            if (pindexActiveSelected < 0)
+            {
+                pindexActiveSelected = 0;
+            }
+            if (TimeSorted == 0)
+            {
+                pindexSelected = procinfoproc.pindexActive[pindexActiveSelected];
+            }
+            else
+            {
+                pindexSelected = procinfoproc.sorted_pindex_time[pindexActiveSelected];
+            }
+            break;
 
-            case KEY_NPAGE:
-                pindexActiveSelected += 10;
-                if(pindexActiveSelected > procinfoproc.NBpindexActive - 1)
-                {
-                    pindexActiveSelected = procinfoproc.NBpindexActive - 1;
-                }
-                if(TimeSorted == 0)
-                {
-                    pindexSelected = procinfoproc.pindexActive[pindexActiveSelected];
-                }
-                else
-                {
-                    pindexSelected = procinfoproc.sorted_pindex_time[pindexActiveSelected];
-                }
-                break;
+        case KEY_DOWN:
+            pindexActiveSelected++;
+            if (pindexActiveSelected > procinfoproc.NBpindexActive - 1)
+            {
+                pindexActiveSelected = procinfoproc.NBpindexActive - 1;
+            }
+            if (TimeSorted == 0)
+            {
+                pindexSelected = procinfoproc.pindexActive[pindexActiveSelected];
+            }
+            else
+            {
+                pindexSelected = procinfoproc.sorted_pindex_time[pindexActiveSelected];
+            }
+            break;
 
+        case KEY_RIGHT:
+            procinfoproc.DisplayDetailedMode = 1;
+            break;
 
+        case KEY_LEFT:
+            procinfoproc.DisplayDetailedMode = 0;
+            break;
 
+        case KEY_PPAGE:
+            pindexActiveSelected -= 10;
+            if (pindexActiveSelected < 0)
+            {
+                pindexActiveSelected = 0;
+            }
+            if (TimeSorted == 0)
+            {
+                pindexSelected = procinfoproc.pindexActive[pindexActiveSelected];
+            }
+            else
+            {
+                pindexSelected = procinfoproc.sorted_pindex_time[pindexActiveSelected];
+            }
+            break;
 
+        case KEY_NPAGE:
+            pindexActiveSelected += 10;
+            if (pindexActiveSelected > procinfoproc.NBpindexActive - 1)
+            {
+                pindexActiveSelected = procinfoproc.NBpindexActive - 1;
+            }
+            if (TimeSorted == 0)
+            {
+                pindexSelected = procinfoproc.pindexActive[pindexActiveSelected];
+            }
+            else
+            {
+                pindexSelected = procinfoproc.sorted_pindex_time[pindexActiveSelected];
+            }
+            break;
 
-            case 'T':
-                for(index = 0; index < procinfoproc.NBpindexActive; index++)
-                {
-                    pindex = procinfoproc.pindexActive[index];
-                    if(procinfoproc.selectedarray[pindex] == 1)
-                    {
-                        selectedOK = 1;
-                        pid = pinfolist->PIDarray[pindex];
-                        kill(pid, SIGTERM);
-                    }
-                }
-                if((selectedOK == 0) && (pindexSelectedOK == 1))
+        case 'T':
+            for (index = 0; index < procinfoproc.NBpindexActive; index++)
+            {
+                pindex = procinfoproc.pindexActive[index];
+                if (procinfoproc.selectedarray[pindex] == 1)
                 {
-                    pindex = pindexSelected;
+                    selectedOK = 1;
                     pid = pinfolist->PIDarray[pindex];
                     kill(pid, SIGTERM);
                 }
-                break;
+            }
+            if ((selectedOK == 0) && (pindexSelectedOK == 1))
+            {
+                pindex = pindexSelected;
+                pid = pinfolist->PIDarray[pindex];
+                kill(pid, SIGTERM);
+            }
+            break;
 
-            case 'K':
-                for(index = 0; index < procinfoproc.NBpindexActive; index++)
-                {
-                    pindex = procinfoproc.pindexActive[index];
-                    if(procinfoproc.selectedarray[pindex] == 1)
-                    {
-                        selectedOK = 1;
-                        pid = pinfolist->PIDarray[pindex];
-                        kill(pid, SIGKILL);
-                    }
-                }
-                if((selectedOK == 0) && (pindexSelectedOK == 1))
+        case 'K':
+            for (index = 0; index < procinfoproc.NBpindexActive; index++)
+            {
+                pindex = procinfoproc.pindexActive[index];
+                if (procinfoproc.selectedarray[pindex] == 1)
                 {
-                    pindex = pindexSelected;
+                    selectedOK = 1;
                     pid = pinfolist->PIDarray[pindex];
                     kill(pid, SIGKILL);
                 }
-                break;
+            }
+            if ((selectedOK == 0) && (pindexSelectedOK == 1))
+            {
+                pindex = pindexSelected;
+                pid = pinfolist->PIDarray[pindex];
+                kill(pid, SIGKILL);
+            }
+            break;
 
-            case 'I':
-                for(index = 0; index < procinfoproc.NBpindexActive; index++)
-                {
-                    pindex = procinfoproc.pindexActive[index];
-                    if(procinfoproc.selectedarray[pindex] == 1)
-                    {
-                        selectedOK = 1;
-                        pid = pinfolist->PIDarray[pindex];
-                        kill(pid, SIGINT);
-                    }
-                }
-                if((selectedOK == 0) && (pindexSelectedOK == 1))
+        case 'I':
+            for (index = 0; index < procinfoproc.NBpindexActive; index++)
+            {
+                pindex = procinfoproc.pindexActive[index];
+                if (procinfoproc.selectedarray[pindex] == 1)
                 {
-                    pindex = pindexSelected;
+                    selectedOK = 1;
                     pid = pinfolist->PIDarray[pindex];
                     kill(pid, SIGINT);
                 }
-                break;
+            }
+            if ((selectedOK == 0) && (pindexSelectedOK == 1))
+            {
+                pindex = pindexSelected;
+                pid = pinfolist->PIDarray[pindex];
+                kill(pid, SIGINT);
+            }
+            break;
 
-            case 'r':
-                for(index = 0; index < procinfoproc.NBpindexActive; index++)
-                {
-                    pindex = procinfoproc.pindexActive[index];
-                    if(procinfoproc.selectedarray[pindex] == 1)
-                    {
-                        selectedOK = 1;
-                        if(pinfolist->active[pindex] != 1)
-                        {
-                            char SM_fname[STRINGMAXLEN_FULLFILENAME];
-                            WRITE_FULLFILENAME(SM_fname, "%s/proc.%s.%06d.shm", procdname,
-                                               pinfolist->pnamearray[pindex], (int) pinfolist->PIDarray[pindex]);
-                            remove(SM_fname);
-                        }
-                    }
-                }
-                if((selectedOK == 0) && (pindexSelectedOK == 1))
+        case 'r':
+            for (index = 0; index < procinfoproc.NBpindexActive; index++)
+            {
+                pindex = procinfoproc.pindexActive[index];
+                if (procinfoproc.selectedarray[pindex] == 1)
                 {
-                    pindex = pindexSelected;
-                    if(pinfolist->active[pindex] != 1)
+                    selectedOK = 1;
+                    if (pinfolist->active[pindex] != 1)
                     {
-                        remove(procinfoproc.pinfoarray[pindex]->logfilename);
-
                         char SM_fname[STRINGMAXLEN_FULLFILENAME];
-                        WRITE_FULLFILENAME(SM_fname, "%s/proc.%s.%06d.shm", procdname,
-                                           pinfolist->pnamearray[pindex], (int) pinfolist->PIDarray[pindex]);
+                        WRITE_FULLFILENAME(SM_fname, "%s/proc.%s.%06d.shm", procdname, pinfolist->pnamearray[pindex],
+                                           (int)pinfolist->PIDarray[pindex]);
                         remove(SM_fname);
                     }
                 }
-                break;
-
-            case 'R':
-                for(index = 0; index < procinfoproc.NBpindexActive; index++)
+            }
+            if ((selectedOK == 0) && (pindexSelectedOK == 1))
+            {
+                pindex = pindexSelected;
+                if (pinfolist->active[pindex] != 1)
                 {
-                    pindex = procinfoproc.pindexActive[index];
-                    if(pinfolist->active[pindex] != 1)
-                    {
-                        remove(procinfoproc.pinfoarray[pindex]->logfilename);
+                    remove(procinfoproc.pinfoarray[pindex]->logfilename);
 
-                        char SM_fname[STRINGMAXLEN_FULLFILENAME];
-                        WRITE_FULLFILENAME(SM_fname, "%s/proc.%s.%06d.shm", procdname,
-                                           pinfolist->pnamearray[pindex], (int) pinfolist->PIDarray[pindex]);
-                        remove(SM_fname);
-                    }
+                    char SM_fname[STRINGMAXLEN_FULLFILENAME];
+                    WRITE_FULLFILENAME(SM_fname, "%s/proc.%s.%06d.shm", procdname, pinfolist->pnamearray[pindex],
+                                       (int)pinfolist->PIDarray[pindex]);
+                    remove(SM_fname);
                 }
-                break;
+            }
+            break;
 
-            // loop controls
-            case 'p': // pause toggle
-                for(index = 0; index < procinfoproc.NBpindexActive; index++)
+        case 'R':
+            for (index = 0; index < procinfoproc.NBpindexActive; index++)
+            {
+                pindex = procinfoproc.pindexActive[index];
+                if (pinfolist->active[pindex] != 1)
                 {
-                    pindex = procinfoproc.pindexActive[index];
-                    if(procinfoproc.selectedarray[pindex] == 1)
-                    {
-                        selectedOK = 1;
-                        if(procinfoproc.pinfoarray[pindex]->CTRLval == 0)
-                        {
-                            procinfoproc.pinfoarray[pindex]->CTRLval = 1;
-                        }
-                        else
-                        {
-                            procinfoproc.pinfoarray[pindex]->CTRLval = 0;
-                        }
-                    }
+                    remove(procinfoproc.pinfoarray[pindex]->logfilename);
+
+                    char SM_fname[STRINGMAXLEN_FULLFILENAME];
+                    WRITE_FULLFILENAME(SM_fname, "%s/proc.%s.%06d.shm", procdname, pinfolist->pnamearray[pindex],
+                                       (int)pinfolist->PIDarray[pindex]);
+                    remove(SM_fname);
                 }
-                if((selectedOK == 0) && (pindexSelectedOK == 1))
+            }
+            break;
+
+        // loop controls
+        case 'p': // pause toggle
+            for (index = 0; index < procinfoproc.NBpindexActive; index++)
+            {
+                pindex = procinfoproc.pindexActive[index];
+                if (procinfoproc.selectedarray[pindex] == 1)
                 {
-                    pindex = pindexSelected;
-                    if(procinfoproc.pinfoarray[pindex]->CTRLval == 0)
+                    selectedOK = 1;
+                    if (procinfoproc.pinfoarray[pindex]->CTRLval == 0)
                     {
                         procinfoproc.pinfoarray[pindex]->CTRLval = 1;
                     }
@@ -3395,362 +2986,352 @@ errno_t processinfo_CTRLscreen()
                         procinfoproc.pinfoarray[pindex]->CTRLval = 0;
                     }
                 }
-                break;
-
-            case 'c': // compute toggle (toggles between 0-run and 5-run-without-compute)
-                DEBUG_TRACEPOINT(" ");
-                for(index = 0; index < procinfoproc.NBpindexActive; index++)
-                {
-                    pindex = procinfoproc.pindexActive[index];
-                    if(procinfoproc.selectedarray[pindex] == 1)
-                    {
-                        selectedOK = 1;
-                        if(procinfoproc.pinfoarray[pindex]->CTRLval ==
-                                0) // if running, turn compute to off
-                        {
-                            procinfoproc.pinfoarray[pindex]->CTRLval = 5;
-                        }
-                        else if(procinfoproc.pinfoarray[pindex]->CTRLval ==
-                                5)  // if compute off, turn compute back on
-                        {
-                            procinfoproc.pinfoarray[pindex]->CTRLval = 0;
-                        }
-                    }
-                }
-                DEBUG_TRACEPOINT(" ");
-                if((selectedOK == 0) && (pindexSelectedOK == 1))
-                {
-                    pindex = pindexSelected;
-                    if(procinfoproc.pinfoarray[pindex]->CTRLval ==
-                            0) // if running, turn compute to off
-                    {
-                        procinfoproc.pinfoarray[pindex]->CTRLval = 5;
-                    }
-                    else if(procinfoproc.pinfoarray[pindex]->CTRLval ==
-                            5)  // if procinfoproccompute off, turn compute back on
-                    {
-                        procinfoproc.pinfoarray[pindex]->CTRLval = 0;
-                    }
-                }
-                DEBUG_TRACEPOINT(" ");
-                break;
-
-            case 's': // step
-                for(index = 0; index < procinfoproc.NBpindexActive; index++)
-                {
-                    pindex = procinfoproc.pindexActive[index];
-                    if(procinfoproc.selectedarray[pindex] == 1)
-                    {
-                        selectedOK = 1;
-                        procinfoproc.pinfoarray[pindex]->CTRLval = 2;
-                    }
-                }
-                if((selectedOK == 0) && (pindexSelectedOK == 1))
-                {
-                    pindex = pindexSelected;
-                    procinfoproc.pinfoarray[pindex]->CTRLval = 2;
-                }
-                break;
-
-
-
-
-            case '>': // move to other cpuset
+            }
+            if ((selectedOK == 0) && (pindexSelectedOK == 1))
+            {
                 pindex = pindexSelected;
-                if(pinfolist->active[pindex] == 1)
+                if (procinfoproc.pinfoarray[pindex]->CTRLval == 0)
                 {
-                    TUI_exit();
-                    if(system("clear") != 0) // clear screen
-                    {
-                        PRINT_ERROR("system() returns non-zero value");
-                    }
-                    printf("CURRENT cpu set : %s\n",  procinfoproc.pinfodisp[pindex].cpuset);
-                    listindex = processinfo_SelectFromList(CPUsetList, NBCPUset);
-
-                    EXECUTE_SYSTEM_COMMAND("sudo cset proc -m %d %s", pinfolist->PIDarray[pindex],
-                                           CPUsetList[listindex].name);
-
-                    TUI_init_terminal(&wrow, &wcol);
+                    procinfoproc.pinfoarray[pindex]->CTRLval = 1;
                 }
-                break;
-
-            case '<': // move to same cpuset
-                pindex = pindexSelected;
-                if(pinfolist->active[pindex] == 1)
+                else
                 {
-                    TUI_exit();
-
-                    EXECUTE_SYSTEM_COMMAND("sudo cset proc -m %d root &> /dev/null",
-                                           pinfolist->PIDarray[pindex]);
-                    EXECUTE_SYSTEM_COMMAND("sudo cset proc --force -m %d %s &> /dev/null",
-                                           pinfolist->PIDarray[pindex], procinfoproc.pinfodisp[pindex].cpuset);
-
-                    TUI_init_terminal(&wrow, &wcol);
+                    procinfoproc.pinfoarray[pindex]->CTRLval = 0;
                 }
-                break;
-
+            }
+            break;
 
-            case 'e': // exit
-                for(index = 0; index < procinfoproc.NBpindexActive; index++)
+        case 'c': // compute toggle (toggles between 0-run and 5-run-without-compute)
+            DEBUG_TRACEPOINT(" ");
+            for (index = 0; index < procinfoproc.NBpindexActive; index++)
+            {
+                pindex = procinfoproc.pindexActive[index];
+                if (procinfoproc.selectedarray[pindex] == 1)
                 {
-                    pindex = procinfoproc.pindexActive[index];
-                    if(procinfoproc.selectedarray[pindex] == 1)
+                    selectedOK = 1;
+                    if (procinfoproc.pinfoarray[pindex]->CTRLval == 0) // if running, turn compute to off
                     {
-                        selectedOK = 1;
-                        procinfoproc.pinfoarray[pindex]->CTRLval = 3;
+                        procinfoproc.pinfoarray[pindex]->CTRLval = 5;
                     }
-                }
-                if((selectedOK == 0) && (pindexSelectedOK == 1))
-                {
-                    pindex = pindexSelected;
-                    procinfoproc.pinfoarray[pindex]->CTRLval = 3;
-                }
-                break;
-
-            case 'z': // apply current value as offset (zero loop counter)
-                selectedOK = 0;
-                for(index = 0; index < procinfoproc.NBpindexActive; index++)
-                {
-                    pindex = procinfoproc.pindexActive[index];
-                    if(procinfoproc.selectedarray[pindex] == 1)
+                    else if (procinfoproc.pinfoarray[pindex]->CTRLval == 5) // if compute off, turn compute back on
                     {
-                        selectedOK = 1;
-                        procinfoproc.loopcntoffsetarray[pindex] =
-                            procinfoproc.pinfoarray[pindex]->loopcnt;
-                    }
-                }
-                if((selectedOK == 0) && (pindexSelectedOK == 1))
-                {
-                    pindex = pindexSelected;
-                    procinfoproc.loopcntoffsetarray[pindex] =
-                        procinfoproc.pinfoarray[pindex]->loopcnt;
-                }
-                break;
-
-            case 'Z': // revert to original counter value
-                for(index = 0; index < procinfoproc.NBpindexActive; index++)
-                {
-                    pindex = procinfoproc.pindexActive[index];
-                    if(procinfoproc.selectedarray[pindex] == 1)
-                    {
-                        selectedOK = 1;
-                        procinfoproc.loopcntoffsetarray[pindex] = 0;
+                        procinfoproc.pinfoarray[pindex]->CTRLval = 0;
                     }
                 }
-                if((selectedOK == 0) && (pindexSelectedOK == 1))
-                {
-                    pindex = pindexSelected;
-                    procinfoproc.loopcntoffsetarray[pindex] = 0;
-                }
-                break;
-
-            case 't':
-                TUI_exit();
-                EXECUTE_SYSTEM_COMMAND("tmux a -t %s",
-                                       procinfoproc.pinfoarray[pindexSelected]->tmuxname);
-                TUI_init_terminal(&wrow, &wcol);
-                break;
-
-            case 'a':
-                pindex = pindexSelected;
-                if(pinfolist->active[pindex] == 1)
-                {
-                    TUI_exit();
-                    EXECUTE_SYSTEM_COMMAND("watch -n 0.1 cat /proc/%d/status",
-                                           (int) pinfolist->PIDarray[pindex]);
-                    TUI_init_terminal(&wrow, &wcol);
-                }
-                break;
-
-            case 'd':
-                pindex = pindexSelected;
-                if(pinfolist->active[pindex] == 1)
-                {
-                    TUI_exit();
-                    EXECUTE_SYSTEM_COMMAND("watch -n 0.1 cat /proc/%d/sched",
-                                           (int) pinfolist->PIDarray[pindex]);
-                    EXECUTE_SYSTEM_COMMAND("watch -n 0.1 cat /proc/%d/sched",
-                                           (int) pinfolist->PIDarray[pindex]);
-                    TUI_init_terminal(&wrow, &wcol);
-                }
-                break;
-
-
-            case 'o':
-                if(TimeSorted == 1)
-                {
-                    TimeSorted = 0;
-                }
-                else
-                {
-                    TimeSorted = 1;
-                }
-                break;
-
-
-            case 'L': // toggle time limit (iter)
+            }
+            DEBUG_TRACEPOINT(" ");
+            if ((selectedOK == 0) && (pindexSelectedOK == 1))
+            {
                 pindex = pindexSelected;
-                ToggleValue = procinfoproc.pinfoarray[pindex]->dtiter_limit_enable;
-                if(ToggleValue == 0)
+                if (procinfoproc.pinfoarray[pindex]->CTRLval == 0) // if running, turn compute to off
                 {
-                    procinfoproc.pinfoarray[pindex]->dtiter_limit_enable = 1;
-                    procinfoproc.pinfoarray[pindex]->dtiter_limit_value = (long)(
-                                1.5 * procinfoproc.pinfoarray[pindex]->dtmedian_iter_ns);
-                    procinfoproc.pinfoarray[pindex]->dtiter_limit_cnt = 0;
+                    procinfoproc.pinfoarray[pindex]->CTRLval = 5;
                 }
-                else
+                else if (procinfoproc.pinfoarray[pindex]->CTRLval ==
+                         5) // if procinfoproccompute off, turn compute back on
                 {
-                    ToggleValue ++;
-                    if(ToggleValue == 3)
-                    {
-                        ToggleValue = 0;
-                    }
-                    procinfoproc.pinfoarray[pindex]->dtiter_limit_enable = ToggleValue;
+                    procinfoproc.pinfoarray[pindex]->CTRLval = 0;
                 }
-                break;;
+            }
+            DEBUG_TRACEPOINT(" ");
+            break;
 
-            case 'M' : // toggle time limit (exec)
-                pindex = pindexSelected;
-                ToggleValue = procinfoproc.pinfoarray[pindex]->dtexec_limit_enable;
-                if(ToggleValue == 0)
-                {
-                    procinfoproc.pinfoarray[pindex]->dtexec_limit_enable = 1;
-                    procinfoproc.pinfoarray[pindex]->dtexec_limit_value = (long)(
-                                1.5 * procinfoproc.pinfoarray[pindex]->dtmedian_exec_ns + 20000);
-                    procinfoproc.pinfoarray[pindex]->dtexec_limit_cnt = 0;
-                }
-                else
+        case 's': // step
+            for (index = 0; index < procinfoproc.NBpindexActive; index++)
+            {
+                pindex = procinfoproc.pindexActive[index];
+                if (procinfoproc.selectedarray[pindex] == 1)
                 {
-                    ToggleValue ++;
-                    if(ToggleValue == 3)
-                    {
-                        ToggleValue = 0;
-                    }
-                    procinfoproc.pinfoarray[pindex]->dtexec_limit_enable = ToggleValue;
+                    selectedOK = 1;
+                    procinfoproc.pinfoarray[pindex]->CTRLval = 2;
                 }
-                break;;
-
-
-            case 'm' : // message
+            }
+            if ((selectedOK == 0) && (pindexSelectedOK == 1))
+            {
                 pindex = pindexSelected;
-                if(pinfolist->active[pindex] == 1)
+                procinfoproc.pinfoarray[pindex]->CTRLval = 2;
+            }
+            break;
+
+        case '>': // move to other cpuset
+            pindex = pindexSelected;
+            if (pinfolist->active[pindex] == 1)
+            {
+                TUI_exit();
+                if (system("clear") != 0) // clear screen
                 {
-                    TUI_exit();
-                    EXECUTE_SYSTEM_COMMAND("clear; tail -f %s",
-                                           procinfoproc.pinfoarray[pindex]->logfilename);
-                    TUI_init_terminal(&wrow, &wcol);
+                    PRINT_ERROR("system() returns non-zero value");
                 }
-                break;
+                printf("CURRENT cpu set : %s\n", procinfoproc.pinfodisp[pindex].cpuset);
+                listindex = processinfo_SelectFromList(CPUsetList, NBCPUset);
 
+                EXECUTE_SYSTEM_COMMAND("sudo cset proc -m %d %s", pinfolist->PIDarray[pindex],
+                                       CPUsetList[listindex].name);
 
-            // ============ SCREENS
+                TUI_init_terminal(&wrow, &wcol);
+            }
+            break;
 
-            case 'h': // help
-                procinfoproc.DisplayMode = PROCCTRL_DISPLAYMODE_HELP;
-                break;
+        case '<': // move to same cpuset
+            pindex = pindexSelected;
+            if (pinfolist->active[pindex] == 1)
+            {
+                TUI_exit();
 
-            case KEY_F(2): // control
-                procinfoproc.DisplayMode = PROCCTRL_DISPLAYMODE_CTRL;
-                break;
+                EXECUTE_SYSTEM_COMMAND("sudo cset proc -m %d root &> /dev/null", pinfolist->PIDarray[pindex]);
+                EXECUTE_SYSTEM_COMMAND("sudo cset proc --force -m %d %s &> /dev/null", pinfolist->PIDarray[pindex],
+                                       procinfoproc.pinfodisp[pindex].cpuset);
 
-            case KEY_F(3): // resources
-                procinfoproc.DisplayMode = PROCCTRL_DISPLAYMODE_RESOURCES;
-                break;
+                TUI_init_terminal(&wrow, &wcol);
+            }
+            break;
 
-            case KEY_F(4): // triggering
-                procinfoproc.DisplayMode = PROCCTRL_DISPLAYMODE_TRIGGER;
-                break;
+        case 'e': // exit
+            for (index = 0; index < procinfoproc.NBpindexActive; index++)
+            {
+                pindex = procinfoproc.pindexActive[index];
+                if (procinfoproc.selectedarray[pindex] == 1)
+                {
+                    selectedOK = 1;
+                    procinfoproc.pinfoarray[pindex]->CTRLval = 3;
+                }
+            }
+            if ((selectedOK == 0) && (pindexSelectedOK == 1))
+            {
+                pindex = pindexSelected;
+                procinfoproc.pinfoarray[pindex]->CTRLval = 3;
+            }
+            break;
 
-            case KEY_F(5): // timing
-                procinfoproc.DisplayMode = PROCCTRL_DISPLAYMODE_TIMING;
-                break;
+        case 'z': // apply current value as offset (zero loop counter)
+            selectedOK = 0;
+            for (index = 0; index < procinfoproc.NBpindexActive; index++)
+            {
+                pindex = procinfoproc.pindexActive[index];
+                if (procinfoproc.selectedarray[pindex] == 1)
+                {
+                    selectedOK = 1;
+                    procinfoproc.loopcntoffsetarray[pindex] = procinfoproc.pinfoarray[pindex]->loopcnt;
+                }
+            }
+            if ((selectedOK == 0) && (pindexSelectedOK == 1))
+            {
+                pindex = pindexSelected;
+                procinfoproc.loopcntoffsetarray[pindex] = procinfoproc.pinfoarray[pindex]->loopcnt;
+            }
+            break;
 
-            case KEY_F(6): // htop
-                TUI_exit();
-                if(system("htop") != 0)
+        case 'Z': // revert to original counter value
+            for (index = 0; index < procinfoproc.NBpindexActive; index++)
+            {
+                pindex = procinfoproc.pindexActive[index];
+                if (procinfoproc.selectedarray[pindex] == 1)
                 {
-                    PRINT_ERROR("system() returns non-zero value");
+                    selectedOK = 1;
+                    procinfoproc.loopcntoffsetarray[pindex] = 0;
                 }
+            }
+            if ((selectedOK == 0) && (pindexSelectedOK == 1))
+            {
+                pindex = pindexSelected;
+                procinfoproc.loopcntoffsetarray[pindex] = 0;
+            }
+            break;
+
+        case 't':
+            TUI_exit();
+            EXECUTE_SYSTEM_COMMAND("tmux a -t %s", procinfoproc.pinfoarray[pindexSelected]->tmuxname);
+            TUI_init_terminal(&wrow, &wcol);
+            break;
+
+        case 'a':
+            pindex = pindexSelected;
+            if (pinfolist->active[pindex] == 1)
+            {
+                TUI_exit();
+                EXECUTE_SYSTEM_COMMAND("watch -n 0.1 cat /proc/%d/status", (int)pinfolist->PIDarray[pindex]);
                 TUI_init_terminal(&wrow, &wcol);
-                break;
+            }
+            break;
 
-            case KEY_F(7): // iotop
+        case 'd':
+            pindex = pindexSelected;
+            if (pinfolist->active[pindex] == 1)
+            {
                 TUI_exit();
-                if(system("sudo iotop -o") != 0)
+                EXECUTE_SYSTEM_COMMAND("watch -n 0.1 cat /proc/%d/sched", (int)pinfolist->PIDarray[pindex]);
+                EXECUTE_SYSTEM_COMMAND("watch -n 0.1 cat /proc/%d/sched", (int)pinfolist->PIDarray[pindex]);
+                TUI_init_terminal(&wrow, &wcol);
+            }
+            break;
+
+        case 'o':
+            if (TimeSorted == 1)
+            {
+                TimeSorted = 0;
+            }
+            else
+            {
+                TimeSorted = 1;
+            }
+            break;
+
+        case 'L': // toggle time limit (iter)
+            pindex = pindexSelected;
+            ToggleValue = procinfoproc.pinfoarray[pindex]->dtiter_limit_enable;
+            if (ToggleValue == 0)
+            {
+                procinfoproc.pinfoarray[pindex]->dtiter_limit_enable = 1;
+                procinfoproc.pinfoarray[pindex]->dtiter_limit_value =
+                    (long)(1.5 * procinfoproc.pinfoarray[pindex]->dtmedian_iter_ns);
+                procinfoproc.pinfoarray[pindex]->dtiter_limit_cnt = 0;
+            }
+            else
+            {
+                ToggleValue++;
+                if (ToggleValue == 3)
                 {
-                    PRINT_ERROR("system() returns non-zero value");
+                    ToggleValue = 0;
                 }
-                TUI_init_terminal(&wrow, &wcol);
-                break;
+                procinfoproc.pinfoarray[pindex]->dtiter_limit_enable = ToggleValue;
+            }
+            break;
+            ;
 
-            case KEY_F(8): // atop
-                TUI_exit();
-                if(system("sudo atop") != 0)
+        case 'M': // toggle time limit (exec)
+            pindex = pindexSelected;
+            ToggleValue = procinfoproc.pinfoarray[pindex]->dtexec_limit_enable;
+            if (ToggleValue == 0)
+            {
+                procinfoproc.pinfoarray[pindex]->dtexec_limit_enable = 1;
+                procinfoproc.pinfoarray[pindex]->dtexec_limit_value =
+                    (long)(1.5 * procinfoproc.pinfoarray[pindex]->dtmedian_exec_ns + 20000);
+                procinfoproc.pinfoarray[pindex]->dtexec_limit_cnt = 0;
+            }
+            else
+            {
+                ToggleValue++;
+                if (ToggleValue == 3)
                 {
-                    PRINT_ERROR("system() returns non-zero value");
+                    ToggleValue = 0;
                 }
+                procinfoproc.pinfoarray[pindex]->dtexec_limit_enable = ToggleValue;
+            }
+            break;
+            ;
+
+        case 'm': // message
+            pindex = pindexSelected;
+            if (pinfolist->active[pindex] == 1)
+            {
+                TUI_exit();
+                EXECUTE_SYSTEM_COMMAND("clear; tail -f %s", procinfoproc.pinfoarray[pindex]->logfilename);
                 TUI_init_terminal(&wrow, &wcol);
-                break;
+            }
+            break;
 
+            // ============ SCREENS
 
+        case 'h': // help
+            procinfoproc.DisplayMode = PROCCTRL_DISPLAYMODE_HELP;
+            break;
 
+        case KEY_F(2): // control
+            procinfoproc.DisplayMode = PROCCTRL_DISPLAYMODE_CTRL;
+            break;
 
-            // ============ SCANNING
+        case KEY_F(3): // resources
+            procinfoproc.DisplayMode = PROCCTRL_DISPLAYMODE_RESOURCES;
+            break;
 
-            case '{': // slower scan update
-                procinfoproc.twaitus = (int)(1.2 * procinfoproc.twaitus);
-                if(procinfoproc.twaitus > 1000000)
-                {
-                    procinfoproc.twaitus = 1000000;
-                }
-                break;
+        case KEY_F(4): // triggering
+            procinfoproc.DisplayMode = PROCCTRL_DISPLAYMODE_TRIGGER;
+            break;
 
-            case '}': // faster scan update
-                procinfoproc.twaitus = (int)(0.83333333333333333333 * procinfoproc.twaitus);
-                if(procinfoproc.twaitus < 1000)
-                {
-                    procinfoproc.twaitus = 1000;
-                }
-                break;
+        case KEY_F(5): // timing
+            procinfoproc.DisplayMode = PROCCTRL_DISPLAYMODE_TIMING;
+            break;
 
+        case KEY_F(6): // htop
+            TUI_exit();
+            if (system("htop") != 0)
+            {
+                PRINT_ERROR("system() returns non-zero value");
+            }
+            TUI_init_terminal(&wrow, &wcol);
+            break;
 
-            // ============ DISPLAY
+        case KEY_F(7): // iotop
+            TUI_exit();
+            if (system("sudo iotop -o") != 0)
+            {
+                PRINT_ERROR("system() returns non-zero value");
+            }
+            TUI_init_terminal(&wrow, &wcol);
+            break;
 
-            case '-': // slower display update
-                frequ *= 0.5;
-                if(frequ < 1.0)
-                {
-                    frequ = 1.0;
-                }
-                if(frequ > 64.0)
-                {
-                    frequ = 64.0;
-                }
-                break;
+        case KEY_F(8): // atop
+            TUI_exit();
+            if (system("sudo atop") != 0)
+            {
+                PRINT_ERROR("system() returns non-zero value");
+            }
+            TUI_init_terminal(&wrow, &wcol);
+            break;
 
+            // ============ SCANNING
 
-            case '+': // faster display update
-                frequ *= 2.0;
-                if(frequ < 1.0)
-                {
-                    frequ = 1.0;
-                }
-                if(frequ > 64.0)
-                {
-                    frequ = 64.0;
-                }
-                break;
+        case '{': // slower scan update
+            procinfoproc.twaitus = (int)(1.2 * procinfoproc.twaitus);
+            if (procinfoproc.twaitus > 1000000)
+            {
+                procinfoproc.twaitus = 1000000;
+            }
+            break;
+
+        case '}': // faster scan update
+            procinfoproc.twaitus = (int)(0.83333333333333333333 * procinfoproc.twaitus);
+            if (procinfoproc.twaitus < 1000)
+            {
+                procinfoproc.twaitus = 1000;
+            }
+            break;
+
+            // ============ DISPLAY
+
+        case '-': // slower display update
+            frequ *= 0.5;
+            if (frequ < 1.0)
+            {
+                frequ = 1.0;
+            }
+            if (frequ > 64.0)
+            {
+                frequ = 64.0;
+            }
+            break;
 
+        case '+': // faster display update
+            frequ *= 2.0;
+            if (frequ < 1.0)
+            {
+                frequ = 1.0;
+            }
+            if (frequ > 64.0)
+            {
+                frequ = 64.0;
+            }
+            break;
         }
         clock_gettime(CLOCK_REALTIME, &t01loop);
 
         DEBUG_TRACEPOINT(" ");
 
-        if(freeze == 0)
+        if (freeze == 0)
         {
             erase();
 
-            if(procinfoproc.DisplayMode == PROCCTRL_DISPLAYMODE_HELP)
+            if (procinfoproc.DisplayMode == PROCCTRL_DISPLAYMODE_HELP)
             {
                 int attrval = A_BOLD;
 
@@ -3760,7 +3341,6 @@ errno_t processinfo_CTRLscreen()
                 TUI_printfw("    Exit");
                 TUI_newline();
 
-
                 TUI_printfw("============ SCREENS");
                 TUI_newline();
 
@@ -3871,7 +3451,6 @@ errno_t processinfo_CTRLscreen()
                 attroff(attrval);
                 TUI_printfw("    Move to other CPU set / back to same CPU set");
                 TUI_newline();
-
             }
             else
             {
@@ -3880,12 +3459,12 @@ errno_t processinfo_CTRLscreen()
                 TUI_printfw("pindexSelected = %d    %d", pindexSelected, pindexSelectedOK);
                 TUI_newline();
 
-                TUI_printfw("[PID %d   SCAN TID %d]  %2d cpus   %2d processes tracked    Display Mode %d",
-                            CLIPID, (int) procinfoproc.scanPID, procinfoproc.NBcpus,
-                            procinfoproc.NBpindexActive, procinfoproc.DisplayMode);
+                TUI_printfw("[PID %d   SCAN TID %d]  %2d cpus   %2d processes tracked    Display Mode %d", CLIPID,
+                            (int)procinfoproc.scanPID, procinfoproc.NBcpus, procinfoproc.NBpindexActive,
+                            procinfoproc.DisplayMode);
                 TUI_newline();
 
-                if(procinfoproc.DisplayMode == PROCCTRL_DISPLAYMODE_HELP)
+                if (procinfoproc.DisplayMode == PROCCTRL_DISPLAYMODE_HELP)
                 {
                     attron(A_REVERSE);
                     TUI_printfw("[h] Help");
@@ -3897,7 +3476,7 @@ errno_t processinfo_CTRLscreen()
                 }
                 TUI_printfw("   ");
 
-                if(procinfoproc.DisplayMode == PROCCTRL_DISPLAYMODE_CTRL)
+                if (procinfoproc.DisplayMode == PROCCTRL_DISPLAYMODE_CTRL)
                 {
                     attron(A_REVERSE);
                     TUI_printfw("[F2] CTRL");
@@ -3909,7 +3488,7 @@ errno_t processinfo_CTRLscreen()
                 }
                 TUI_printfw("   ");
 
-                if(procinfoproc.DisplayMode == PROCCTRL_DISPLAYMODE_RESOURCES)
+                if (procinfoproc.DisplayMode == PROCCTRL_DISPLAYMODE_RESOURCES)
                 {
                     attron(A_REVERSE);
                     TUI_printfw("[F3] Resources");
@@ -3921,8 +3500,7 @@ errno_t processinfo_CTRLscreen()
                 }
                 TUI_printfw("   ");
 
-
-                if(procinfoproc.DisplayMode == PROCCTRL_DISPLAYMODE_TRIGGER)
+                if (procinfoproc.DisplayMode == PROCCTRL_DISPLAYMODE_TRIGGER)
                 {
                     attron(A_REVERSE);
                     TUI_printfw("[F4] Triggering");
@@ -3934,8 +3512,7 @@ errno_t processinfo_CTRLscreen()
                 }
                 TUI_printfw("   ");
 
-
-                if(procinfoproc.DisplayMode == PROCCTRL_DISPLAYMODE_TIMING)
+                if (procinfoproc.DisplayMode == PROCCTRL_DISPLAYMODE_TIMING)
                 {
                     attron(A_REVERSE);
                     TUI_printfw("[F5] Timing");
@@ -3947,7 +3524,7 @@ errno_t processinfo_CTRLscreen()
                 }
                 TUI_printfw("   ");
 
-                if(procinfoproc.DisplayMode == PROCCTRL_DISPLAYMODE_HTOP)
+                if (procinfoproc.DisplayMode == PROCCTRL_DISPLAYMODE_HTOP)
                 {
                     attron(A_REVERSE);
                     TUI_printfw("[F6] htop (F10 to exit)");
@@ -3959,7 +3536,7 @@ errno_t processinfo_CTRLscreen()
                 }
                 TUI_printfw("   ");
 
-                if(procinfoproc.DisplayMode == PROCCTRL_DISPLAYMODE_IOTOP)
+                if (procinfoproc.DisplayMode == PROCCTRL_DISPLAYMODE_IOTOP)
                 {
                     attron(A_REVERSE);
                     TUI_printfw("[F7] iotop (q to exit)");
@@ -3971,7 +3548,7 @@ errno_t processinfo_CTRLscreen()
                 }
                 TUI_printfw("   ");
 
-                if(procinfoproc.DisplayMode == PROCCTRL_DISPLAYMODE_ATOP)
+                if (procinfoproc.DisplayMode == PROCCTRL_DISPLAYMODE_ATOP)
                 {
                     attron(A_REVERSE);
                     TUI_printfw("[F8] atop (q to exit)");
@@ -3983,36 +3560,29 @@ errno_t processinfo_CTRLscreen()
                 }
                 TUI_printfw("   ");
 
-
                 TUI_newline();
 
                 DEBUG_TRACEPOINT(" ");
 
                 TUI_printfw("Display frequ = %2d Hz  [%ld] fscan=%5.2f Hz ( %5.2f Hz %5.2f %% busy )",
-                            (int)(frequ + 0.5),
-                            procinfoproc.loopcnt,
-                            1.0 / procinfoproc.dtscan,
+                            (int)(frequ + 0.5), procinfoproc.loopcnt, 1.0 / procinfoproc.dtscan,
                             1000000.0 / procinfoproc.twaitus,
-                            100.0 * (procinfoproc.dtscan - 1.0e-6 * procinfoproc.twaitus) /
-                            procinfoproc.dtscan);
+                            100.0 * (procinfoproc.dtscan - 1.0e-6 * procinfoproc.twaitus) / procinfoproc.dtscan);
                 TUI_newline();
 
-
                 DEBUG_TRACEPOINT(" ");
 
-
-                if((pindexSelected >= 0) && (pindexSelected < PROCESSINFOLISTSIZE))
+                if ((pindexSelected >= 0) && (pindexSelected < PROCESSINFOLISTSIZE))
                 {
-                    if(procinfoproc.pinfommapped[pindexSelected] == 1)
+                    if (procinfoproc.pinfommapped[pindexSelected] == 1)
                     {
 
                         strcpy(pselected_FILE, procinfoproc.pinfoarray[pindexSelected]->source_FILE);
-                        strcpy(pselected_FUNCTION,
-                               procinfoproc.pinfoarray[pindexSelected]->source_FUNCTION);
+                        strcpy(pselected_FUNCTION, procinfoproc.pinfoarray[pindexSelected]->source_FUNCTION);
                         pselected_LINE = procinfoproc.pinfoarray[pindexSelected]->source_LINE;
 
-                        TUI_printfw("Source Code: %s line %d (function %s)", pselected_FILE,
-                                    pselected_LINE, pselected_FUNCTION);
+                        TUI_printfw("Source Code: %s line %d (function %s)", pselected_FILE, pselected_LINE,
+                                    pselected_FUNCTION);
                         TUI_newline();
                     }
                     else
@@ -4037,9 +3607,6 @@ errno_t processinfo_CTRLscreen()
 
                 clock_gettime(CLOCK_REALTIME, &t03loop);
 
-
-
-
                 clock_gettime(CLOCK_REALTIME, &t04loop);
 
                 /** ### Display
@@ -4048,10 +3615,8 @@ errno_t processinfo_CTRLscreen()
                  *
                  */
 
-
-
                 int dispindex;
-                if(TimeSorted == 0)
+                if (TimeSorted == 0)
                 {
                     dispindexMax = wrow - 4;
                 }
@@ -4062,7 +3627,7 @@ errno_t processinfo_CTRLscreen()
 
                 DEBUG_TRACEPOINT(" ");
 
-                if(procinfoproc.DisplayMode == PROCCTRL_DISPLAYMODE_RESOURCES)
+                if (procinfoproc.DisplayMode == PROCCTRL_DISPLAYMODE_RESOURCES)
                 {
                     int cpu;
                     DEBUG_TRACEPOINT(" ");
@@ -4086,84 +3651,73 @@ errno_t processinfo_CTRLscreen()
 
                     DEBUG_TRACEPOINT(" ");
 
-
                     // List CPUs
-                    TUI_printfw(" %*.*s %*.*s %-*.*s    %-*.*s              ",
-                                pstrlen_status,  pstrlen_status,  " ",
-                                pstrlen_pid,     pstrlen_pid,     " ",
-                                pstrlen_pname,   pstrlen_pname,   " ",
-                                pstrlen_cset,    pstrlen_cset,    " "
-                               );
+                    TUI_printfw(" %*.*s %*.*s %-*.*s    %-*.*s              ", pstrlen_status, pstrlen_status, " ",
+                                pstrlen_pid, pstrlen_pid, " ", pstrlen_pname, pstrlen_pname, " ", pstrlen_cset,
+                                pstrlen_cset, " ");
 
-
-                    for(cpusocket = 0; cpusocket < procinfoproc.NBcpusocket; cpusocket++)
+                    for (cpusocket = 0; cpusocket < procinfoproc.NBcpusocket; cpusocket++)
                     {
-                        if(cpusocket > 0)
+                        if (cpusocket > 0)
                         {
                             TUI_printfw("    ");
                         }
-                        for(cpu = 0; cpu < procinfoproc.NBcpus; cpu++)
-                            if(procinfoproc.CPUphys[cpu] == cpusocket)
+                        for (cpu = 0; cpu < procinfoproc.NBcpus; cpu++)
+                            if (procinfoproc.CPUphys[cpu] == cpusocket)
                             {
                                 TUI_printfw("|%02d", procinfoproc.CPUids[cpu]);
                             }
                         TUI_printfw("|");
                     }
-                    TUI_printfw(" <- %2d sockets %2d CPUs", procinfoproc.NBcpusocket,
-                                procinfoproc.NBcpus);
+                    TUI_printfw(" <- %2d sockets %2d CPUs", procinfoproc.NBcpusocket, procinfoproc.NBcpus);
                     TUI_newline();
 
                     // List CPU # processes
-                    TUI_printfw(" %*.*s %*.*s %-*.*s    %-*.*s              ",
-                                pstrlen_status,  pstrlen_status,  " ",
-                                pstrlen_pid,     pstrlen_pid,     " ",
-                                pstrlen_pname,   pstrlen_pname,   " ",
-                                pstrlen_cset,    pstrlen_cset,    " "
-                               );
-
+                    TUI_printfw(" %*.*s %*.*s %-*.*s    %-*.*s              ", pstrlen_status, pstrlen_status, " ",
+                                pstrlen_pid, pstrlen_pid, " ", pstrlen_pname, pstrlen_pname, " ", pstrlen_cset,
+                                pstrlen_cset, " ");
 
-
-                    for(cpusocket = 0; cpusocket < procinfoproc.NBcpusocket; cpusocket++)
+                    for (cpusocket = 0; cpusocket < procinfoproc.NBcpusocket; cpusocket++)
                     {
-                        if(cpusocket > 0)
+                        if (cpusocket > 0)
                         {
                             TUI_printfw("    ");
                         }
 
-                        for(cpu = 0; cpu < procinfoproc.NBcpus; cpu++)
-                            if(procinfoproc.CPUphys[cpu] == cpusocket)
+                        for (cpu = 0; cpu < procinfoproc.NBcpus; cpu++)
+                            if (procinfoproc.CPUphys[cpu] == cpusocket)
                             {
                                 int vint = procinfoproc.CPUpcnt[procinfoproc.CPUids[cpu]];
-                                if(vint > 99)
+                                if (vint > 99)
                                 {
                                     vint = 99;
                                 }
 
                                 ColorCode = 0;
-                                if(vint > CPUpcntLim1)
+                                if (vint > CPUpcntLim1)
                                 {
                                     ColorCode = 2;
                                 }
-                                if(vint > CPUpcntLim2)
+                                if (vint > CPUpcntLim2)
                                 {
                                     ColorCode = 3;
                                 }
-                                if(vint > CPUpcntLim3)
+                                if (vint > CPUpcntLim3)
                                 {
                                     ColorCode = 4;
                                 }
-                                if(vint < CPUpcntLim0)
+                                if (vint < CPUpcntLim0)
                                 {
                                     ColorCode = 5;
                                 }
 
                                 TUI_printfw("|");
-                                if(ColorCode != 0)
+                                if (ColorCode != 0)
                                 {
                                     attron(COLOR_PAIR(ColorCode));
                                 }
                                 TUI_printfw("%02d", vint);
-                                if(ColorCode != 0)
+                                if (ColorCode != 0)
                                 {
                                     attroff(COLOR_PAIR(ColorCode));
                                 }
@@ -4174,58 +3728,53 @@ errno_t processinfo_CTRLscreen()
                     TUI_printfw(" <- PROCESSES");
                     TUI_newline();
 
-
                     DEBUG_TRACEPOINT(" ");
 
-
                     // Print CPU LOAD
-                    TUI_printfw(" %*.*s %*.*s %-*.*s PR %-*.*s  #T  ctxsw   ",
-                                pstrlen_status,  pstrlen_status,  "STATUS",
-                                pstrlen_pid,     pstrlen_pid,     "PID",
-                                pstrlen_pname,   pstrlen_pname,   "pname",
-                                pstrlen_cset,    pstrlen_cset,    "cset",
-                                procinfoproc.NBcpus);
-
-                    for(cpusocket = 0; cpusocket < procinfoproc.NBcpusocket; cpusocket++)
+                    TUI_printfw(" %*.*s %*.*s %-*.*s PR %-*.*s  #T  ctxsw   ", pstrlen_status, pstrlen_status, "STATUS",
+                                pstrlen_pid, pstrlen_pid, "PID", pstrlen_pname, pstrlen_pname, "pname", pstrlen_cset,
+                                pstrlen_cset, "cset", procinfoproc.NBcpus);
+
+                    for (cpusocket = 0; cpusocket < procinfoproc.NBcpusocket; cpusocket++)
                     {
-                        if(cpusocket > 0)
+                        if (cpusocket > 0)
                         {
                             TUI_printfw("    ");
                         }
-                        for(cpu = 0; cpu < procinfoproc.NBcpus; cpu++)
-                            if(procinfoproc.CPUphys[cpu] == cpusocket)
+                        for (cpu = 0; cpu < procinfoproc.NBcpus; cpu++)
+                            if (procinfoproc.CPUphys[cpu] == cpusocket)
                             {
                                 int vint = (int)(100.0 * procinfoproc.CPUload[procinfoproc.CPUids[cpu]]);
-                                if(vint > 99)
+                                if (vint > 99)
                                 {
                                     vint = 99;
                                 }
 
                                 ColorCode = 0;
-                                if(vint > CPUloadLim1)
+                                if (vint > CPUloadLim1)
                                 {
                                     ColorCode = 2;
                                 }
-                                if(vint > CPUloadLim2)
+                                if (vint > CPUloadLim2)
                                 {
                                     ColorCode = 3;
                                 }
-                                if(vint > CPUloadLim3)
+                                if (vint > CPUloadLim3)
                                 {
                                     ColorCode = 4;
                                 }
-                                if(vint < CPUloadLim0)
+                                if (vint < CPUloadLim0)
                                 {
                                     ColorCode = 5;
                                 }
 
                                 TUI_printfw("|");
-                                if(ColorCode != 0)
+                                if (ColorCode != 0)
                                 {
                                     attron(COLOR_PAIR(ColorCode));
                                 }
                                 TUI_printfw("%02d", vint);
-                                if(ColorCode != 0)
+                                if (ColorCode != 0)
                                 {
                                     attroff(COLOR_PAIR(ColorCode));
                                 }
@@ -4238,54 +3787,41 @@ errno_t processinfo_CTRLscreen()
                     TUI_newline();
                 }
 
-
-
                 // print header for display mode PROCCTRL_DISPLAYMODE_CTRL
-                if(procinfoproc.DisplayMode == PROCCTRL_DISPLAYMODE_CTRL)
+                if (procinfoproc.DisplayMode == PROCCTRL_DISPLAYMODE_CTRL)
                 {
                     DEBUG_TRACEPOINT(" ");
                     TUI_newline();
                     TUI_newline();
                     TUI_printfw(" %*.*s %*.*s %-*.*s %-*.*s C# tstart       %-*.*s %-*.*s   %-*.*s   %-*.*s",
-                                pstrlen_status,  pstrlen_status,  "STATUS",
-                                pstrlen_pid,     pstrlen_pid,     "PID",
-                                pstrlen_pname,   pstrlen_pname,   "pname",
-                                pstrlen_state,   pstrlen_state,   "state",
-                                pstrlen_tmux,    pstrlen_tmux,    "tmux sess",
-                                pstrlen_loopcnt, pstrlen_loopcnt, "loopcnt",
-                                pstrlen_descr,   pstrlen_descr,   "Description",
-                                pstrlen_msg,     pstrlen_msg,     "Message"
-                               );
+                                pstrlen_status, pstrlen_status, "STATUS", pstrlen_pid, pstrlen_pid, "PID",
+                                pstrlen_pname, pstrlen_pname, "pname", pstrlen_state, pstrlen_state, "state",
+                                pstrlen_tmux, pstrlen_tmux, "tmux sess", pstrlen_loopcnt, pstrlen_loopcnt, "loopcnt",
+                                pstrlen_descr, pstrlen_descr, "Description", pstrlen_msg, pstrlen_msg, "Message");
                     TUI_newline();
                     TUI_newline();
                     DEBUG_TRACEPOINT(" ");
                 }
 
-
                 // print header for display mode PROCCTRL_DISPLAYMODE_TRIGGER
-                if(procinfoproc.DisplayMode == PROCCTRL_DISPLAYMODE_TRIGGER)
+                if (procinfoproc.DisplayMode == PROCCTRL_DISPLAYMODE_TRIGGER)
                 {
                     DEBUG_TRACEPOINT(" ");
                     TUI_newline();
                     TUI_newline();
-                    TUI_printfw("%*.*s %*.*s %-*.*s %*.*s %*.*s mode sem %*.*s  %*.*s  %*.*s",
-                                pstrlen_status,   pstrlen_status,   "STATUS",
-                                pstrlen_pid,      pstrlen_pid,      "PID",
-                                pstrlen_pname,    pstrlen_pname,    "pname",
-                                pstrlen_inode,    pstrlen_inode,    "inode",
-                                pstrlen_trigstreamname,    pstrlen_trigstreamname,    "stream",
-                                pstrlen_missedfr, pstrlen_missedfr, "miss",
-                                pstrlen_missedfrc, pstrlen_missedfrc, "misscumul",
-                                pstrlen_tocnt,    pstrlen_tocnt,     "timeouts"
-                               );
+                    TUI_printfw("%*.*s %*.*s %-*.*s %*.*s %*.*s mode sem %*.*s  %*.*s  %*.*s", pstrlen_status,
+                                pstrlen_status, "STATUS", pstrlen_pid, pstrlen_pid, "PID", pstrlen_pname, pstrlen_pname,
+                                "pname", pstrlen_inode, pstrlen_inode, "inode", pstrlen_trigstreamname,
+                                pstrlen_trigstreamname, "stream", pstrlen_missedfr, pstrlen_missedfr, "miss",
+                                pstrlen_missedfrc, pstrlen_missedfrc, "misscumul", pstrlen_tocnt, pstrlen_tocnt,
+                                "timeouts");
                     TUI_newline();
                     TUI_newline();
                     DEBUG_TRACEPOINT(" ");
                 }
 
-
                 // print header for display mode PROCCTRL_DISPLAYMODE_TIMING
-                if(procinfoproc.DisplayMode == PROCCTRL_DISPLAYMODE_TIMING)
+                if (procinfoproc.DisplayMode == PROCCTRL_DISPLAYMODE_TIMING)
                 {
                     DEBUG_TRACEPOINT(" ");
                     TUI_newline();
@@ -4300,17 +3836,14 @@ errno_t processinfo_CTRLscreen()
 
                 clock_gettime(CLOCK_REALTIME, &t05loop);
 
-
                 // ===========================================================================
                 // ============== PRINT INFORMATION FOR EACH PROCESS =========================
                 // ===========================================================================
                 pindexSelectedOK = 0;
 
-
-
-                for(dispindex = 0; dispindex < dispindexMax; dispindex++)
+                for (dispindex = 0; dispindex < dispindexMax; dispindex++)
                 {
-                    if(TimeSorted == 0)
+                    if (TimeSorted == 0)
                     {
                         pindex = dispindex;
                     }
@@ -4319,18 +3852,17 @@ errno_t processinfo_CTRLscreen()
                         pindex = procinfoproc.sorted_pindex_time[dispindex];
                     }
 
-                    if(pindex < procinfoproc.NBpinfodisp)
+                    if (pindex < procinfoproc.NBpinfodisp)
                     {
-                        DEBUG_TRACEPOINT("%d %d   %ld %ld", dispindex, dispindexMax, pindex,
-                                         procinfoproc.NBpinfodisp);
+                        DEBUG_TRACEPOINT("%d %d   %ld %ld", dispindex, dispindexMax, pindex, procinfoproc.NBpinfodisp);
 
-                        if(pindex == pindexSelected)
+                        if (pindex == pindexSelected)
                         {
                             attron(A_REVERSE);
                             pindexSelectedOK = 1;
                         }
 
-                        if(procinfoproc.selectedarray[pindex] == 1)
+                        if (procinfoproc.selectedarray[pindex] == 1)
                         {
                             TUI_printfw("*");
                         }
@@ -4339,10 +3871,9 @@ errno_t processinfo_CTRLscreen()
                             TUI_printfw(" ");
                         }
 
-                        DEBUG_TRACEPOINT("procinfoproc.selectedarray[pindex] = %d",
-                                         procinfoproc.selectedarray[pindex]);
+                        DEBUG_TRACEPOINT("procinfoproc.selectedarray[pindex] = %d", procinfoproc.selectedarray[pindex]);
 
-                        if(pinfolist->active[pindex] == 1)
+                        if (pinfolist->active[pindex] == 1)
                         {
                             sprintf(string, "%-*.*s", pstrlen_status, pstrlen_status, "ACTIVE");
                             attron(COLOR_PAIR(2));
@@ -4350,53 +3881,47 @@ errno_t processinfo_CTRLscreen()
                             attroff(COLOR_PAIR(2));
                         }
 
-
                         DEBUG_TRACEPOINT("pinfolist->active[pindex] = %d", pinfolist->active[pindex]);
 
-
-                        if(pinfolist->active[pindex] == 2)  // not active: error, crashed or terminated
+                        if (pinfolist->active[pindex] == 2) // not active: error, crashed or terminated
                         {
-                            switch(procinfoproc.pinfoarray[pindex]->loopstat)
+                            switch (procinfoproc.pinfoarray[pindex]->loopstat)
                             {
-                                case 3: // clean exit
-                                    sprintf(string, "%-*.*s", pstrlen_status, pstrlen_status, "STOPPED");
-                                    attron(COLOR_PAIR(3));
-                                    TUI_printfw("%s", string);
-                                    attroff(COLOR_PAIR(3));
-                                    break;
+                            case 3: // clean exit
+                                sprintf(string, "%-*.*s", pstrlen_status, pstrlen_status, "STOPPED");
+                                attron(COLOR_PAIR(3));
+                                TUI_printfw("%s", string);
+                                attroff(COLOR_PAIR(3));
+                                break;
 
-                                case 4: // error
-                                    sprintf(string, "%-*.*s", pstrlen_status, pstrlen_status, "ERROR");
-                                    attron(COLOR_PAIR(3));
-                                    TUI_printfw("%s", string);
-                                    attroff(COLOR_PAIR(3));
-                                    break;
+                            case 4: // error
+                                sprintf(string, "%-*.*s", pstrlen_status, pstrlen_status, "ERROR");
+                                attron(COLOR_PAIR(3));
+                                TUI_printfw("%s", string);
+                                attroff(COLOR_PAIR(3));
+                                break;
 
-                                default: // crashed
-                                    sprintf(string, "%-*.*s", pstrlen_status, pstrlen_status, "CRASHED");
-                                    attron(COLOR_PAIR(4));
-                                    TUI_printfw("%s", string);
-                                    attroff(COLOR_PAIR(4));
-                                    break;
+                            default: // crashed
+                                sprintf(string, "%-*.*s", pstrlen_status, pstrlen_status, "CRASHED");
+                                attron(COLOR_PAIR(4));
+                                TUI_printfw("%s", string);
+                                attroff(COLOR_PAIR(4));
+                                break;
                             }
                         }
 
+                        DEBUG_TRACEPOINT("%d %d   %ld %ld", dispindex, dispindexMax, pindex, procinfoproc.NBpinfodisp);
 
-                        DEBUG_TRACEPOINT("%d %d   %ld %ld", dispindex, dispindexMax, pindex,
-                                         procinfoproc.NBpinfodisp);
-
-                        if(pinfolist->active[pindex] != 0)
+                        if (pinfolist->active[pindex] != 0)
                         {
-                            if(pindex == pindexSelected)
+                            if (pindex == pindexSelected)
                             {
                                 attron(A_REVERSE);
                             }
 
-                            sprintf(string, " %-*.*d", pstrlen_pid, pstrlen_pid,
-                                    pinfolist->PIDarray[pindex]);
+                            sprintf(string, " %-*.*d", pstrlen_pid, pstrlen_pid, pinfolist->PIDarray[pindex]);
                             TUI_printfw("%s", string);
 
-
                             attron(A_BOLD);
 
                             sprintf(string, " %-*.*s", pstrlen_pname, pstrlen_pname,
@@ -4404,48 +3929,45 @@ errno_t processinfo_CTRLscreen()
                             TUI_printfw("%s", string);
                             attroff(A_BOLD);
 
-
                             // ================ DISPLAY MODE PROCCTRL_DISPLAYMODE_CTRL ==================
-                            if(procinfoproc.DisplayMode == PROCCTRL_DISPLAYMODE_CTRL)
+                            if (procinfoproc.DisplayMode == PROCCTRL_DISPLAYMODE_CTRL)
                             {
-                                switch(procinfoproc.pinfoarray[pindex]->loopstat)
+                                switch (procinfoproc.pinfoarray[pindex]->loopstat)
                                 {
-                                    case 0:
-                                        sprintf(string, " %-*.*s", pstrlen_state, pstrlen_state, "INIT");
-                                        break;
+                                case 0:
+                                    sprintf(string, " %-*.*s", pstrlen_state, pstrlen_state, "INIT");
+                                    break;
 
-                                    case 1:
-                                        sprintf(string, " %-*.*s", pstrlen_state, pstrlen_state, "RUN");
-                                        break;
+                                case 1:
+                                    sprintf(string, " %-*.*s", pstrlen_state, pstrlen_state, "RUN");
+                                    break;
 
-                                    case 2:
-                                        sprintf(string, " %-*.*s", pstrlen_state, pstrlen_state, "PAUS");
-                                        break;
+                                case 2:
+                                    sprintf(string, " %-*.*s", pstrlen_state, pstrlen_state, "PAUS");
+                                    break;
 
-                                    case 3:
-                                        sprintf(string, " %-*.*s", pstrlen_state, pstrlen_state, "TERM");
-                                        break;
+                                case 3:
+                                    sprintf(string, " %-*.*s", pstrlen_state, pstrlen_state, "TERM");
+                                    break;
 
-                                    case 4:
-                                        sprintf(string, " %-*.*s", pstrlen_state, pstrlen_state, "ERR");
-                                        break;
+                                case 4:
+                                    sprintf(string, " %-*.*s", pstrlen_state, pstrlen_state, "ERR");
+                                    break;
 
-                                    case 5:
-                                        sprintf(string, " %-*.*s", pstrlen_state, pstrlen_state, "OFF");
-                                        break;
+                                case 5:
+                                    sprintf(string, " %-*.*s", pstrlen_state, pstrlen_state, "OFF");
+                                    break;
 
-                                    case 6:
-                                        sprintf(string, " %-*.*s", pstrlen_state, pstrlen_state, "CRASH");
-                                        break;
+                                case 6:
+                                    sprintf(string, " %-*.*s", pstrlen_state, pstrlen_state, "CRASH");
+                                    break;
 
-                                    default:
-                                        sprintf(string, " %-*.*s", pstrlen_state, pstrlen_state, "??");
+                                default:
+                                    sprintf(string, " %-*.*s", pstrlen_state, pstrlen_state, "??");
                                 }
                                 TUI_printfw("%s", string);
 
-
-
-                                if(procinfoproc.pinfoarray[pindex]->CTRLval == 0)
+                                if (procinfoproc.pinfoarray[pindex]->CTRLval == 0)
                                 {
                                     attron(COLOR_PAIR(2));
                                     TUI_printfw(" C%d", procinfoproc.pinfoarray[pindex]->CTRLval);
@@ -4456,27 +3978,21 @@ errno_t processinfo_CTRLscreen()
                                     TUI_printfw(" C%d", procinfoproc.pinfoarray[pindex]->CTRLval);
                                 }
 
-
-                                sprintf(string, " %02d:%02d:%02d.%03d",
-                                        procinfoproc.pinfodisp[pindex].createtime_hr,
+                                sprintf(string, " %02d:%02d:%02d.%03d", procinfoproc.pinfodisp[pindex].createtime_hr,
                                         procinfoproc.pinfodisp[pindex].createtime_min,
                                         procinfoproc.pinfodisp[pindex].createtime_sec,
                                         (int)(0.000001 * (procinfoproc.pinfodisp[pindex].createtime_ns)));
                                 TUI_printfw("%s", string);
 
-
-
                                 sprintf(string, " %-*.*s", pstrlen_tmux, pstrlen_tmux,
                                         procinfoproc.pinfoarray[pindex]->tmuxname);
                                 TUI_printfw("%s", string);
 
-
                                 sprintf(string, " %- *.*ld", pstrlen_loopcnt, pstrlen_loopcnt,
                                         procinfoproc.pinfoarray[pindex]->loopcnt -
-                                        procinfoproc.loopcntoffsetarray[pindex]);
+                                            procinfoproc.loopcntoffsetarray[pindex]);
                                 //if(procinfoproc.pinfoarray[pindex]->loopcnt == procinfoproc.loopcntarray[pindex])
-                                if(procinfoproc.pinfoarray[pindex]->loopcnt ==
-                                        procinfoproc.loopcntarray[pindex])
+                                if (procinfoproc.pinfoarray[pindex]->loopcnt == procinfoproc.loopcntarray[pindex])
                                 {
                                     // loopcnt has not changed
                                     TUI_printfw("%s", string);
@@ -4499,8 +4015,8 @@ errno_t processinfo_CTRLscreen()
 
                                 TUI_printfw(" | ");
 
-                                if((procinfoproc.pinfoarray[pindex]->loopstat == 4)
-                                        || (procinfoproc.pinfoarray[pindex]->loopstat == 6)) // ERROR or CRASH
+                                if ((procinfoproc.pinfoarray[pindex]->loopstat == 4) ||
+                                    (procinfoproc.pinfoarray[pindex]->loopstat == 6)) // ERROR or CRASH
                                 {
                                     attron(COLOR_PAIR(4));
                                 }
@@ -4509,22 +4025,19 @@ errno_t processinfo_CTRLscreen()
                                         procinfoproc.pinfoarray[pindex]->statusmsg);
                                 TUI_printfw("%s", string);
 
-                                if((procinfoproc.pinfoarray[pindex]->loopstat == 4)
-                                        || (procinfoproc.pinfoarray[pindex]->loopstat == 6)) // ERROR
+                                if ((procinfoproc.pinfoarray[pindex]->loopstat == 4) ||
+                                    (procinfoproc.pinfoarray[pindex]->loopstat == 6)) // ERROR
                                 {
                                     attroff(COLOR_PAIR(4));
                                 }
                             }
 
-
-
                             // ================ DISPLAY MODE PROCCTRL_DISPLAYMODE_RESOURCES ==================
-                            if(procinfoproc.DisplayMode == PROCCTRL_DISPLAYMODE_RESOURCES)
+                            if (procinfoproc.DisplayMode == PROCCTRL_DISPLAYMODE_RESOURCES)
                             {
                                 int cpu;
 
-
-                                if(procinfoproc.psysinfostatus[pindex] == -1)
+                                if (procinfoproc.psysinfostatus[pindex] == -1)
                                 {
                                     sprintf(string, " no process info available");
                                     TUI_printfw("%s", string);
@@ -4533,24 +4046,19 @@ errno_t processinfo_CTRLscreen()
                                 else
                                 {
 
-
                                     int spindex; // sub process index, 0 for main
-                                    for(spindex = 0; spindex < procinfoproc.pinfodisp[pindex].NBsubprocesses;
-                                            spindex++)
+                                    for (spindex = 0; spindex < procinfoproc.pinfodisp[pindex].NBsubprocesses;
+                                         spindex++)
                                     {
                                         //int TID; // thread ID
 
-
-
-                                        if(spindex > 0)
+                                        if (spindex > 0)
                                         {
                                             //TID = procinfoproc.pinfodisp[pindex].subprocPIDarray[spindex];
-                                            sprintf(string, " %*.*s %-*.*d %-*.*s",
-                                                    pstrlen_status, pstrlen_status, "|---",
-                                                    pstrlen_pid, pstrlen_pid,
+                                            sprintf(string, " %*.*s %-*.*d %-*.*s", pstrlen_status, pstrlen_status,
+                                                    "|---", pstrlen_pid, pstrlen_pid,
                                                     procinfoproc.pinfodisp[pindex].subprocPIDarray[spindex],
-                                                    pstrlen_pname, pstrlen_pname, procinfoproc.pinfodisp[pindex].name
-                                                   );
+                                                    pstrlen_pname, pstrlen_pname, procinfoproc.pinfodisp[pindex].name);
                                             TUI_printfw("%s", string);
                                         }
                                         else
@@ -4570,83 +4078,80 @@ errno_t processinfo_CTRLscreen()
                                         sprintf(string, " %2dx ", procinfoproc.pinfodisp[pindex].threads);
                                         TUI_printfw("%s", string);
 
-
                                         // Context Switches
 #ifdef CMDPROC_CONTEXTSWITCH
-                                        if(procinfoproc.pinfodisp[pindex].ctxtsw_nonvoluntary_prev[spindex] !=
-                                                procinfoproc.pinfodisp[pindex].ctxtsw_nonvoluntary[spindex])
+                                        if (procinfoproc.pinfodisp[pindex].ctxtsw_nonvoluntary_prev[spindex] !=
+                                            procinfoproc.pinfodisp[pindex].ctxtsw_nonvoluntary[spindex])
                                         {
                                             attron(COLOR_PAIR(4));
                                         }
-                                        else if(procinfoproc.pinfodisp[pindex].ctxtsw_voluntary_prev[spindex] !=
-                                                procinfoproc.pinfodisp[pindex].ctxtsw_voluntary[spindex])
+                                        else if (procinfoproc.pinfodisp[pindex].ctxtsw_voluntary_prev[spindex] !=
+                                                 procinfoproc.pinfodisp[pindex].ctxtsw_voluntary[spindex])
                                         {
                                             attron(COLOR_PAIR(3));
                                         }
 
                                         sprintf(string, " +%02ld +%02ld",
-                                                labs(procinfoproc.pinfodisp[pindex].ctxtsw_voluntary[spindex]    -
-                                                     procinfoproc.pinfodisp[pindex].ctxtsw_voluntary_prev[spindex]) % 100,
+                                                labs(procinfoproc.pinfodisp[pindex].ctxtsw_voluntary[spindex] -
+                                                     procinfoproc.pinfodisp[pindex].ctxtsw_voluntary_prev[spindex]) %
+                                                    100,
                                                 labs(procinfoproc.pinfodisp[pindex].ctxtsw_nonvoluntary[spindex] -
-                                                     procinfoproc.pinfodisp[pindex].ctxtsw_nonvoluntary_prev[spindex]) % 100
-                                               );
+                                                     procinfoproc.pinfodisp[pindex].ctxtsw_nonvoluntary_prev[spindex]) %
+                                                    100);
                                         TUI_printfw("%s", string);
 
-                                        if(procinfoproc.pinfodisp[pindex].ctxtsw_nonvoluntary_prev[spindex] !=
-                                                procinfoproc.pinfodisp[pindex].ctxtsw_nonvoluntary[spindex])
+                                        if (procinfoproc.pinfodisp[pindex].ctxtsw_nonvoluntary_prev[spindex] !=
+                                            procinfoproc.pinfodisp[pindex].ctxtsw_nonvoluntary[spindex])
                                         {
                                             attroff(COLOR_PAIR(4));
                                         }
-                                        else if(procinfoproc.pinfodisp[pindex].ctxtsw_voluntary_prev[spindex] !=
-                                                procinfoproc.pinfodisp[pindex].ctxtsw_voluntary[spindex])
+                                        else if (procinfoproc.pinfodisp[pindex].ctxtsw_voluntary_prev[spindex] !=
+                                                 procinfoproc.pinfodisp[pindex].ctxtsw_voluntary[spindex])
                                         {
                                             attroff(COLOR_PAIR(3));
                                         }
                                         TUI_printfw(" ");
 #endif
 
-
-
                                         // CPU use
 #ifdef CMDPROC_CPUUSE
                                         int cpuColor = 0;
 
                                         //					if(pinfodisp[pindex].subprocCPUloadarray[spindex]>5.0)
                                         cpuColor = 1;
-                                        if(procinfoproc.pinfodisp[pindex].subprocCPUloadarray_timeaveraged[spindex] >
-                                                10.0)
+                                        if (procinfoproc.pinfodisp[pindex].subprocCPUloadarray_timeaveraged[spindex] >
+                                            10.0)
                                         {
                                             cpuColor = 2;
                                         }
-                                        if(procinfoproc.pinfodisp[pindex].subprocCPUloadarray_timeaveraged[spindex] >
-                                                20.0)
+                                        if (procinfoproc.pinfodisp[pindex].subprocCPUloadarray_timeaveraged[spindex] >
+                                            20.0)
                                         {
                                             cpuColor = 3;
                                         }
-                                        if(procinfoproc.pinfodisp[pindex].subprocCPUloadarray_timeaveraged[spindex] >
-                                                40.0)
+                                        if (procinfoproc.pinfodisp[pindex].subprocCPUloadarray_timeaveraged[spindex] >
+                                            40.0)
                                         {
                                             cpuColor = 4;
                                         }
-                                        if(procinfoproc.pinfodisp[pindex].subprocCPUloadarray_timeaveraged[spindex] <
-                                                1.0)
+                                        if (procinfoproc.pinfodisp[pindex].subprocCPUloadarray_timeaveraged[spindex] <
+                                            1.0)
                                         {
                                             cpuColor = 5;
                                         }
 
-
                                         // First group of cores (physical CPU 0)
-                                        for(cpu = 0; cpu < procinfoproc.NBcpus / procinfoproc.NBcpusocket; cpu++)
+                                        for (cpu = 0; cpu < procinfoproc.NBcpus / procinfoproc.NBcpusocket; cpu++)
                                         {
                                             TUI_printfw("|");
 
-                                            if(procinfoproc.CPUids[cpu] ==
-                                                    procinfoproc.pinfodisp[pindex].processorarray[spindex])
+                                            if (procinfoproc.CPUids[cpu] ==
+                                                procinfoproc.pinfodisp[pindex].processorarray[spindex])
                                             {
                                                 attron(COLOR_PAIR(cpuColor));
                                             }
 
-                                            if(procinfoproc.pinfodisp[pindex].cpuOKarray[cpu] == 1)
+                                            if (procinfoproc.pinfodisp[pindex].cpuOKarray[cpu] == 1)
                                             {
                                                 TUI_printfw("%2d", procinfoproc.CPUids[cpu]);
                                             }
@@ -4655,9 +4160,8 @@ errno_t processinfo_CTRLscreen()
                                                 TUI_printfw("  ");
                                             }
 
-
-                                            if(procinfoproc.CPUids[cpu] ==
-                                                    procinfoproc.pinfodisp[pindex].processorarray[spindex])
+                                            if (procinfoproc.CPUids[cpu] ==
+                                                procinfoproc.pinfodisp[pindex].processorarray[spindex])
                                             {
                                                 attroff(COLOR_PAIR(cpuColor));
                                             }
@@ -4666,20 +4170,19 @@ errno_t processinfo_CTRLscreen()
                                         sprintf(string, "|    ");
                                         TUI_printfw("%s", string);
 
-
                                         // Second group of cores (physical CPU 0)
-                                        for(cpu = procinfoproc.NBcpus / procinfoproc.NBcpusocket;
-                                                cpu < procinfoproc.NBcpus; cpu++)
+                                        for (cpu = procinfoproc.NBcpus / procinfoproc.NBcpusocket;
+                                             cpu < procinfoproc.NBcpus; cpu++)
                                         {
                                             TUI_printfw("|");
 
-                                            if(procinfoproc.CPUids[cpu] ==
-                                                    procinfoproc.pinfodisp[pindex].processorarray[spindex])
+                                            if (procinfoproc.CPUids[cpu] ==
+                                                procinfoproc.pinfodisp[pindex].processorarray[spindex])
                                             {
                                                 attron(COLOR_PAIR(cpuColor));
                                             }
 
-                                            if(procinfoproc.pinfodisp[pindex].cpuOKarray[cpu] == 1)
+                                            if (procinfoproc.pinfodisp[pindex].cpuOKarray[cpu] == 1)
                                             {
                                                 TUI_printfw("%2d", procinfoproc.CPUids[cpu]);
                                             }
@@ -4688,24 +4191,23 @@ errno_t processinfo_CTRLscreen()
                                                 TUI_printfw("  ");
                                             }
 
-                                            if(procinfoproc.CPUids[cpu] ==
-                                                    procinfoproc.pinfodisp[pindex].processorarray[spindex])
+                                            if (procinfoproc.CPUids[cpu] ==
+                                                procinfoproc.pinfodisp[pindex].processorarray[spindex])
                                             {
                                                 attroff(COLOR_PAIR(cpuColor));
                                             }
                                         }
                                         TUI_printfw("| ");
 
-
                                         attron(COLOR_PAIR(cpuColor));
-                                        sprintf(string, "%5.1f %6.2f",
-                                                procinfoproc.pinfodisp[pindex].subprocCPUloadarray[spindex],
-                                                procinfoproc.pinfodisp[pindex].subprocCPUloadarray_timeaveraged[spindex]);
+                                        sprintf(
+                                            string, "%5.1f %6.2f",
+                                            procinfoproc.pinfodisp[pindex].subprocCPUloadarray[spindex],
+                                            procinfoproc.pinfodisp[pindex].subprocCPUloadarray_timeaveraged[spindex]);
                                         TUI_printfw("%s", string);
                                         attroff(COLOR_PAIR(cpuColor));
 #endif
 
-
                                         // Memory use
 #ifdef CMDPROC_MEMUSE
                                         int memColor = 0;
@@ -4721,20 +4223,19 @@ errno_t processinfo_CTRLscreen()
 
                                         //if(pinfodisp[pindex].subprocMEMloadarray[spindex]>0.5)
                                         memColor = 1;
-                                        if(procinfoproc.pinfodisp[pindex].VmRSSarray[spindex] > 10 * 1024)      // 10 MB
+                                        if (procinfoproc.pinfodisp[pindex].VmRSSarray[spindex] > 10 * 1024) // 10 MB
                                         {
                                             memColor = 2;
                                         }
-                                        if(procinfoproc.pinfodisp[pindex].VmRSSarray[spindex] > 100 *
-                                                1024)     // 100 MB
+                                        if (procinfoproc.pinfodisp[pindex].VmRSSarray[spindex] > 100 * 1024) // 100 MB
                                         {
                                             memColor = 3;
                                         }
-                                        if(procinfoproc.pinfodisp[pindex].VmRSSarray[spindex] > 1024 * 1024)    // 1 GB
+                                        if (procinfoproc.pinfodisp[pindex].VmRSSarray[spindex] > 1024 * 1024) // 1 GB
                                         {
                                             memColor = 4;
                                         }
-                                        if(procinfoproc.pinfodisp[pindex].VmRSSarray[spindex] < 1024)           // 1 MB
+                                        if (procinfoproc.pinfodisp[pindex].VmRSSarray[spindex] < 1024) // 1 MB
                                         {
                                             memColor = 5;
                                         }
@@ -4742,7 +4243,7 @@ errno_t processinfo_CTRLscreen()
                                         TUI_printfw(" ");
 
                                         attron(COLOR_PAIR(memColor));
-                                        if(GBcnt > 0)
+                                        if (GBcnt > 0)
                                         {
                                             sprintf(string, "%3d GB ", GBcnt);
                                             TUI_printfw("%s", string);
@@ -4753,7 +4254,7 @@ errno_t processinfo_CTRLscreen()
                                             TUI_printfw("%s", string);
                                         }
 
-                                        if(MBcnt > 0)
+                                        if (MBcnt > 0)
                                         {
                                             sprintf(string, "%4d MB ", MBcnt);
                                             TUI_printfw("%s", string);
@@ -4764,7 +4265,7 @@ errno_t processinfo_CTRLscreen()
                                             TUI_printfw("%s", string);
                                         }
 
-                                        if(kBcnt > 0)
+                                        if (kBcnt > 0)
                                         {
                                             sprintf(string, "%4d kB ", kBcnt);
                                             TUI_printfw("%s", string);
@@ -4777,69 +4278,61 @@ errno_t processinfo_CTRLscreen()
                                         attroff(COLOR_PAIR(memColor));
 #endif
 
-                                        if(pindex == pindexSelected)
+                                        if (pindex == pindexSelected)
                                         {
                                             attroff(A_REVERSE);
                                         }
 
                                         TUI_newline();
                                     }
-                                    if(procinfoproc.pinfodisp[pindex].NBsubprocesses == 0)
+                                    if (procinfoproc.pinfodisp[pindex].NBsubprocesses == 0)
                                     {
                                         TUI_printfw("  ERROR: procinfoproc.pinfodisp[pindex].NBsubprocesses = %d",
-                                                    (int) procinfoproc.pinfodisp[pindex].NBsubprocesses);
+                                                    (int)procinfoproc.pinfodisp[pindex].NBsubprocesses);
                                         TUI_newline();
 
-                                        if(pindex == pindexSelected)
+                                        if (pindex == pindexSelected)
                                         {
                                             attroff(A_REVERSE);
                                         }
                                     }
-
                                 }
-
-
                             }
 
-
-
                             // ================ DISPLAY MODE PROCCTRL_DISPLAYMODE_TRIGGER ==================
-                            if(procinfoproc.DisplayMode == PROCCTRL_DISPLAYMODE_TRIGGER)
+                            if (procinfoproc.DisplayMode == PROCCTRL_DISPLAYMODE_TRIGGER)
                             {
-                                TUI_printfw("%*d ", pstrlen_inode,
-                                            procinfoproc.pinfoarray[pindex]->triggerstreaminode);
+                                TUI_printfw("%*d ", pstrlen_inode, procinfoproc.pinfoarray[pindex]->triggerstreaminode);
                                 TUI_printfw("%*s ", pstrlen_trigstreamname,
                                             procinfoproc.pinfoarray[pindex]->triggerstreamname);
 
-                                switch(procinfoproc.pinfoarray[pindex]->triggermode)
+                                switch (procinfoproc.pinfoarray[pindex]->triggermode)
                                 {
 
-                                    case PROCESSINFO_TRIGGERMODE_IMMEDIATE :
-                                        TUI_printfw("%2d:IMME ", procinfoproc.pinfoarray[pindex]->triggermode);
-                                        break;
+                                case PROCESSINFO_TRIGGERMODE_IMMEDIATE:
+                                    TUI_printfw("%2d:IMME ", procinfoproc.pinfoarray[pindex]->triggermode);
+                                    break;
 
-                                    case PROCESSINFO_TRIGGERMODE_CNT0 :
-                                        TUI_printfw("%2d:CNT0 ", procinfoproc.pinfoarray[pindex]->triggermode);
-                                        break;
+                                case PROCESSINFO_TRIGGERMODE_CNT0:
+                                    TUI_printfw("%2d:CNT0 ", procinfoproc.pinfoarray[pindex]->triggermode);
+                                    break;
 
-                                    case PROCESSINFO_TRIGGERMODE_CNT1 :
-                                        TUI_printfw("%2d:CNT1 ", procinfoproc.pinfoarray[pindex]->triggermode);
-                                        break;
+                                case PROCESSINFO_TRIGGERMODE_CNT1:
+                                    TUI_printfw("%2d:CNT1 ", procinfoproc.pinfoarray[pindex]->triggermode);
+                                    break;
 
-                                    case PROCESSINFO_TRIGGERMODE_SEMAPHORE :
-                                        TUI_printfw("%2d:sem%01d ",
-                                                    procinfoproc.pinfoarray[pindex]->triggermode,
-                                                    procinfoproc.pinfoarray[pindex]->triggersem
-                                                   );
+                                case PROCESSINFO_TRIGGERMODE_SEMAPHORE:
+                                    TUI_printfw("%2d:sem%01d ", procinfoproc.pinfoarray[pindex]->triggermode,
+                                                procinfoproc.pinfoarray[pindex]->triggersem);
 
-                                        break;
+                                    break;
 
-                                    case PROCESSINFO_TRIGGERMODE_DELAY :
-                                        TUI_printfw("%2d:DELA ", procinfoproc.pinfoarray[pindex]->triggermode);
-                                        break;
+                                case PROCESSINFO_TRIGGERMODE_DELAY:
+                                    TUI_printfw("%2d:DELA ", procinfoproc.pinfoarray[pindex]->triggermode);
+                                    break;
 
-                                    default :
-                                        TUI_printfw("%2d:UNKN ",  procinfoproc.pinfoarray[pindex]->triggermode);
+                                default:
+                                    TUI_printfw("%2d:UNKN ", procinfoproc.pinfoarray[pindex]->triggermode);
                                 }
 
                                 TUI_printfw("  %*d ", pstrlen_missedfr,
@@ -4850,11 +4343,10 @@ errno_t processinfo_CTRLscreen()
                                             procinfoproc.pinfoarray[pindex]->trigggertimeoutcnt);
                             }
 
-
                             // ================ DISPLAY MODE PROCCTRL_DISPLAYMODE_TIMING ==================
-                            if(procinfoproc.DisplayMode == PROCCTRL_DISPLAYMODE_TIMING)
+                            if (procinfoproc.DisplayMode == PROCCTRL_DISPLAYMODE_TIMING)
                             {
-                                if(procinfoproc.pinfoarray[pindex]->MeasureTiming == 1)
+                                if (procinfoproc.pinfoarray[pindex]->MeasureTiming == 1)
                                 {
                                     TUI_printfw(" ON");
                                 }
@@ -4863,25 +4355,24 @@ errno_t processinfo_CTRLscreen()
                                     TUI_printfw("OFF");
                                 }
 
-                                if(procinfoproc.pinfoarray[pindex]->MeasureTiming == 1)
+                                if (procinfoproc.pinfoarray[pindex]->MeasureTiming == 1)
                                 {
                                     long *dtiter_array;
                                     long *dtexec_array;
                                     //int dtindex;
 
-
                                     TUI_printfw(" %3d ..%02ld  ", procinfoproc.pinfoarray[pindex]->timerindex,
                                                 procinfoproc.pinfoarray[pindex]->timingbuffercnt % 100);
 
                                     // compute timing stat
-                                    dtiter_array = (long *) malloc(sizeof(long) * (PROCESSINFO_NBtimer - 1));
-                                    if(dtiter_array == NULL)
+                                    dtiter_array = (long *)malloc(sizeof(long) * (PROCESSINFO_NBtimer - 1));
+                                    if (dtiter_array == NULL)
                                     {
                                         PRINT_ERROR("malloc returns NULL pointer");
                                         abort();
                                     }
-                                    dtexec_array = (long *) malloc(sizeof(long) * (PROCESSINFO_NBtimer - 1));
-                                    if(dtexec_array == NULL)
+                                    dtexec_array = (long *)malloc(sizeof(long) * (PROCESSINFO_NBtimer - 1));
+                                    if (dtexec_array == NULL)
                                     {
                                         PRINT_ERROR("malloc returns NULL pointer");
                                         abort();
@@ -4891,44 +4382,44 @@ errno_t processinfo_CTRLscreen()
                                     //dtindex = 0;
 
                                     // we exclude the current timerindex, as timers may not all be written
-                                    for(tindex = 0; tindex < PROCESSINFO_NBtimer - 1; tindex++)
+                                    for (tindex = 0; tindex < PROCESSINFO_NBtimer - 1; tindex++)
                                     {
                                         int ti0, ti1;
 
                                         ti1 = procinfoproc.pinfoarray[pindex]->timerindex - tindex;
                                         ti0 = ti1 - 1;
 
-                                        if(ti0 < 0)
+                                        if (ti0 < 0)
                                         {
                                             ti0 += PROCESSINFO_NBtimer;
                                         }
 
-                                        if(ti1 < 0)
+                                        if (ti1 < 0)
                                         {
                                             ti1 += PROCESSINFO_NBtimer;
                                         }
 
-                                        dtiter_array[tindex] = (procinfoproc.pinfoarray[pindex]->texecstart[ti1].tv_nsec
-                                                                - procinfoproc.pinfoarray[pindex]->texecstart[ti0].tv_nsec) + 1000000000 *
-                                                               (procinfoproc.pinfoarray[pindex]->texecstart[ti1].tv_sec -
-                                                                procinfoproc.pinfoarray[pindex]->texecstart[ti0].tv_sec);
-
-                                        dtexec_array[tindex] = (procinfoproc.pinfoarray[pindex]->texecend[ti0].tv_nsec -
-                                                                procinfoproc.pinfoarray[pindex]->texecstart[ti0].tv_nsec) + 1000000000 *
-                                                               (procinfoproc.pinfoarray[pindex]->texecend[ti0].tv_sec -
-                                                                procinfoproc.pinfoarray[pindex]->texecstart[ti0].tv_sec);
+                                        dtiter_array[tindex] =
+                                            (procinfoproc.pinfoarray[pindex]->texecstart[ti1].tv_nsec -
+                                             procinfoproc.pinfoarray[pindex]->texecstart[ti0].tv_nsec) +
+                                            1000000000 * (procinfoproc.pinfoarray[pindex]->texecstart[ti1].tv_sec -
+                                                          procinfoproc.pinfoarray[pindex]->texecstart[ti0].tv_sec);
+
+                                        dtexec_array[tindex] =
+                                            (procinfoproc.pinfoarray[pindex]->texecend[ti0].tv_nsec -
+                                             procinfoproc.pinfoarray[pindex]->texecstart[ti0].tv_nsec) +
+                                            1000000000 * (procinfoproc.pinfoarray[pindex]->texecend[ti0].tv_sec -
+                                                          procinfoproc.pinfoarray[pindex]->texecstart[ti0].tv_sec);
                                     }
 
-
-
                                     quick_sort_long(dtiter_array, PROCESSINFO_NBtimer - 1);
                                     quick_sort_long(dtexec_array, PROCESSINFO_NBtimer - 1);
 
                                     int colorcode;
 
-                                    if(procinfoproc.pinfoarray[pindex]->dtiter_limit_enable != 0)
+                                    if (procinfoproc.pinfoarray[pindex]->dtiter_limit_enable != 0)
                                     {
-                                        if(procinfoproc.pinfoarray[pindex]->dtiter_limit_cnt == 0)
+                                        if (procinfoproc.pinfoarray[pindex]->dtiter_limit_cnt == 0)
                                         {
                                             colorcode = COLOR_PAIR(2);
                                         }
@@ -4942,16 +4433,16 @@ errno_t processinfo_CTRLscreen()
                                                 procinfoproc.pinfoarray[pindex]->dtiter_limit_enable,
                                                 (long)(0.001 * procinfoproc.pinfoarray[pindex]->dtiter_limit_value),
                                                 procinfoproc.pinfoarray[pindex]->dtiter_limit_cnt);
-                                    if(procinfoproc.pinfoarray[pindex]->dtiter_limit_enable != 0)
+                                    if (procinfoproc.pinfoarray[pindex]->dtiter_limit_enable != 0)
                                     {
                                         attroff(colorcode);
                                     }
 
                                     TUI_printfw("  ");
 
-                                    if(procinfoproc.pinfoarray[pindex]->dtexec_limit_enable != 0)
+                                    if (procinfoproc.pinfoarray[pindex]->dtexec_limit_enable != 0)
                                     {
-                                        if(procinfoproc.pinfoarray[pindex]->dtexec_limit_cnt == 0)
+                                        if (procinfoproc.pinfoarray[pindex]->dtexec_limit_cnt == 0)
                                         {
                                             colorcode = COLOR_PAIR(2);
                                         }
@@ -4966,18 +4457,17 @@ errno_t processinfo_CTRLscreen()
                                                 procinfoproc.pinfoarray[pindex]->dtexec_limit_enable,
                                                 (long)(0.001 * procinfoproc.pinfoarray[pindex]->dtexec_limit_value),
                                                 procinfoproc.pinfoarray[pindex]->dtexec_limit_cnt);
-                                    if(procinfoproc.pinfoarray[pindex]->dtexec_limit_enable != 0)
+                                    if (procinfoproc.pinfoarray[pindex]->dtexec_limit_enable != 0)
                                     {
                                         attroff(colorcode);
                                     }
 
-
                                     float tval;
 
                                     tval = 0.001 * dtiter_array[(long)(0.5 * PROCESSINFO_NBtimer)];
-                                    procinfoproc.pinfoarray[pindex]->dtmedian_iter_ns = dtiter_array[(long)(
-                                                0.5 * PROCESSINFO_NBtimer)];
-                                    if(tval > 9999.9)
+                                    procinfoproc.pinfoarray[pindex]->dtmedian_iter_ns =
+                                        dtiter_array[(long)(0.5 * PROCESSINFO_NBtimer)];
+                                    if (tval > 9999.9)
                                     {
                                         TUI_printfw(" ITER    >10ms ");
                                     }
@@ -4987,7 +4477,7 @@ errno_t processinfo_CTRLscreen()
                                     }
 
                                     tval = 0.001 * dtiter_array[0];
-                                    if(tval > 9999.9)
+                                    if (tval > 9999.9)
                                     {
                                         TUI_printfw("[   >10ms -");
                                     }
@@ -4997,7 +4487,7 @@ errno_t processinfo_CTRLscreen()
                                     }
 
                                     tval = 0.001 * dtiter_array[PROCESSINFO_NBtimer - 2];
-                                    if(tval > 9999.9)
+                                    if (tval > 9999.9)
                                     {
                                         TUI_printfw("    >10ms ]");
                                     }
@@ -5006,11 +4496,10 @@ errno_t processinfo_CTRLscreen()
                                         TUI_printfw(" %6.1fus ]", tval);
                                     }
 
-
                                     tval = 0.001 * dtexec_array[(long)(0.5 * PROCESSINFO_NBtimer)];
-                                    procinfoproc.pinfoarray[pindex]->dtmedian_exec_ns = dtexec_array[(long)(
-                                                0.5 * PROCESSINFO_NBtimer)];
-                                    if(tval > 9999.9)
+                                    procinfoproc.pinfoarray[pindex]->dtmedian_exec_ns =
+                                        dtexec_array[(long)(0.5 * PROCESSINFO_NBtimer)];
+                                    if (tval > 9999.9)
                                     {
                                         TUI_printfw(" EXEC    >10ms ");
                                     }
@@ -5020,7 +4509,7 @@ errno_t processinfo_CTRLscreen()
                                     }
 
                                     tval = 0.001 * dtexec_array[0];
-                                    if(tval > 9999.9)
+                                    if (tval > 9999.9)
                                     {
                                         TUI_printfw("[   >10ms -");
                                     }
@@ -5030,7 +4519,7 @@ errno_t processinfo_CTRLscreen()
                                     }
 
                                     tval = 0.001 * dtexec_array[PROCESSINFO_NBtimer - 2];
-                                    if(tval > 9999.9)
+                                    if (tval > 9999.9)
                                     {
                                         TUI_printfw("    >10ms ]");
                                     }
@@ -5039,137 +4528,106 @@ errno_t processinfo_CTRLscreen()
                                         TUI_printfw(" %6.1fus ]", tval);
                                     }
 
-
                                     //	TUI_printfw(" ITER %9.3fus [%9.3f - %9.3f] ", 0.001*dtiter_array[(long) (0.5*PROCESSINFO_NBtimer)], 0.001*dtiter_array[0], 0.001*dtiter_array[PROCESSINFO_NBtimer-2]);
 
-
-
-
-
                                     //	TUI_printfw(" EXEC %9.3fus [%9.3f - %9.3f] ", 0.001*dtexec_array[(long) (0.5*PROCESSINFO_NBtimer)], 0.001*dtexec_array[0], 0.001*dtexec_array[PROCESSINFO_NBtimer-2]);
 
-
                                     TUI_printfw("  busy = %6.2f %%",
-                                                100.0 * dtexec_array[(long)(0.5 * PROCESSINFO_NBtimer)] / (dtiter_array[(long)(
-                                                            0.5 * PROCESSINFO_NBtimer)] + 1));
+                                                100.0 * dtexec_array[(long)(0.5 * PROCESSINFO_NBtimer)] /
+                                                    (dtiter_array[(long)(0.5 * PROCESSINFO_NBtimer)] + 1));
 
                                     free(dtiter_array);
                                     free(dtexec_array);
-
                                 }
                             }
 
-
-                            if(pindex == pindexSelected)
+                            if (pindex == pindexSelected)
                             {
                                 attroff(A_REVERSE);
                             }
                         }
-
                     }
 
-                    if((procinfoproc.DisplayMode == PROCCTRL_DISPLAYMODE_CTRL)
-                            || (procinfoproc.DisplayMode == PROCCTRL_DISPLAYMODE_TRIGGER)
-                            || (procinfoproc.DisplayMode == PROCCTRL_DISPLAYMODE_TIMING))
+                    if ((procinfoproc.DisplayMode == PROCCTRL_DISPLAYMODE_CTRL) ||
+                        (procinfoproc.DisplayMode == PROCCTRL_DISPLAYMODE_TRIGGER) ||
+                        (procinfoproc.DisplayMode == PROCCTRL_DISPLAYMODE_TIMING))
                     {
                         TUI_newline();
                     }
-
-
-
-
-
-
                 }
             }
 
-
-
             clock_gettime(CLOCK_REALTIME, &t06loop);
 
-
             DEBUG_TRACEPOINT(" ");
 
             clock_gettime(CLOCK_REALTIME, &t07loop);
 
             cnt++;
 
-
-
             clock_gettime(CLOCK_REALTIME, &t2loop);
 
             tdiff = timespec_diff(t1loop, t2loop);
             double tdiffvloop = 1.0 * tdiff.tv_sec + 1.0e-9 * tdiff.tv_nsec;
 
             TUI_newline();
-            TUI_printfw("Loop time = %9.8f s  ( max rate = %7.2f Hz)", tdiffvloop,
-                        1.0 / tdiffvloop);
+            TUI_printfw("Loop time = %9.8f s  ( max rate = %7.2f Hz)", tdiffvloop, 1.0 / tdiffvloop);
             TUI_newline();
 
             refresh();
         }
 
-
-
-        if((data.signal_TERM == 1) || (data.signal_INT == 1) || (data.signal_ABRT == 1)
-                || (data.signal_BUS == 1) || (data.signal_SEGV == 1) || (data.signal_HUP == 1)
-                || (data.signal_PIPE == 1))
+        if ((data.signal_TERM == 1) || (data.signal_INT == 1) || (data.signal_ABRT == 1) || (data.signal_BUS == 1) ||
+            (data.signal_SEGV == 1) || (data.signal_HUP == 1) || (data.signal_PIPE == 1))
         {
             loopOK = 0;
         }
-
     }
     endwin();
 
-
-
     // Why did we exit ?
 
     printf("loopOK = 0 -> exit\n");
 
-
-    if(Xexit == 1)    // normal exit
+    if (Xexit == 1) // normal exit
     {
         printf("[%4d] User typed x -> exiting\n", __LINE__);
     }
-    else if(data.signal_TERM == 1)
+    else if (data.signal_TERM == 1)
     {
         printf("[%4d] Received signal TERM\n", __LINE__);
     }
-    else if(data.signal_INT == 1)
+    else if (data.signal_INT == 1)
     {
         printf("[%4d] Received signal INT\n", __LINE__);
     }
-    else if(data.signal_ABRT == 1)
+    else if (data.signal_ABRT == 1)
     {
         printf("[%4d] Received signal ABRT\n", __LINE__);
     }
-    else if(data.signal_BUS == 1)
+    else if (data.signal_BUS == 1)
     {
         printf("[%4d] Received signal BUS\n", __LINE__);
     }
-    else if(data.signal_SEGV == 1)
+    else if (data.signal_SEGV == 1)
     {
         printf("[%4d] Received signal SEGV\n", __LINE__);
     }
-    else if(data.signal_HUP == 1)
+    else if (data.signal_HUP == 1)
     {
         printf("[%4d] Received signal HUP\n", __LINE__);
     }
-    else if(data.signal_PIPE == 1)
+    else if (data.signal_PIPE == 1)
     {
         printf("[%4d] Received signal PIPE\n", __LINE__);
     }
 
-
     procinfoproc.loop = 0;
 
-
-
     int *line;
     int ret = -1;
 
-    while(ret != 0)
+    while (ret != 0)
     {
         ret = pthread_tryjoin_np(threadscan, (void **)&line);
         /*
@@ -5180,22 +4638,16 @@ errno_t processinfo_CTRLscreen()
         usleep(10000);
     }
 
-
-
-
     // cleanup
-    for(pindex = 0; pindex < procinfoproc.NBpinfodisp; pindex++)
+    for (pindex = 0; pindex < procinfoproc.NBpinfodisp; pindex++)
     {
-        if(procinfoproc.pinfommapped[pindex] == 1)
+        if (procinfoproc.pinfommapped[pindex] == 1)
         {
-            processinfo_shm_close(procinfoproc.pinfoarray[pindex],
-                                  procinfoproc.fdarray[pindex]);
+            processinfo_shm_close(procinfoproc.pinfoarray[pindex], procinfoproc.fdarray[pindex]);
             procinfoproc.pinfommapped[pindex] = 0;
         }
-
     }
 
-
     free(procinfoproc.pinfodisp);
 
     free(CPUsetList);
@@ -5204,6 +4656,5 @@ errno_t processinfo_CTRLscreen()
     dup2(backstderr, STDERR_FILENO);
     close(backstderr);
 
-
     return RETURN_SUCCESS;
 }
diff --git a/src/CommandLineInterface/processinfo.h b/src/CommandLineInterface/processinfo.h
index 29bb042c..a2f4cfd3 100644
--- a/src/CommandLineInterface/processinfo.h
+++ b/src/CommandLineInterface/processinfo.h
@@ -5,20 +5,16 @@
  *
  */
 
-
 #ifndef _PROCESSINFO_H
 #define _PROCESSINFO_H
 
-
-
-#define STRINGMAXLEN_PROCESSINFO_NAME          80
-#define STRINGMAXLEN_PROCESSINFO_SRCFUNC      200
-#define STRINGMAXLEN_PROCESSINFO_SRCFILE      200
-#define STRINGMAXLEN_PROCESSINFO_TMUXNAME     100
-#define STRINGMAXLEN_PROCESSINFO_STATUSMSG    200
-#define STRINGMAXLEN_PROCESSINFO_LOGFILENAME  250
-#define STRINGMAXLEN_PROCESSINFO_DESCRIPTION  200
-
+#define STRINGMAXLEN_PROCESSINFO_NAME 80
+#define STRINGMAXLEN_PROCESSINFO_SRCFUNC 200
+#define STRINGMAXLEN_PROCESSINFO_SRCFILE 200
+#define STRINGMAXLEN_PROCESSINFO_TMUXNAME 100
+#define STRINGMAXLEN_PROCESSINFO_STATUSMSG 200
+#define STRINGMAXLEN_PROCESSINFO_LOGFILENAME 250
+#define STRINGMAXLEN_PROCESSINFO_DESCRIPTION 200
 
 // timing info for real-time loop processes
 #define PROCESSINFO_NBtimer 100
@@ -37,19 +33,19 @@
  */
 typedef struct
 {
-    char name[STRINGMAXLEN_PROCESSINFO_NAME];             /// process name (human-readable)
+    char name[STRINGMAXLEN_PROCESSINFO_NAME]; /// process name (human-readable)
 
-    char source_FUNCTION[STRINGMAXLEN_PROCESSINFO_SRCFUNC];  /// source code function
-    char source_FILE[STRINGMAXLEN_PROCESSINFO_SRCFILE];      /// source code file
-    int  source_LINE;            /// source code line
+    char source_FUNCTION[STRINGMAXLEN_PROCESSINFO_SRCFUNC]; /// source code function
+    char source_FILE[STRINGMAXLEN_PROCESSINFO_SRCFILE];     /// source code file
+    int source_LINE;                                        /// source code line
 
-    pid_t PID;                  /// process ID; file name is /tmp/proc.PID.shm
+    pid_t PID; /// process ID; file name is /tmp/proc.PID.shm
 
-    struct timespec createtime;  // time at which pinfo was created
+    struct timespec createtime; // time at which pinfo was created
 
     long loopcnt;    // counter, useful for loop processes to monitor activity
     long loopcntMax; // exit loop if loopcnt = loopcntMax. Set to -1 for infinite loop
-    int  CTRLval;     // control value to be externally written.
+    int CTRLval;     // control value to be externally written.
     // 0: run                     (default)
     // 1: pause
     // 2: increment single step (will go back to 1)
@@ -68,56 +64,51 @@ typedef struct
     // 5: SPINNING   do not compute (loop iterates, but does not compute. output stream(s) will still be posted/incremented)
     // 6: CRASHED    pid has gone away without proper exit sequence. Will attempt to generate exit log file (using atexit) to identify crash location
 
-    char statusmsg[STRINGMAXLEN_PROCESSINFO_STATUSMSG];  // status message
-    int  statuscode;       // status code
+    char statusmsg[STRINGMAXLEN_PROCESSINFO_STATUSMSG]; // status message
+    int statuscode;                                     // status code
 
     FILE *logFile;
-    char  logfilename[STRINGMAXLEN_PROCESSINFO_LOGFILENAME];
-
-
+    char logfilename[STRINGMAXLEN_PROCESSINFO_LOGFILENAME];
 
     // OPTIONAL INPUT STREAM SETUP
     // Used to specify which stream will trigger the computation and track trigger state
     // Enables use of function processinfo_waitoninputstream()
     // Enables streamproctrace entry
     // Must be inialized by processinfo_waitoninputstream_init()
-    int       triggermode;                    // see TRIGGERMODE codes
-    imageID   triggerstreamID;                // -1 if not initialized
-    ino_t     triggerstreaminode;
-    char      triggerstreamname[STRINGMAXLEN_IMAGE_NAME];
-    int       triggersem;                     // semaphore index
-    uint64_t  triggerstreamcnt;               // previous value of trigger counter, updates on trigger
-    struct timespec triggerdelay;            // for PROCESSINFO_TRIGGERMODE_DELAY
-    struct timespec triggertimeout;          // how long to wait until trigger ?
-    uint64_t  trigggertimeoutcnt;
-    int       triggermissedframe;               // have we missed any frame, if yes how many ?
+    int triggermode;         // see TRIGGERMODE codes
+    imageID triggerstreamID; // -1 if not initialized
+    ino_t triggerstreaminode;
+    char triggerstreamname[STRINGMAXLEN_IMAGE_NAME];
+    int triggersem;                 // semaphore index
+    uint64_t triggerstreamcnt;      // previous value of trigger counter, updates on trigger
+    struct timespec triggerdelay;   // for PROCESSINFO_TRIGGERMODE_DELAY
+    struct timespec triggertimeout; // how long to wait until trigger ?
+    uint64_t trigggertimeoutcnt;
+    int triggermissedframe; // have we missed any frame, if yes how many ?
     //  0  : no missed frame, loop has been waiting for semaphore to be posted
     //  1  : no missed frame, but semaphore was already posted and at 1 when triggering
     //  2+ : frame(s) missed
-    uint64_t  triggermissedframe_cumul;      // cumulative missed frames
-    int       triggerstatus;   // see TRIGGERSTATUS codes
-
+    uint64_t triggermissedframe_cumul; // cumulative missed frames
+    int triggerstatus;                 // see TRIGGERSTATUS codes
 
-
-    int RT_priority;    // -1 if unused. 0-99 for higher priority
+    int RT_priority; // -1 if unused. 0-99 for higher priority
     cpu_set_t CPUmask;
 
-
     // OPTIONAL TIMING MEASUREMENT
     // Used to measure how long loop process takes to complete task
     // Provides means to stop/pause loop process if timing constraints exceeded
     //
-    int MeasureTiming;  // 1 if timing is measured, 0 otherwise
+    int MeasureTiming; // 1 if timing is measured, 0 otherwise
 
     // the last PROCESSINFO_NBtimer times are stored in a circular buffer, from
     // which timing stats are derived
-    int    timerindex;       // last written index in circular buffer
-    int    timingbuffercnt;  // increments every cycle of the circular buffer
-    struct timespec texecstart[PROCESSINFO_NBtimer];  // task starts
-    struct timespec texecend[PROCESSINFO_NBtimer];    // task ends
+    int timerindex;                                  // last written index in circular buffer
+    int timingbuffercnt;                             // increments every cycle of the circular buffer
+    struct timespec texecstart[PROCESSINFO_NBtimer]; // task starts
+    struct timespec texecend[PROCESSINFO_NBtimer];   // task ends
 
-    long dtmedian_iter_ns;  // median time offset between iterations [nanosec]
-    long dtmedian_exec_ns;  // median compute/busy time [nanosec]
+    long dtmedian_iter_ns; // median time offset between iterations [nanosec]
+    long dtmedian_exec_ns; // median compute/busy time [nanosec]
 
     // If enabled=1, pause process if dtiter larger than limit
     int dtiter_limit_enable;
@@ -129,13 +120,8 @@ typedef struct
     long dtexec_limit_value;
     long dtexec_limit_cnt;
 
-
     char description[STRINGMAXLEN_PROCESSINFO_DESCRIPTION];
 
 } PROCESSINFO;
 
-
-
-
-
 #endif
diff --git a/src/CommandLineInterface/processtools.h b/src/CommandLineInterface/processtools.h
index e8d350f4..74392960 100644
--- a/src/CommandLineInterface/processtools.h
+++ b/src/CommandLineInterface/processtools.h
@@ -17,6 +17,7 @@
 #ifndef _PROCESSTOOLS_H
 #define _PROCESSTOOLS_H
 
+#include <sched.h>
 #include <semaphore.h>
 #include <signal.h>
 #include <stdint.h>
@@ -24,32 +25,19 @@
 #include <stdlib.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include <sched.h>
 
 #include "processinfo.h"
 #include "processtools_trigger.h"
 
-
-
 #define PROCESSINFOLISTSIZE 10000
 
-
 #define MAXNBSUBPROCESS 50
 #define MAXNBCPU 100
 
-
-
-
-
 #ifndef __STDC_LIB_EXT1__
 typedef int errno_t;
 #endif
 
-
-
-
-
-
 //
 // This structure maintains a list of active processes
 // It is used to quickly build (without scanning directory) an array of
@@ -58,84 +46,75 @@ typedef int errno_t;
 typedef struct
 {
     pid_t PIDarray[PROCESSINFOLISTSIZE];
-    int   active[PROCESSINFOLISTSIZE];
-    char  pnamearray[PROCESSINFOLISTSIZE][STRINGMAXLEN_PROCESSINFO_NAME];  // short name
+    int active[PROCESSINFOLISTSIZE];
+    char pnamearray[PROCESSINFOLISTSIZE][STRINGMAXLEN_PROCESSINFO_NAME]; // short name
 
 } PROCESSINFOLIST;
 
-
-
 typedef struct
 {
-    int           active;
-    pid_t         PID;
-    char          name[40];
-    long          updatecnt;
-
-    long          loopcnt;
-    int           loopstat;
+    int active;
+    pid_t PID;
+    char name[40];
+    long updatecnt;
 
-    int           createtime_hr;
-    int           createtime_min;
-    int           createtime_sec;
-    long          createtime_ns;
+    long loopcnt;
+    int loopstat;
 
-    char          cpuset[16];       /**< cpuset name  */
-    char          cpusallowed[20];
-    int           cpuOKarray[MAXNBCPU];
-    int           threads;
+    int createtime_hr;
+    int createtime_min;
+    int createtime_sec;
+    long createtime_ns;
 
-    int           rt_priority;
-    float         memload;
+    char cpuset[16]; /**< cpuset name  */
+    char cpusallowed[20];
+    int cpuOKarray[MAXNBCPU];
+    int threads;
 
-    char          statusmsg[200];
-    char          tmuxname[100];
+    int rt_priority;
+    float memload;
 
-    int           NBsubprocesses;
-    int           subprocPIDarray[MAXNBSUBPROCESS];
+    char statusmsg[200];
+    char tmuxname[100];
 
-    double
-    sampletimearray[MAXNBSUBPROCESS];  // time at which sampling was performed [sec]
-    double        sampletimearray_prev[MAXNBSUBPROCESS];
+    int NBsubprocesses;
+    int subprocPIDarray[MAXNBSUBPROCESS];
 
-    long          ctxtsw_voluntary[MAXNBSUBPROCESS];
-    long          ctxtsw_nonvoluntary[MAXNBSUBPROCESS];
-    long          ctxtsw_voluntary_prev[MAXNBSUBPROCESS];
-    long          ctxtsw_nonvoluntary_prev[MAXNBSUBPROCESS];
+    double sampletimearray[MAXNBSUBPROCESS]; // time at which sampling was performed [sec]
+    double sampletimearray_prev[MAXNBSUBPROCESS];
 
-    long long     cpuloadcntarray[MAXNBSUBPROCESS];
-    long long     cpuloadcntarray_prev[MAXNBSUBPROCESS];
-    float         subprocCPUloadarray[MAXNBSUBPROCESS];
-    float         subprocCPUloadarray_timeaveraged[MAXNBSUBPROCESS];
+    long ctxtsw_voluntary[MAXNBSUBPROCESS];
+    long ctxtsw_nonvoluntary[MAXNBSUBPROCESS];
+    long ctxtsw_voluntary_prev[MAXNBSUBPROCESS];
+    long ctxtsw_nonvoluntary_prev[MAXNBSUBPROCESS];
 
-    long          VmRSSarray[MAXNBSUBPROCESS];
+    long long cpuloadcntarray[MAXNBSUBPROCESS];
+    long long cpuloadcntarray_prev[MAXNBSUBPROCESS];
+    float subprocCPUloadarray[MAXNBSUBPROCESS];
+    float subprocCPUloadarray_timeaveraged[MAXNBSUBPROCESS];
 
-    int           processorarray[MAXNBSUBPROCESS];
+    long VmRSSarray[MAXNBSUBPROCESS];
 
+    int processorarray[MAXNBSUBPROCESS];
 
 } PROCESSINFODISP;
 
-
-
-
-
 typedef struct
 {
-    int      loop;   // 1 : loop     0 : exit
-    long     loopcnt;
-
-    int      twaitus; // sleep time between scans
-    double   dtscan; // measured time interval between scans [s]
-    pid_t    scanPID;
-    int      scandebugline; // for debugging
+    int loop; // 1 : loop     0 : exit
+    long loopcnt;
 
+    int twaitus;   // sleep time between scans
+    double dtscan; // measured time interval between scans [s]
+    pid_t scanPID;
+    int scandebugline; // for debugging
 
     // ensure list of process and mmap operation blocks display
-    int      SCANBLOCK_requested;  // scan thread toggles to 1 to requests blocking
-    int      SCANBLOCK_OK;         // display thread toggles to 1 to let scan know it can proceed
+    int SCANBLOCK_requested; // scan thread toggles to 1 to requests blocking
+    int SCANBLOCK_OK;        // display thread toggles to 1 to let scan know it can proceed
 
     PROCESSINFOLIST
-    *pinfolist;  // copy of pointer  static PROCESSINFOLIST *pinfolist
+    *pinfolist; // copy of pointer  static PROCESSINFOLIST *pinfolist
 
     long NBpinfodisp;
     PROCESSINFODISP *pinfodisp;
@@ -148,20 +127,16 @@ typedef struct
     // the index is different from the displayed order
     // new process takes first available free index
     //
-    PROCESSINFO  *pinfoarray[PROCESSINFOLISTSIZE];
-    int
-    pinfommapped[PROCESSINFOLISTSIZE];             // 1 if mmapped, 0 otherwise
-    pid_t
-    PIDarray[PROCESSINFOLISTSIZE];                 // used to track changes
-    int
-    updatearray[PROCESSINFOLISTSIZE];              // 0: don't load, 1: (re)load
-    int           fdarray[PROCESSINFOLISTSIZE];                  // file descriptors
-    long          loopcntarray[PROCESSINFOLISTSIZE];
-    long          loopcntoffsetarray[PROCESSINFOLISTSIZE];
-    int           selectedarray[PROCESSINFOLISTSIZE];
-
-    int           sorted_pindex_time[PROCESSINFOLISTSIZE];
+    PROCESSINFO *pinfoarray[PROCESSINFOLISTSIZE];
+    int pinfommapped[PROCESSINFOLISTSIZE]; // 1 if mmapped, 0 otherwise
+    pid_t PIDarray[PROCESSINFOLISTSIZE];   // used to track changes
+    int updatearray[PROCESSINFOLISTSIZE];  // 0: don't load, 1: (re)load
+    int fdarray[PROCESSINFOLISTSIZE];      // file descriptors
+    long loopcntarray[PROCESSINFOLISTSIZE];
+    long loopcntoffsetarray[PROCESSINFOLISTSIZE];
+    int selectedarray[PROCESSINFOLISTSIZE];
 
+    int sorted_pindex_time[PROCESSINFOLISTSIZE];
 
     int NBcpus;
     int NBcpusocket;
@@ -188,10 +163,6 @@ typedef struct
 
 } PROCINFOPROC;
 
-
-
-
-
 // ---------------------  -------------------------------
 
 typedef struct
@@ -201,90 +172,55 @@ typedef struct
 } STRINGLISTENTRY;
 
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
 
+    PROCESSINFO *processinfo_setup(char *pinfoname, const char *descriptionstring, const char *msgstring,
+                                   const char *functionname, const char *filename, int linenumber);
 
+    errno_t processinfo_error(PROCESSINFO *processinfo, char *errmsgstring);
 
-PROCESSINFO *processinfo_setup(
-    char *pinfoname,
-    const char* descriptionstring,
-    const char *msgstring,
-    const char *functionname,
-    const char *filename,
-    int   linenumber
-);
-
-errno_t processinfo_error(
-    PROCESSINFO *processinfo,
-    char *errmsgstring
-);
-
-errno_t processinfo_loopstart(
-    PROCESSINFO *processinfo
-);
-
-int processinfo_loopstep(
-    PROCESSINFO *processinfo
-);
-
-int processinfo_compute_status(
-    PROCESSINFO *processinfo
-);
-
-
-
-
-PROCESSINFO *processinfo_shm_create(const char *pname, int CTRLval);
-PROCESSINFO *processinfo_shm_link(const char *pname, int *fd);
-int processinfo_shm_close(PROCESSINFO *pinfo, int fd);
-int processinfo_cleanExit(PROCESSINFO *processinfo);
-int processinfo_SIGexit(PROCESSINFO *processinfo, int SignalNumber);
-int processinfo_WriteMessage(PROCESSINFO *processinfo, const char *msgstring);
-int processinfo_exec_start(PROCESSINFO *processinfo);
-int processinfo_exec_end(PROCESSINFO *processinfo);
-
-
-int processinfo_CatchSignals();
-int processinfo_ProcessSignals(PROCESSINFO *processinfo);
-
-
-
-errno_t processinfo_update_output_stream(
-    PROCESSINFO *processinfo,
-    imageID outstreamID
-);
-
-
-
-errno_t processinfo_CTRLscreen();
-
-
+    errno_t processinfo_loopstart(PROCESSINFO *processinfo);
 
+    int processinfo_loopstep(PROCESSINFO *processinfo);
 
+    int processinfo_compute_status(PROCESSINFO *processinfo);
 
-#define PROCINFOLOOP_START \
-processinfo_loopstart(processinfo); \
-while(processloopOK == 1) \
-{ \
-	processloopOK = processinfo_loopstep(processinfo); \
-	processinfo_waitoninputstream(processinfo); \
-	processinfo_exec_start(processinfo); \
-	if(processinfo_compute_status(processinfo) == 1) \
-	{
+    PROCESSINFO *processinfo_shm_create(const char *pname, int CTRLval);
+    PROCESSINFO *processinfo_shm_link(const char *pname, int *fd);
+    int processinfo_shm_close(PROCESSINFO *pinfo, int fd);
+    int processinfo_cleanExit(PROCESSINFO *processinfo);
+    int processinfo_SIGexit(PROCESSINFO *processinfo, int SignalNumber);
+    int processinfo_WriteMessage(PROCESSINFO *processinfo, const char *msgstring);
+    int processinfo_exec_start(PROCESSINFO *processinfo);
+    int processinfo_exec_end(PROCESSINFO *processinfo);
 
-#define PROCINFOLOOP_END \
-	} \
-	processinfo_exec_end(processinfo); \
-} \
-processinfo_cleanExit(processinfo);
+    int processinfo_CatchSignals();
+    int processinfo_ProcessSignals(PROCESSINFO *processinfo);
 
+    errno_t processinfo_update_output_stream(PROCESSINFO *processinfo, imageID outstreamID);
 
+    errno_t processinfo_CTRLscreen();
 
+#define PROCINFOLOOP_START                                                                                             \
+    processinfo_loopstart(processinfo);                                                                                \
+    while (processloopOK == 1)                                                                                         \
+    {                                                                                                                  \
+        processloopOK = processinfo_loopstep(processinfo);                                                             \
+        processinfo_waitoninputstream(processinfo);                                                                    \
+        processinfo_exec_start(processinfo);                                                                           \
+        if (processinfo_compute_status(processinfo) == 1)                                                              \
+        {
 
+#define PROCINFOLOOP_END                                                                                               \
+    }                                                                                                                  \
+    processinfo_exec_end(processinfo);                                                                                 \
+    }                                                                                                                  \
+    processinfo_cleanExit(processinfo);
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif  // _PROCESSTOOLS_H
+#endif // _PROCESSTOOLS_H
diff --git a/src/CommandLineInterface/processtools_trigger.c b/src/CommandLineInterface/processtools_trigger.c
index 4b8e8d2a..16631b4c 100644
--- a/src/CommandLineInterface/processtools_trigger.c
+++ b/src/CommandLineInterface/processtools_trigger.c
@@ -4,13 +4,11 @@
  *
  */
 
-
+#include <sched.h>
+#include <stdint.h>
+#include <stdio.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include <stdio.h>
-#include <stdint.h>
-#include <sched.h>
-
 
 #include "CLIcore.h"
 #include "CLIcore_utils.h"
@@ -18,11 +16,6 @@
 #include "processinfo.h"
 #include "processtools_trigger.h"
 
-
-
-
-
-
 /** @brief Set up input wait stream
  *
  * Specify stream on which the loop process will be triggering, and
@@ -34,22 +27,16 @@
  * and semindex = -1, which will automatically find a suitable semaphore
  *
  */
-errno_t processinfo_waitoninputstream_init(
-    PROCESSINFO *processinfo,
-    imageID      trigID,
-    int          triggermode,
-    int          semindexrequested
-)
+errno_t processinfo_waitoninputstream_init(PROCESSINFO *processinfo, imageID trigID, int triggermode,
+                                           int semindexrequested)
 {
     DEBUG_TRACE_FSTART("%ld %d %d", trigID, triggermode, semindexrequested);
     processinfo->triggerstreamID = trigID;
 
-    if(trigID > -1)
+    if (trigID > -1)
     {
         processinfo->triggerstreaminode = data.image[trigID].md[0].inode;
-        strncpy(processinfo->triggerstreamname,
-                data.image[trigID].md[0].name,
-                STRINGMAXLEN_IMAGE_NAME);
+        strncpy(processinfo->triggerstreamname, data.image[trigID].md[0].name, STRINGMAXLEN_IMAGE_NAME);
     }
     else
     {
@@ -60,46 +47,41 @@ errno_t processinfo_waitoninputstream_init(
     }
 
     processinfo->triggermissedframe_cumul = 0;
-    processinfo->trigggertimeoutcnt       = 0;
-    processinfo->triggerstatus            = 0;
+    processinfo->trigggertimeoutcnt = 0;
+    processinfo->triggerstatus = 0;
 
     // default
     //processinfo->triggermode = PROCESSINFO_TRIGGERMODE_SEMAPHORE;
 
-
     // valid modes
 
-    if(triggermode == PROCESSINFO_TRIGGERMODE_CNT0)
+    if (triggermode == PROCESSINFO_TRIGGERMODE_CNT0)
     {
         DEBUG_TRACEPOINT("trigger mode %d = cnt0 of ID %ld", PROCESSINFO_TRIGGERMODE_CNT0, trigID);
 
-        if(trigID == -1)
+        if (trigID == -1)
         {
             FUNC_RETURN_FAILURE("missing trigger ID");
         }
         // trigger on cnt0 increment
         processinfo->triggermode = PROCESSINFO_TRIGGERMODE_CNT0;
-        processinfo->triggerstreamcnt =
-            data.image[processinfo->triggerstreamID].md[0].cnt0;
+        processinfo->triggerstreamcnt = data.image[processinfo->triggerstreamID].md[0].cnt0;
     }
 
-
-    if(triggermode == PROCESSINFO_TRIGGERMODE_CNT1)
+    if (triggermode == PROCESSINFO_TRIGGERMODE_CNT1)
     {
         DEBUG_TRACEPOINT("trigger mode %d = cnt1 of ID %ld", PROCESSINFO_TRIGGERMODE_CNT1, trigID);
 
-        if(trigID == -1)
+        if (trigID == -1)
         {
             FUNC_RETURN_FAILURE("missing trigger ID");
         }
         // trigger on cnt1 increment
         processinfo->triggermode = PROCESSINFO_TRIGGERMODE_CNT1;
-        processinfo->triggerstreamcnt =
-            data.image[processinfo->triggerstreamID].md[0].cnt1;
+        processinfo->triggerstreamcnt = data.image[processinfo->triggerstreamID].md[0].cnt1;
     }
 
-
-    if(triggermode == PROCESSINFO_TRIGGERMODE_IMMEDIATE)
+    if (triggermode == PROCESSINFO_TRIGGERMODE_IMMEDIATE)
     {
         DEBUG_TRACEPOINT("trigger mode %d = immediate", PROCESSINFO_TRIGGERMODE_IMMEDIATE);
         // immmediate trigger
@@ -108,8 +90,7 @@ errno_t processinfo_waitoninputstream_init(
         //data.image[processinfo->triggerstreamID].md[0].cnt0;
     }
 
-
-    if(triggermode == PROCESSINFO_TRIGGERMODE_DELAY)
+    if (triggermode == PROCESSINFO_TRIGGERMODE_DELAY)
     {
         DEBUG_TRACEPOINT("trigger mode %d = time delay", PROCESSINFO_TRIGGERMODE_DELAY);
         // time wait
@@ -119,26 +100,21 @@ errno_t processinfo_waitoninputstream_init(
         //data.image[processinfo->triggerstreamID].md[0].cnt0;
     }
 
-
-
     // checking if semaphore trigger mode OK
-    if(processinfo->triggermode == PROCESSINFO_TRIGGERMODE_SEMAPHORE)
+    if (processinfo->triggermode == PROCESSINFO_TRIGGERMODE_SEMAPHORE)
     {
-        DEBUG_TRACEPOINT("trigger mode %d = semaphore %d on ID %ld",
-                         PROCESSINFO_TRIGGERMODE_SEMAPHORE,
-                         semindexrequested,
-                         trigID);
-        if(semindexrequested < -1)
+        DEBUG_TRACEPOINT("trigger mode %d = semaphore %d on ID %ld", PROCESSINFO_TRIGGERMODE_SEMAPHORE,
+                         semindexrequested, trigID);
+        if (semindexrequested < -1)
         {
             FUNC_RETURN_FAILURE("invalid semaphore index %d", semindexrequested);
         }
-        if(trigID == -1)
+        if (trigID == -1)
         {
             FUNC_RETURN_FAILURE("invalid image ID %ld", trigID);
         }
-        processinfo->triggersem = ImageStreamIO_getsemwaitindex(&data.image[trigID],
-                                  semindexrequested);
-        if(processinfo->triggersem == -1)
+        processinfo->triggersem = ImageStreamIO_getsemwaitindex(&data.image[trigID], semindexrequested);
+        if (processinfo->triggersem == -1)
         {
             // could not find available semaphore
             // fall back to CNT0 trigger mode
@@ -151,7 +127,6 @@ errno_t processinfo_waitoninputstream_init(
         }
     }
 
-
     // set default timeout to 2 sec
     processinfo->triggertimeout.tv_sec = 2;
     processinfo->triggertimeout.tv_nsec = 0;
@@ -160,45 +135,36 @@ errno_t processinfo_waitoninputstream_init(
     return RETURN_SUCCESS;
 }
 
-
-
-
 /** @brief Wait on a stream
  *
  */
 
-errno_t processinfo_waitoninputstream(
-    PROCESSINFO *processinfo
-)
+errno_t processinfo_waitoninputstream(PROCESSINFO *processinfo)
 {
     processinfo->triggermissedframe = 0;
 
-    if(processinfo->triggermode == PROCESSINFO_TRIGGERMODE_IMMEDIATE)
+    if (processinfo->triggermode == PROCESSINFO_TRIGGERMODE_IMMEDIATE)
     {
         processinfo->triggerstatus = PROCESSINFO_TRIGGERSTATUS_RECEIVED;
         // return immediately
         return RETURN_SUCCESS;
     }
 
-
-    if(processinfo->triggermode == PROCESSINFO_TRIGGERMODE_CNT0)
+    if (processinfo->triggermode == PROCESSINFO_TRIGGERMODE_CNT0)
     {
         // use cnt0
 
         processinfo->triggerstatus = PROCESSINFO_TRIGGERSTATUS_WAITING;
 
-        while(data.image[processinfo->triggerstreamID].md[0].cnt0 ==
-                processinfo->triggerstreamcnt)
+        while (data.image[processinfo->triggerstreamID].md[0].cnt0 == processinfo->triggerstreamcnt)
         {
             // test if new frame exists
             usleep(5);
         }
         processinfo->triggermissedframe =
-            data.image[processinfo->triggerstreamID].md[0].cnt0 -
-            processinfo->triggerstreamcnt - 1;
+            data.image[processinfo->triggerstreamID].md[0].cnt0 - processinfo->triggerstreamcnt - 1;
         // update trigger counter
-        processinfo->triggerstreamcnt =
-            data.image[processinfo->triggerstreamID].md[0].cnt0;
+        processinfo->triggerstreamcnt = data.image[processinfo->triggerstreamID].md[0].cnt0;
 
         processinfo->triggermissedframe_cumul += processinfo->triggermissedframe;
 
@@ -207,25 +173,21 @@ errno_t processinfo_waitoninputstream(
         return RETURN_SUCCESS;
     }
 
-
-    if(processinfo->triggermode == PROCESSINFO_TRIGGERMODE_CNT1)
+    if (processinfo->triggermode == PROCESSINFO_TRIGGERMODE_CNT1)
     {
         // use cnt1
 
         processinfo->triggerstatus = PROCESSINFO_TRIGGERSTATUS_WAITING;
 
-        while(data.image[processinfo->triggerstreamID].md[0].cnt1 ==
-                processinfo->triggerstreamcnt)
+        while (data.image[processinfo->triggerstreamID].md[0].cnt1 == processinfo->triggerstreamcnt)
         {
             // test if new frame exists
             usleep(5);
         }
         processinfo->triggermissedframe =
-            data.image[processinfo->triggerstreamID].md[0].cnt1 -
-            processinfo->triggerstreamcnt - 1;
+            data.image[processinfo->triggerstreamID].md[0].cnt1 - processinfo->triggerstreamcnt - 1;
         // update trigger counter
-        processinfo->triggerstreamcnt =
-            data.image[processinfo->triggerstreamID].md[0].cnt1;
+        processinfo->triggerstreamcnt = data.image[processinfo->triggerstreamID].md[0].cnt1;
 
         processinfo->triggermissedframe_cumul += processinfo->triggermissedframe;
 
@@ -234,10 +196,7 @@ errno_t processinfo_waitoninputstream(
         return RETURN_SUCCESS;
     }
 
-
-
-
-    if(processinfo->triggermode == PROCESSINFO_TRIGGERMODE_DELAY)
+    if (processinfo->triggermode == PROCESSINFO_TRIGGERMODE_DELAY)
     {
         // return after fixed delay
 
@@ -252,10 +211,7 @@ errno_t processinfo_waitoninputstream(
         return RETURN_SUCCESS;
     }
 
-
-
-
-    if(processinfo->triggermode == PROCESSINFO_TRIGGERMODE_SEMAPHORE)
+    if (processinfo->triggermode == PROCESSINFO_TRIGGERMODE_SEMAPHORE)
     {
         int semr;
         int tmpstatus = PROCESSINFO_TRIGGERSTATUS_RECEIVED;
@@ -266,7 +222,7 @@ errno_t processinfo_waitoninputstream(
 
         // get current time
         struct timespec ts;
-        if(clock_gettime(CLOCK_REALTIME, &ts) == -1)
+        if (clock_gettime(CLOCK_REALTIME, &ts) == -1)
         {
             perror("clock_gettime");
             exit(EXIT_FAILURE);
@@ -275,42 +231,40 @@ errno_t processinfo_waitoninputstream(
         // is semaphore at zero ?
         DEBUG_TRACEPOINT("test sem status");
         semr = 0;
-        while(semr == 0)
+        while (semr == 0)
         {
             // this should only run once, returning semr = -1 with errno = EAGAIN
             // otherwise, we're potentially missing frames
             DEBUG_TRACEPOINT("sem_trywait %ld", processinfo->triggerstreamID);
-            semr = sem_trywait(
-                       data.image[processinfo->triggerstreamID].semptr[processinfo->triggersem]);
-            if(semr == 0)
+            semr = sem_trywait(data.image[processinfo->triggerstreamID].semptr[processinfo->triggersem]);
+            if (semr == 0)
             {
-                processinfo->triggermissedframe ++;
+                processinfo->triggermissedframe++;
             }
         }
 
         // expected state: NBmissedframe = 0, semr = -1, errno = EAGAIN
         // missed frame state: NBmissedframe>0, semr = -1, errno = EAGAIN
         DEBUG_TRACEPOINT("triggermissedframe = %d", processinfo->triggermissedframe);
-        if(processinfo->triggermissedframe == 0)
+        if (processinfo->triggermissedframe == 0)
         {
             DEBUG_TRACEPOINT("timedwait");
             // add timeout
             ts.tv_sec += processinfo->triggertimeout.tv_sec;
             ts.tv_nsec += processinfo->triggertimeout.tv_nsec;
-            while(ts.tv_nsec > 1000000000)
+            while (ts.tv_nsec > 1000000000)
             {
                 ts.tv_nsec -= 1000000000;
-                ts.tv_sec ++;
+                ts.tv_sec++;
             }
 
-            semr = sem_timedwait(
-                       data.image[processinfo->triggerstreamID].semptr[processinfo->triggersem], &ts);
-            if(semr == -1)
+            semr = sem_timedwait(data.image[processinfo->triggerstreamID].semptr[processinfo->triggersem], &ts);
+            if (semr == -1)
             {
-                if(errno == ETIMEDOUT)
+                if (errno == ETIMEDOUT)
                 {
                     // timeout condition
-                    processinfo->trigggertimeoutcnt ++;
+                    processinfo->trigggertimeoutcnt++;
                     tmpstatus = PROCESSINFO_TRIGGERSTATUS_TIMEDOUT;
                 }
             }
@@ -318,7 +272,7 @@ errno_t processinfo_waitoninputstream(
             // measure time spent waiting for input
             // get current time
             struct timespec ts1;
-            if(clock_gettime(CLOCK_REALTIME, &ts1) == -1)
+            if (clock_gettime(CLOCK_REALTIME, &ts1) == -1)
             {
                 perror("clock_gettime");
                 exit(EXIT_FAILURE);
@@ -332,8 +286,5 @@ errno_t processinfo_waitoninputstream(
         return RETURN_SUCCESS;
     }
 
-
     return RETURN_FAILURE;
 }
-
-
diff --git a/src/CommandLineInterface/processtools_trigger.h b/src/CommandLineInterface/processtools_trigger.h
index a6f53272..b74ff9c1 100644
--- a/src/CommandLineInterface/processtools_trigger.h
+++ b/src/CommandLineInterface/processtools_trigger.h
@@ -6,71 +6,53 @@
  *
  */
 
-
 #ifndef _PROCESSTOOLS_TRIGGER_H
 #define _PROCESSTOOLS_TRIGGER_H
 
-
-
 // input stream triggering modes
 
 // trigger immediately
-#define PROCESSINFO_TRIGGERMODE_IMMEDIATE      0
+#define PROCESSINFO_TRIGGERMODE_IMMEDIATE 0
 
 // trigger when cnt0 increments
-#define PROCESSINFO_TRIGGERMODE_CNT0           1
+#define PROCESSINFO_TRIGGERMODE_CNT0 1
 
 // trigger when cnt1 increments
-#define PROCESSINFO_TRIGGERMODE_CNT1           2
+#define PROCESSINFO_TRIGGERMODE_CNT1 2
 
 // trigger when semaphore is posted
-#define PROCESSINFO_TRIGGERMODE_SEMAPHORE      3
+#define PROCESSINFO_TRIGGERMODE_SEMAPHORE 3
 
 // trigger after a time delay
-#define PROCESSINFO_TRIGGERMODE_DELAY          4
-
+#define PROCESSINFO_TRIGGERMODE_DELAY 4
 
 // trigger is currently waiting for input
-#define PROCESSINFO_TRIGGERSTATUS_WAITING      1
+#define PROCESSINFO_TRIGGERSTATUS_WAITING 1
 
-#define PROCESSINFO_TRIGGERSTATUS_RECEIVED     2
-#define PROCESSINFO_TRIGGERSTATUS_TIMEDOUT     3
+#define PROCESSINFO_TRIGGERSTATUS_RECEIVED 2
+#define PROCESSINFO_TRIGGERSTATUS_TIMEDOUT 3
 
 #include "CLIcore.h"
 #include "CommandLineInterface/IMGID.h"
 
 #include "processinfo.h"
 
-
-
-
-errno_t processinfo_waitoninputstream_init(
-	PROCESSINFO *processinfo,
-	imageID      trigID,
-	int          triggermode,
-	int          semindexrequested
-);
-
-errno_t processinfo_waitoninputstream(
-    PROCESSINFO *processinfo
-);
-
-
-
-
-#define PROCINFO_TRIGGER_DELAYUS(delayus) \
-do{ \
-processinfo_waitoninputstream_init(processinfo, -1, PROCESSINFO_TRIGGERMODE_DELAY, -1);   \
-processinfo->triggerdelay.tv_sec = 0;                                   \
-processinfo->triggerdelay.tv_nsec = (long)( (delayus) * 1000);          \
-while(processinfo->triggerdelay.tv_nsec > 1000000000)                   \
-{                                                                       \
-processinfo->triggerdelay.tv_nsec -= 1000000000;                        \
-processinfo->triggerdelay.tv_sec += 1;                                  \
-}                                                                       \
-} while(0)
-
-
-
+errno_t processinfo_waitoninputstream_init(PROCESSINFO *processinfo, imageID trigID, int triggermode,
+                                           int semindexrequested);
+
+errno_t processinfo_waitoninputstream(PROCESSINFO *processinfo);
+
+#define PROCINFO_TRIGGER_DELAYUS(delayus)                                                                              \
+    do                                                                                                                 \
+    {                                                                                                                  \
+        processinfo_waitoninputstream_init(processinfo, -1, PROCESSINFO_TRIGGERMODE_DELAY, -1);                        \
+        processinfo->triggerdelay.tv_sec = 0;                                                                          \
+        processinfo->triggerdelay.tv_nsec = (long)((delayus)*1000);                                                    \
+        while (processinfo->triggerdelay.tv_nsec > 1000000000)                                                         \
+        {                                                                                                              \
+            processinfo->triggerdelay.tv_nsec -= 1000000000;                                                           \
+            processinfo->triggerdelay.tv_sec += 1;                                                                     \
+        }                                                                                                              \
+    } while (0)
 
 #endif
diff --git a/src/CommandLineInterface/pyproject.toml b/src/CommandLineInterface/pyproject.toml
index 0c3b2f5f..6931dd08 100644
--- a/src/CommandLineInterface/pyproject.toml
+++ b/src/CommandLineInterface/pyproject.toml
@@ -1,2 +1,2 @@
 [build-system]
-requires = ["setuptools>38.6", "wheel", "cmake>=3.11.0,<4.0.0", "pybind11>=2.4.0"]
\ No newline at end of file
+requires = ["setuptools>38.6", "wheel", "cmake>=3.11.0,<4.0.0", "pybind11>=2.4.0"]
diff --git a/src/CommandLineInterface/setup.py b/src/CommandLineInterface/setup.py
index b9ca982f..10d0e206 100644
--- a/src/CommandLineInterface/setup.py
+++ b/src/CommandLineInterface/setup.py
@@ -23,8 +23,8 @@ def run(self):
             out = subprocess.check_output(['cmake', '--version'])
         except OSError:
             raise RuntimeError(
-                    "CMake must be installed to build the following extensions: " +
-                    ", ".join(e.name for e in self.extensions))
+                    "CMake must be installed to build the following extensions: "
+                    + ", ".join(e.name for e in self.extensions))
 
         if platform.system() == "Windows":
             cmake_version = LooseVersion(
@@ -36,7 +36,8 @@ def run(self):
             self.build_extension(ext)
 
     def build_extension(self, ext):
-        extdir = os.path.abspath(os.path.dirname(self.get_ext_fullpath(ext.name)))
+        extdir = os.path.abspath(
+                os.path.dirname(self.get_ext_fullpath(ext.name)))
 
         cmake_args = [
                 '-DCMAKE_LIBRARY_OUTPUT_DIRECTORY=' + extdir,
@@ -48,7 +49,8 @@ def build_extension(self, ext):
 
         if platform.system() == "Windows":
             cmake_args += [
-                    '-DCMAKE_LIBRARY_OUTPUT_DIRECTORY_{}={}'.format(cfg.upper(), extdir)
+                    '-DCMAKE_LIBRARY_OUTPUT_DIRECTORY_{}={}'.format(
+                            cfg.upper(), extdir)
             ]
             if sys.maxsize > 2**32:
                 cmake_args += ['-A', 'x64']
@@ -60,13 +62,13 @@ def build_extension(self, ext):
         if "CUDA_ROOT" in os.environ:
             if os.path.isfile('{}/bin/gcc'.format(os.environ["CUDA_ROOT"])):
                 cmake_args += [
-                    '-DCMAKE_C_COMPILER={}/bin/gcc'.format(
-                        os.environ["CUDA_ROOT"])
+                        '-DCMAKE_C_COMPILER={}/bin/gcc'.format(
+                                os.environ["CUDA_ROOT"])
                 ]
             if os.path.isfile('{}/bin/g++'.format(os.environ["CUDA_ROOT"])):
                 cmake_args += [
-                    '-DCMAKE_CXX_COMPILER={}/bin/g++'.format(
-                        os.environ["CUDA_ROOT"])
+                        '-DCMAKE_CXX_COMPILER={}/bin/g++'.format(
+                                os.environ["CUDA_ROOT"])
                 ]
             cmake_args += ['-DUSE_CUDA=ON']
 
@@ -75,7 +77,8 @@ def build_extension(self, ext):
         if not os.path.exists(self.build_temp):
             os.makedirs(self.build_temp)
 
-        subprocess.check_call(['cmake', ext.sourcedir] + cmake_args, cwd=self.build_temp)
+        subprocess.check_call(['cmake', ext.sourcedir] + cmake_args,
+                              cwd=self.build_temp)
         subprocess.check_call(['cmake', '--build', '.'] + build_args,
                               cwd=self.build_temp)
 
@@ -90,4 +93,5 @@ def build_extension(self, ext):
         scripts=['bin/tmuxsessionname'],
         ext_modules=[CMakeExtension('CacaoProcessTools')],
         cmdclass={'build_ext': CMakeBuildExt},
-        zip_safe=False, )
+        zip_safe=False,
+)
diff --git a/src/CommandLineInterface/standalone_dependencies.c b/src/CommandLineInterface/standalone_dependencies.c
index 7c653777..5a2b0666 100644
--- a/src/CommandLineInterface/standalone_dependencies.c
+++ b/src/CommandLineInterface/standalone_dependencies.c
@@ -12,10 +12,10 @@
  */
 
 #include "standalone_dependencies.h"
+#include "streamCTRL.h"
 #include <ncurses.h>
 #include <string.h>
 #include <time.h>
-#include "streamCTRL.h"
 
 static int wrow, wcol;
 int C_ERRNO = 0;
@@ -28,7 +28,7 @@ int C_ERRNO = 0;
 struct timespec timespec_diff(struct timespec start, struct timespec end)
 {
     struct timespec temp;
-    if((end.tv_nsec - start.tv_nsec) < 0)
+    if ((end.tv_nsec - start.tv_nsec) < 0)
     {
         temp.tv_sec = end.tv_sec - start.tv_sec - 1;
         temp.tv_nsec = 1000000000 + end.tv_nsec - start.tv_nsec;
@@ -48,12 +48,12 @@ int print_header(const char *str, char c)
 
     attron(A_BOLD);
     n = strlen(str);
-    for(i = 0; i < (wcol - n) / 2; i++)
+    for (i = 0; i < (wcol - n) / 2; i++)
     {
         printw("%c", c);
     }
     printw("%s", str);
-    for(i = 0; i < (wcol - n) / 2 - 1; i++)
+    for (i = 0; i < (wcol - n) / 2 - 1; i++)
     {
         printw("%c", c);
     }
@@ -75,16 +75,16 @@ void qs2l(double *array, long *array1, long left, long right)
 
     do
     {
-        while(array[i] < x && i < right)
+        while (array[i] < x && i < right)
         {
             i++;
         }
-        while(x < array[j] && j > left)
+        while (x < array[j] && j > left)
         {
             j--;
         }
 
-        if(i <= j)
+        if (i <= j)
         {
             y = array[i];
             array[i] = array[j];
@@ -97,23 +97,19 @@ void qs2l(double *array, long *array1, long left, long right)
             i++;
             j--;
         }
-    }
-    while(i <= j);
+    } while (i <= j);
 
-    if(left < j)
+    if (left < j)
     {
         qs2l(array, array1, left, j);
     }
-    if(i < right)
+    if (i < right)
     {
         qs2l(array, array1, i, right);
     }
 }
 
-void quick_sort2l(double *array, long *array1, long count)
-{
-    qs2l(array, array1, 0, count - 1);
-}
+void quick_sort2l(double *array, long *array1, long count) { qs2l(array, array1, 0, count - 1); }
 
 void qs2l_double(double *array, long *array1, long left, long right)
 {
@@ -127,16 +123,16 @@ void qs2l_double(double *array, long *array1, long left, long right)
 
     do
     {
-        while(array[i] < x && i < right)
+        while (array[i] < x && i < right)
         {
             i++;
         }
-        while(x < array[j] && j > left)
+        while (x < array[j] && j > left)
         {
             j--;
         }
 
-        if(i <= j)
+        if (i <= j)
         {
             y = array[i];
             array[i] = array[j];
@@ -149,23 +145,19 @@ void qs2l_double(double *array, long *array1, long left, long right)
             i++;
             j--;
         }
-    }
-    while(i <= j);
+    } while (i <= j);
 
-    if(left < j)
+    if (left < j)
     {
         qs2l_double(array, array1, left, j);
     }
-    if(i < right)
+    if (i < right)
     {
         qs2l_double(array, array1, i, right);
     }
 }
 
-void quick_sort2l_double(double *array, long *array1, long count)
-{
-    qs2l_double(array, array1, 0, count - 1);
-}
+void quick_sort2l_double(double *array, long *array1, long count) { qs2l_double(array, array1, 0, count - 1); }
 
 void qs_long(long *array, long left, long right)
 {
@@ -178,16 +170,16 @@ void qs_long(long *array, long left, long right)
 
     do
     {
-        while(array[i] < x && i < right)
+        while (array[i] < x && i < right)
         {
             i++;
         }
-        while(x < array[j] && j > left)
+        while (x < array[j] && j > left)
         {
             j--;
         }
 
-        if(i <= j)
+        if (i <= j)
         {
             y = array[i];
             array[i] = array[j];
@@ -195,23 +187,19 @@ void qs_long(long *array, long left, long right)
             i++;
             j--;
         }
-    }
-    while(i <= j);
+    } while (i <= j);
 
-    if(left < j)
+    if (left < j)
     {
         qs_long(array, left, j);
     }
-    if(i < right)
+    if (i < right)
     {
         qs_long(array, i, right);
     }
 }
 
-void quick_sort_long(long *array, long count)
-{
-    qs_long(array, 0, count - 1);
-}
+void quick_sort_long(long *array, long count) { qs_long(array, 0, count - 1); }
 
 /**
  * ## Purpose
@@ -239,12 +227,11 @@ void quick_sort_long(long *array, long count)
  */
 int printERROR(const char *file, const char *func, int line, char *errmessage)
 {
-    fprintf(stderr, "%c[%d;%dm ERROR [ %s:%d: %s ]  %c[%d;m\n", (char) 27, 1, 31,
-            file, line, func, (char) 27, 0);
-    if(C_ERRNO != 0)
+    fprintf(stderr, "%c[%d;%dm ERROR [ %s:%d: %s ]  %c[%d;m\n", (char)27, 1, 31, file, line, func, (char)27, 0);
+    if (C_ERRNO != 0)
     {
         char buff[256];
-        if(strerror_r(errno, buff, 256) == 0)
+        if (strerror_r(errno, buff, 256) == 0)
         {
             fprintf(stderr, "C Error: %s\n", buff);
         }
@@ -258,12 +245,11 @@ int printERROR(const char *file, const char *func, int line, char *errmessage)
         fprintf(stderr, "No C error (errno = 0)\n");
     }
 
-    fprintf(stderr, "%c[%d;%dm %s  %c[%d;m\n", (char) 27, 1, 31, errmessage,
-            (char) 27, 0);
+    fprintf(stderr, "%c[%d;%dm %s  %c[%d;m\n", (char)27, 1, 31, errmessage, (char)27, 0);
 
     C_ERRNO = 0;
 
-    return(0);
+    return (0);
 }
 
 int file_exists(const char *restrict file_name)
@@ -271,7 +257,7 @@ int file_exists(const char *restrict file_name)
     FILE *fp;
     int exists = 1;
 
-    if((fp = fopen(file_name, "r")) == NULL)
+    if ((fp = fopen(file_name, "r")) == NULL)
     {
         exists = 0;
         /*      printf("file %s does not exist\n",file_name);*/
@@ -281,7 +267,7 @@ int file_exists(const char *restrict file_name)
         fclose(fp);
     }
 
-    return(exists);
+    return (exists);
 }
 
 int is_fits_file(const char *restrict file_name)
@@ -289,7 +275,7 @@ int is_fits_file(const char *restrict file_name)
     FILE *fp;
     int exists = 1;
 
-    if((fp = fopen(file_name, "r")) == NULL)
+    if ((fp = fopen(file_name, "r")) == NULL)
     {
         exists = 0;
         /*      printf("file %s does not exist\n",file_name);*/
@@ -299,7 +285,7 @@ int is_fits_file(const char *restrict file_name)
         fclose(fp);
     }
 
-    return(exists);
+    return (exists);
 }
 
 /* ===============================================================================================
diff --git a/src/CommandLineInterface/standalone_dependencies.h b/src/CommandLineInterface/standalone_dependencies.h
index 9f9556fa..b7418a13 100644
--- a/src/CommandLineInterface/standalone_dependencies.h
+++ b/src/CommandLineInterface/standalone_dependencies.h
@@ -19,20 +19,21 @@
 // #include <sys/types.h>
 // #include <unistd.h>
 
-#define SHAREDSHMDIR    "/milk/shm"  /**< default location of file mapped semaphores, can be over-ridden by env variable MILK_SHM_DIR */
-#define SHAREDPROCDIR    "/milk/proc"
-#define CLIPID    getpid()
+#define SHAREDSHMDIR                                                                                                   \
+    "/milk/shm" /**< default location of file mapped semaphores, can be over-ridden by env variable MILK_SHM_DIR */
+#define SHAREDPROCDIR "/milk/proc"
+#define CLIPID getpid()
 
 // *************************** FUNCTION RETURN VALUE *********************************************
 // For function returning type errno_t (= int)
 //
-#define RETURN_SUCCESS        0
-#define RETURN_FAILURE       1   // generic error code
-#define RETURN_MISSINGFILE   2
+#define RETURN_SUCCESS 0
+#define RETURN_FAILURE 1 // generic error code
+#define RETURN_MISSINGFILE 2
 
-#include <time.h>
-#include <errno.h>
 #include "ImageStreamIO.h"
+#include <errno.h>
+#include <time.h>
 
 #ifndef __STDC_LIB_EXT1__
 typedef int errno_t;
@@ -44,46 +45,47 @@ typedef long variableID;
 #define DEBUG_TRACEPOINT(...)
 
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
 
-struct timespec timespec_diff(struct timespec start, struct timespec end);
-int print_header(const char *str, char c);
-void quick_sort2l(double *array, long *array1, long count);
-void quick_sort2l_double(double *array, long *array1, long count);
-void quick_sort_long(long *array, long count);
+    struct timespec timespec_diff(struct timespec start, struct timespec end);
+    int print_header(const char *str, char c);
+    void quick_sort2l(double *array, long *array1, long count);
+    void quick_sort2l_double(double *array, long *array1, long count);
+    void quick_sort_long(long *array, long count);
 
-#include "fps_add_entry.h"
-#include "fps_checkparameter.h"
 #include "fps_CONFstart.h"
 #include "fps_CONFstop.h"
-#include "fps_connectExternalFPS.h"
-#include "fps_connect.h"
 #include "fps_CTRLscreen.h"
-#include "fps_disconnect.h"
-#include "fps_execFPScmd.h"
 #include "fps_FPCONFexit.h"
 #include "fps_FPCONFloopstep.h"
 #include "fps_FPCONFsetup.h"
 #include "fps_FPSremove.h"
 #include "fps_GetFileName.h"
-#include "fps_getFPSargs.h"
 #include "fps_GetParamIndex.h"
 #include "fps_GetTypeString.h"
+#include "fps_PrintParameterInfo.h"
+#include "fps_RUNexit.h"
+#include "fps_RUNstart.h"
+#include "fps_RUNstop.h"
+#include "fps_add_entry.h"
+#include "fps_checkparameter.h"
+#include "fps_connect.h"
+#include "fps_connectExternalFPS.h"
+#include "fps_disconnect.h"
+#include "fps_execFPScmd.h"
+#include "fps_getFPSargs.h"
 #include "fps_load.h"
 #include "fps_loadstream.h"
 #include "fps_outlog.h"
 #include "fps_paramvalue.h"
-#include "fps_PrintParameterInfo.h"
 #include "fps_printparameter_valuestring.h"
-#include "fps_processcmdline.h"
 #include "fps_process_fpsCMDarray.h"
-#include "fps_processinfo_entries.h"
 #include "fps_process_user_key.h"
+#include "fps_processcmdline.h"
+#include "fps_processinfo_entries.h"
 #include "fps_read_fpsCMD_fifo.h"
-#include "fps_RUNexit.h"
-#include "fps_RUNstart.h"
-#include "fps_RUNstop.h"
 #include "fps_save2disk.h"
 #include "fps_scan.h"
 #include "fps_shmdirname.h"
@@ -94,4 +96,4 @@ void quick_sort_long(long *array, long count);
 }
 #endif
 
-#endif  // _CACAO_DEPENDENCY_H
+#endif // _CACAO_DEPENDENCY_H
diff --git a/src/CommandLineInterface/streamCTRL_TUI.c b/src/CommandLineInterface/streamCTRL_TUI.c
index 8dda10a8..61317c4f 100644
--- a/src/CommandLineInterface/streamCTRL_TUI.c
+++ b/src/CommandLineInterface/streamCTRL_TUI.c
@@ -8,12 +8,8 @@
  *
  */
 
-
-
-
 #define _GNU_SOURCE
 
-
 /* =============================================================================================== */
 /* =============================================================================================== */
 /*                                        HEADER FILES                                             */
@@ -24,49 +20,46 @@
 typedef int errno_t;
 #endif
 
-
-#include <string.h>
-#include <stdlib.h>
+#include <malloc.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <sys/file.h>
-#include <malloc.h>
 #include <sys/mman.h> // mmap()
 
-#include <time.h>
 #include <signal.h>
+#include <time.h>
 
-#include <unistd.h>    // getpid() access()
 #include <sys/types.h>
+#include <unistd.h> // getpid() access()
 
 #include <sys/stat.h>
 #include <sys/types.h>
 
-
-#include <ncurses.h>
-#include <fcntl.h>
 #include <ctype.h>
+#include <fcntl.h>
+#include <ncurses.h>
 
 #include <dirent.h>
 
-#include <wchar.h>
-#include <locale.h>
 #include <errno.h>
+#include <locale.h>
+#include <wchar.h>
 
 #include <pthread.h>
 
-
 #include "CommandLineInterface/timeutils.h"
 
 #include "CLIcore.h"
-#include "COREMOD_tools/COREMOD_tools.h"
 #include "COREMOD_memory/COREMOD_memory.h"
-#define SHAREDSHMDIR    data.shmdir  /**< default location of file mapped semaphores, can be over-ridden by env variable MILK_SHM_DIR */
+#include "COREMOD_tools/COREMOD_tools.h"
+#define SHAREDSHMDIR                                                                                                   \
+    data.shmdir /**< default location of file mapped semaphores, can be over-ridden by env variable MILK_SHM_DIR */
 
 #include "streamCTRL_TUI.h"
 
 #include "TUItools.h"
 
-
 /* =============================================================================================== */
 /* =============================================================================================== */
 /*                                      DEFINES, MACROS                                            */
@@ -76,25 +69,23 @@ typedef int errno_t;
 // shared memory access permission
 #define FILEMODE 0666
 
-
-#define STRINGLENMAX  32
+#define STRINGLENMAX 32
 
 #define streamOpenNBpid_MAX 100
 #define nameNBchar 100
 #define PIDnameStringLen 12
 
-
-#define DISPLAY_MODE_HELP    1
-#define DISPLAY_MODE_SEMVAL  2
-#define DISPLAY_MODE_WRITE   3
-#define DISPLAY_MODE_READ    4
+#define DISPLAY_MODE_HELP 1
+#define DISPLAY_MODE_SEMVAL 2
+#define DISPLAY_MODE_WRITE 3
+#define DISPLAY_MODE_READ 4
 #define DISPLAY_MODE_SPTRACE 5
-#define DISPLAY_MODE_FUSER   6
+#define DISPLAY_MODE_FUSER 6
 
-#define PRINT_PID_DEFAULT          0
+#define PRINT_PID_DEFAULT 0
 #define PRINT_PID_FORCE_NOUPSTREAM 1
 
-#define NO_DOWNSTREAM_INDEX    100
+#define NO_DOWNSTREAM_INDEX 100
 
 /* =============================================================================================== */
 /* =============================================================================================== */
@@ -104,19 +95,12 @@ typedef int errno_t;
 
 static short unsigned int wrow, wcol;
 
-
 /* =============================================================================================== */
 /* =============================================================================================== */
 /*                                    FUNCTIONS SOURCE CODE                                        */
 /* =============================================================================================== */
 /* =============================================================================================== */
 
-
-
-
-
-
-
 /**
  * @brief Returns ID number corresponding to a name
  *
@@ -124,66 +108,53 @@ static short unsigned int wrow, wcol;
  * @param name     input image name to be matched
  * @return imageID
  */
-imageID image_ID_from_images(
-    IMAGE               *images,
-    const char *restrict name
-)
+imageID image_ID_from_images(IMAGE *images, const char *restrict name)
 {
     imageID i;
 
     i = 0;
     do
     {
-        if(images[i].used == 1)
+        if (images[i].used == 1)
         {
-            if((strncmp(name, images[i].name, strlen(name)) == 0)
-                    && (images[i].name[strlen(name)] == '\0'))
+            if ((strncmp(name, images[i].name, strlen(name)) == 0) && (images[i].name[strlen(name)] == '\0'))
             {
                 clock_gettime(CLOCK_REALTIME, &images[i].md[0].lastaccesstime);
                 return i;
             }
         }
         i++;
-    }
-    while(i != streamNBID_MAX);
+    } while (i != streamNBID_MAX);
 
     return -1;
 }
 
-
-
 /**
  * @brief Returns first available ID in image array
  *
  * @param images     pointer to image array
  * @return imageID
  */
-imageID image_get_first_ID_available_from_images(
-    IMAGE *images
-)
+imageID image_get_first_ID_available_from_images(IMAGE *images)
 {
     imageID i;
 
     i = 0;
     do
     {
-        if(images[i].used == 0)
+        if (images[i].used == 0)
         {
             images[i].used = 1;
             return i;
         }
         i++;
-    }
-    while(i != streamNBID_MAX);
+    } while (i != streamNBID_MAX);
     printf("ERROR: ran out of image IDs - cannot allocate new ID\n");
-    printf("NB_MAX_IMAGE should be increased above current value (%d)\n",
-           streamNBID_MAX);
+    printf("NB_MAX_IMAGE should be increased above current value (%d)\n", streamNBID_MAX);
 
     return -1;
 }
 
-
-
 /**
  * @brief Get the process name by pid
  *
@@ -191,23 +162,20 @@ imageID image_get_first_ID_available_from_images(
  * @param pname
  * @return error code
  */
-errno_t get_process_name_by_pid(
-    const int  pid,
-    char      *pname
-)
+errno_t get_process_name_by_pid(const int pid, char *pname)
 {
-    char *fname = (char *) calloc(STRINGMAXLEN_FULLFILENAME, sizeof(char));
+    char *fname = (char *)calloc(STRINGMAXLEN_FULLFILENAME, sizeof(char));
 
     WRITE_FULLFILENAME(fname, "/proc/%d/cmdline", pid);
-//    sprintf(fname, "/proc/%d/cmdline", pid);
+    //    sprintf(fname, "/proc/%d/cmdline", pid);
     FILE *fp = fopen(fname, "r");
-    if(fp)
+    if (fp)
     {
         size_t size;
         size = fread(pname, sizeof(char), 1024, fp);
-        if(size > 0)
+        if (size > 0)
         {
-            if('\n' == pname[size - 1])
+            if ('\n' == pname[size - 1])
             {
                 pname[size - 1] = '\0';
             }
@@ -220,10 +188,6 @@ errno_t get_process_name_by_pid(
     return RETURN_SUCCESS;
 }
 
-
-
-
-
 /**
  * @brief Get the maximum PID value from system
  *
@@ -232,54 +196,41 @@ errno_t get_process_name_by_pid(
 static int get_PIDmax()
 {
     FILE *fp;
-    int   PIDmax;
-    int   fscanfcnt;
+    int PIDmax;
+    int fscanfcnt;
 
     fp = fopen("/proc/sys/kernel/pid_max", "r");
 
     fscanfcnt = fscanf(fp, "%d", &PIDmax);
-    if(fscanfcnt == EOF)
+    if (fscanfcnt == EOF)
     {
-        if(ferror(fp))
+        if (ferror(fp))
         {
             perror("fscanf");
         }
         else
         {
-            fprintf(stderr,
-                    "Error: fscanf reached end of file, no matching characters, no matching failure\n");
+            fprintf(stderr, "Error: fscanf reached end of file, no matching characters, no matching failure\n");
         }
         exit(EXIT_FAILURE);
     }
-    else if(fscanfcnt != 1)
+    else if (fscanfcnt != 1)
     {
-        fprintf(stderr,
-                "Error: fscanf successfully matched and assigned %i input items, 1 expected\n",
-                fscanfcnt);
+        fprintf(stderr, "Error: fscanf successfully matched and assigned %i input items, 1 expected\n", fscanfcnt);
         exit(EXIT_FAILURE);
     }
 
-
     fclose(fp);
 
     return PIDmax;
 }
 
-
-
-
-
-
 struct streamCTRLarg_struct
 {
     STREAMINFOPROC *streaminfoproc;
     IMAGE *images;
 };
 
-
-
-
-
 /** @brief find shared memory streams on system
  *
  * If filter is set to 1, require stream name to contain namefilter string
@@ -287,22 +238,17 @@ struct streamCTRLarg_struct
  *
  */
 
-int find_streams(
-    STREAMINFO *streaminfo,
-    int filter,
-    const char *namefilter
-)
+int find_streams(STREAMINFO *streaminfo, int filter, const char *namefilter)
 {
     int NBstream = 0;
     DIR *d;
     struct dirent *dir;
 
-
     d = opendir(SHAREDSHMDIR);
-    if(d)
+    if (d)
     {
         int sindex = 0;
-        while(((dir = readdir(d)) != NULL))
+        while (((dir = readdir(d)) != NULL))
         {
             int scanentryOK = 1;
             char *pch = strstr(dir->d_name, ".im.shm");
@@ -310,9 +256,9 @@ int find_streams(
             int matchOK = 0;
 
             // name filtering (first pass, not exclusive to stream name, includes path and extension
-            if(filter == 1)
+            if (filter == 1)
             {
-                if(strstr(dir->d_name, namefilter) != NULL)
+                if (strstr(dir->d_name, namefilter) != NULL)
                 {
                     matchOK = 1;
                 }
@@ -322,19 +268,16 @@ int find_streams(
                 matchOK = 1;
             }
 
-
-            if((pch) && (matchOK == 1))
+            if ((pch) && (matchOK == 1))
             {
                 // is file sym link ?
                 struct stat buf;
                 int retv;
                 char fullname[STRINGMAXLEN_FULLFILENAME];
 
-
-                WRITE_FULLFILENAME(fullname, "%s/%s", SHAREDSHMDIR,
-                                   dir->d_name);
+                WRITE_FULLFILENAME(fullname, "%s/%s", SHAREDSHMDIR, dir->d_name);
                 retv = lstat(fullname, &buf);
-                if(retv == -1)
+                if (retv == -1)
                 {
                     endwin();
                     printf("File \"%s\"", dir->d_name);
@@ -342,29 +285,27 @@ int find_streams(
                     exit(EXIT_FAILURE);
                 }
 
-                if(S_ISLNK(buf.st_mode))  // resolve link name
+                if (S_ISLNK(buf.st_mode)) // resolve link name
                 {
                     char fullname[STRINGMAXLEN_FULLFILENAME];
                     char *linknamefull;
                     char linkname[STRINGMAXLEN_FULLFILENAME];
                     int pathOK = 1;
 
-
                     streaminfo[sindex].SymLink = 1;
-                    WRITE_FULLFILENAME(fullname, "%s/%s", SHAREDSHMDIR,
-                                       dir->d_name);
+                    WRITE_FULLFILENAME(fullname, "%s/%s", SHAREDSHMDIR, dir->d_name);
                     linknamefull = realpath(fullname, NULL);
 
-                    if(linknamefull == NULL)
+                    if (linknamefull == NULL)
                     {
                         pathOK = 0;
                     }
-                    else if(access(linknamefull, R_OK))     // file cannot be read
+                    else if (access(linknamefull, R_OK)) // file cannot be read
                     {
                         pathOK = 0;
                     }
 
-                    if(pathOK == 0)   // file cannot be read
+                    if (pathOK == 0) // file cannot be read
                     {
                         scanentryOK = 0;
                     }
@@ -374,47 +315,43 @@ int find_streams(
 
                         int lOK = 1;
                         unsigned int ii = 0;
-                        while((lOK == 1) && (ii < strlen(linkname)))
+                        while ((lOK == 1) && (ii < strlen(linkname)))
                         {
-                            if(linkname[ii] == '.')
+                            if (linkname[ii] == '.')
                             {
                                 linkname[ii] = '\0';
                                 lOK = 0;
                             }
                             ii++;
                         }
-                        strncpy(streaminfo[sindex].linkname, linkname,
-                                STRINGMAXLEN_STREAMINFO_NAME - 1);
+                        strncpy(streaminfo[sindex].linkname, linkname, STRINGMAXLEN_STREAMINFO_NAME - 1);
                     }
 
-                    if(linknamefull != NULL)
+                    if (linknamefull != NULL)
                     {
                         free(linknamefull);
                     }
-
                 }
                 else
                 {
                     streaminfo[sindex].SymLink = 0;
                 }
 
-
                 // get stream name
-                if(scanentryOK == 1)
+                if (scanentryOK == 1)
                 {
                     int strlencp1 = STRINGMAXLEN_STREAMINFO_NAME;
                     int strlencp = strlen(dir->d_name) - strlen(".im.shm");
-                    if(strlencp < strlencp1)
+                    if (strlencp < strlencp1)
                     {
                         strlencp1 = strlencp;
                     }
                     strncpy(streaminfo[sindex].sname, dir->d_name, strlencp1);
                     streaminfo[sindex].sname[strlen(dir->d_name) - strlen(".im.shm")] = '\0';
 
-
-                    if(filter == 1)
+                    if (filter == 1)
                     {
-                        if(strstr(streaminfo[sindex].sname, namefilter) != NULL)
+                        if (strstr(streaminfo[sindex].sname, namefilter) != NULL)
                         {
                             sindex++;
                         }
@@ -423,7 +360,6 @@ int find_streams(
                     {
                         sindex++;
                     }
-
                 }
             }
         }
@@ -432,19 +368,10 @@ int find_streams(
     }
     closedir(d);
 
-
     return NBstream;
 }
 
-
-
-
-
-
-
-void *streamCTRL_scan(
-    void *argptr
-)
+void *streamCTRL_scan(void *argptr)
 {
     long NBsindex = 0;
     long sindex = 0;
@@ -453,7 +380,6 @@ void *streamCTRL_scan(
     STREAMINFO *streaminfo;
     char **PIDname_array;
 
-
     // timing
     static int firstIter = 1;
     static struct timespec t0;
@@ -461,29 +387,26 @@ void *streamCTRL_scan(
     double tdiffv;
     struct timespec tdiff;
 
-    struct streamCTRLarg_struct *streamCTRLdata        = (struct
-            streamCTRLarg_struct *)argptr;
+    struct streamCTRLarg_struct *streamCTRLdata = (struct streamCTRLarg_struct *)argptr;
     STREAMINFOPROC *streaminfoproc = streamCTRLdata->streaminfoproc;
-    IMAGE *images                  = streamCTRLdata->images;
+    IMAGE *images = streamCTRLdata->images;
 
     streaminfo = streaminfoproc->sinfo;
     PIDname_array = streaminfoproc->PIDtable;
 
     streaminfoproc->loopcnt = 0;
 
-
     // if set, write file list to file on first scan
     //int WriteFlistToFile = 1;
 
-
     FILE *fpfscan;
 
-    while(streaminfoproc->loop == 1)
+    while (streaminfoproc->loop == 1)
     {
 
         // timing measurement
         clock_gettime(CLOCK_REALTIME, &t1);
-        if(firstIter == 1)
+        if (firstIter == 1)
         {
             tdiffv = 0.1;
         }
@@ -495,37 +418,28 @@ void *streamCTRL_scan(
         clock_gettime(CLOCK_REALTIME, &t0);
         streaminfoproc->dtscan = tdiffv;
 
-
-
         int mode = 0;
-        if(mode == 0) // preferred mode
+        if (mode == 0) // preferred mode
         {
-            NBsindex = find_streams(
-                           streaminfo,
-                           streaminfoproc->filter,
-                           streaminfoproc->namefilter);
-
-
+            NBsindex = find_streams(streaminfo, streaminfoproc->filter, streaminfoproc->namefilter);
 
             // write stream list to file if applicable
             // ususally used for debugging only
             //
-            if(streaminfoproc->WriteFlistToFile == 1)
+            if (streaminfoproc->WriteFlistToFile == 1)
             {
                 fpfscan = fopen("streamCTRL_filescan.dat", "w");
                 fprintf(fpfscan, "# stream scan result\n");
-                fprintf(fpfscan, "filter: %d %s\n", streaminfoproc->filter,
-                        streaminfoproc->namefilter);
+                fprintf(fpfscan, "filter: %d %s\n", streaminfoproc->filter, streaminfoproc->namefilter);
                 fprintf(fpfscan, "NBsindex = %ld\n", NBsindex);
 
-                for(sindex = 0; sindex < NBsindex; sindex++)
+                for (sindex = 0; sindex < NBsindex; sindex++)
                 {
                     //fprintf(fpfscan, "%4ld  %20s ", sindex, dir->d_name);
 
-                    if(streaminfo[sindex].SymLink == 1)
+                    if (streaminfo[sindex].SymLink == 1)
                     {
-                        fprintf(fpfscan, "| %12s -> [ %12s ] ", streaminfo[sindex].sname,
-                                streaminfo[sindex].linkname);
+                        fprintf(fpfscan, "| %12s -> [ %12s ] ", streaminfo[sindex].sname, streaminfo[sindex].linkname);
                     }
                     else
                     {
@@ -536,24 +450,22 @@ void *streamCTRL_scan(
                 fclose(fpfscan);
             }
 
-
             // Load into memory
-            for(sindex = 0; sindex < NBsindex; sindex++)
+            for (sindex = 0; sindex < NBsindex; sindex++)
             {
                 imageID ID;
 
                 ID = image_ID_from_images(images, streaminfo[sindex].sname);
 
                 // connect to stream
-                if(ID == -1)
+                if (ID == -1)
                 {
                     ID = image_get_first_ID_available_from_images(images);
-                    if(ID < 0)
+                    if (ID < 0)
                     {
                         return NULL;
                     }
-                    ImageStreamIO_read_sharedmem_image_toIMAGE(streaminfo[sindex].sname,
-                            &images[ID]);
+                    ImageStreamIO_read_sharedmem_image_toIMAGE(streaminfo[sindex].sname, &images[ID]);
                     streaminfo[sindex].deltacnt0 = 1;
                     streaminfo[sindex].updatevalue = 1.0;
                     streaminfo[sindex].updatevalue_frozen = 1.0;
@@ -561,18 +473,17 @@ void *streamCTRL_scan(
                 else
                 {
                     float gainv = 1.0;
-                    if(firstIter == 0)
+                    if (firstIter == 0)
                     {
                         streaminfo[sindex].deltacnt0 = images[ID].md[0].cnt0 - streaminfo[sindex].cnt0;
-                        streaminfo[sindex].updatevalue = (1.0 - gainv) * streaminfo[sindex].updatevalue
-                                                         + gainv * (1.0 * streaminfo[sindex].deltacnt0 / tdiffv);
+                        streaminfo[sindex].updatevalue = (1.0 - gainv) * streaminfo[sindex].updatevalue +
+                                                         gainv * (1.0 * streaminfo[sindex].deltacnt0 / tdiffv);
                     }
 
                     streaminfo[sindex].cnt0 = images[ID].md[0].cnt0; // keep memory of cnt0
                     streaminfo[sindex].ID = ID;
                     streaminfo[sindex].datatype = images[ID].md[0].datatype;
                 }
-
             }
         }
         else // candidate for removal
@@ -582,11 +493,11 @@ void *streamCTRL_scan(
             struct dirent *dir;
 
             d = opendir(SHAREDSHMDIR);
-            if(d)
+            if (d)
             {
                 sindex = 0;
 
-                while(((dir = readdir(d)) != NULL))
+                while (((dir = readdir(d)) != NULL))
                 {
                     int scanentryOK = 1;
                     char *pch = strstr(dir->d_name, ".im.shm");
@@ -594,9 +505,9 @@ void *streamCTRL_scan(
                     int matchOK = 0;
 
                     // name filtering
-                    if(streaminfoproc->filter == 1)
+                    if (streaminfoproc->filter == 1)
                     {
-                        if(strstr(dir->d_name, streaminfoproc->namefilter) != NULL)
+                        if (strstr(dir->d_name, streaminfoproc->namefilter) != NULL)
                         {
                             matchOK = 1;
                         }
@@ -606,9 +517,7 @@ void *streamCTRL_scan(
                         matchOK = 1;
                     }
 
-
-
-                    if((pch) && (matchOK == 1))
+                    if ((pch) && (matchOK == 1))
                     {
                         imageID ID;
 
@@ -617,16 +526,14 @@ void *streamCTRL_scan(
                         int retv;
                         char fullname[STRINGMAXLEN_FULLFILENAME];
 
-
-                        if(streaminfoproc->WriteFlistToFile == 1)
+                        if (streaminfoproc->WriteFlistToFile == 1)
                         {
                             fprintf(fpfscan, "%4ld  %20s ", sindex, dir->d_name);
                         }
 
-                        WRITE_FULLFILENAME(fullname, "%s/%s", SHAREDSHMDIR,
-                                           dir->d_name);
+                        WRITE_FULLFILENAME(fullname, "%s/%s", SHAREDSHMDIR, dir->d_name);
                         retv = lstat(fullname, &buf);
-                        if(retv == -1)
+                        if (retv == -1)
                         {
                             endwin();
                             printf("File \"%s\"", dir->d_name);
@@ -634,37 +541,32 @@ void *streamCTRL_scan(
                             exit(EXIT_FAILURE);
                         }
 
-
-
-                        if(S_ISLNK(buf.st_mode))  // resolve link name
+                        if (S_ISLNK(buf.st_mode)) // resolve link name
                         {
                             char fullname[STRINGMAXLEN_FULLFILENAME];
                             char *linknamefull;
                             char linkname[STRINGMAXLEN_FULLFILENAME];
                             int pathOK = 1;
 
-
                             streaminfo[sindex].SymLink = 1;
-                            WRITE_FULLFILENAME(fullname, "%s/%s", SHAREDSHMDIR,
-                                               dir->d_name);
+                            WRITE_FULLFILENAME(fullname, "%s/%s", SHAREDSHMDIR, dir->d_name);
                             //                        readlink (fullname, linknamefull, 200-1);
                             linknamefull = realpath(fullname, NULL);
 
-                            if(linknamefull == NULL)
+                            if (linknamefull == NULL)
                             {
                                 pathOK = 0;
                             }
-                            else if(access(linknamefull, R_OK))     // file cannot be read
+                            else if (access(linknamefull, R_OK)) // file cannot be read
                             {
                                 pathOK = 0;
                             }
 
-                            if(pathOK == 0)   // file cannot be read
+                            if (pathOK == 0) // file cannot be read
                             {
-                                if(streaminfoproc->WriteFlistToFile == 1)
+                                if (streaminfoproc->WriteFlistToFile == 1)
                                 {
-                                    fprintf(fpfscan, " %s <-> LINK %s CANNOT BE READ -> off", fullname,
-                                            linknamefull);
+                                    fprintf(fpfscan, " %s <-> LINK %s CANNOT BE READ -> off", fullname, linknamefull);
                                 }
                                 scanentryOK = 0;
                             }
@@ -674,47 +576,43 @@ void *streamCTRL_scan(
 
                                 int lOK = 1;
                                 unsigned int ii = 0;
-                                while((lOK == 1) && (ii < strlen(linkname)))
+                                while ((lOK == 1) && (ii < strlen(linkname)))
                                 {
-                                    if(linkname[ii] == '.')
+                                    if (linkname[ii] == '.')
                                     {
                                         linkname[ii] = '\0';
                                         lOK = 0;
                                     }
                                     ii++;
                                 }
-                                strncpy(streaminfo[sindex].linkname, linkname,
-                                        STRINGMAXLEN_STREAMINFO_NAME - 1);
+                                strncpy(streaminfo[sindex].linkname, linkname, STRINGMAXLEN_STREAMINFO_NAME - 1);
                             }
 
-                            if(linknamefull != NULL)
+                            if (linknamefull != NULL)
                             {
                                 free(linknamefull);
                             }
-
                         }
                         else
                         {
                             streaminfo[sindex].SymLink = 0;
                         }
 
-
-
                         // get stream name and ID
-                        if(scanentryOK == 1)
+                        if (scanentryOK == 1)
                         {
                             int strlencp1 = STRINGMAXLEN_STREAMINFO_NAME;
                             int strlencp = strlen(dir->d_name) - strlen(".im.shm");
-                            if(strlencp < strlencp1)
+                            if (strlencp < strlencp1)
                             {
                                 strlencp1 = strlencp;
                             }
                             strncpy(streaminfo[sindex].sname, dir->d_name, strlencp1);
                             streaminfo[sindex].sname[strlen(dir->d_name) - strlen(".im.shm")] = '\0';
 
-                            if(streaminfoproc->WriteFlistToFile == 1)
+                            if (streaminfoproc->WriteFlistToFile == 1)
                             {
-                                if(streaminfo[sindex].SymLink == 1)
+                                if (streaminfo[sindex].SymLink == 1)
                                 {
                                     fprintf(fpfscan, "| %12s -> [ %12s ] ", streaminfo[sindex].sname,
                                             streaminfo[sindex].linkname);
@@ -726,22 +624,20 @@ void *streamCTRL_scan(
                             }
                         }
 
-
-                        if(scanentryOK == 1)
+                        if (scanentryOK == 1)
                         {
 
                             ID = image_ID_from_images(images, streaminfo[sindex].sname);
 
                             // connect to stream
-                            if(ID == -1)
+                            if (ID == -1)
                             {
                                 ID = image_get_first_ID_available_from_images(images);
-                                if(ID < 0)
+                                if (ID < 0)
                                 {
                                     return NULL;
                                 }
-                                ImageStreamIO_read_sharedmem_image_toIMAGE(streaminfo[sindex].sname,
-                                        &images[ID]);
+                                ImageStreamIO_read_sharedmem_image_toIMAGE(streaminfo[sindex].sname, &images[ID]);
                                 streaminfo[sindex].deltacnt0 = 1;
                                 streaminfo[sindex].updatevalue = 1.0;
                                 streaminfo[sindex].updatevalue_frozen = 1.0;
@@ -749,11 +645,12 @@ void *streamCTRL_scan(
                             else
                             {
                                 float gainv = 1.0;
-                                if(firstIter == 0)
+                                if (firstIter == 0)
                                 {
                                     streaminfo[sindex].deltacnt0 = images[ID].md[0].cnt0 - streaminfo[sindex].cnt0;
-                                    streaminfo[sindex].updatevalue = (1.0 - gainv) * streaminfo[sindex].updatevalue
-                                                                     + gainv * (1.0 * streaminfo[sindex].deltacnt0 / tdiffv);
+                                    streaminfo[sindex].updatevalue =
+                                        (1.0 - gainv) * streaminfo[sindex].updatevalue +
+                                        gainv * (1.0 * streaminfo[sindex].deltacnt0 / tdiffv);
                                 }
 
                                 streaminfo[sindex].cnt0 = images[ID].md[0].cnt0; // keep memory of cnt0
@@ -763,7 +660,7 @@ void *streamCTRL_scan(
                                 sindex++;
                             }
                         }
-                        if(streaminfoproc->WriteFlistToFile == 1)
+                        if (streaminfoproc->WriteFlistToFile == 1)
                         {
                             fprintf(fpfscan, "\n");
                         }
@@ -774,7 +671,7 @@ void *streamCTRL_scan(
             }
             closedir(d);
 
-            if(streaminfoproc->WriteFlistToFile == 1)
+            if (streaminfoproc->WriteFlistToFile == 1)
             {
                 fclose(fpfscan);
             }
@@ -783,14 +680,9 @@ void *streamCTRL_scan(
 
         streaminfoproc->WriteFlistToFile = 0;
 
-
         firstIter = 0;
 
-
-
-
-
-        if(streaminfoproc->fuserUpdate == 1)
+        if (streaminfoproc->fuserUpdate == 1)
         {
             FILE *fp;
             int STRINGMAXLEN_LINE = 2000;
@@ -802,8 +694,7 @@ void *streamCTRL_scan(
             //            sindexscan1 = ssindex[sindexscan];
             int sindexscan1 = streaminfoproc->sindexscan;
 
-
-            if(streaminfoproc->sindexscan > NBsindex - 1)
+            if (streaminfoproc->sindexscan > NBsindex - 1)
             {
                 streaminfoproc->fuserUpdate = 0;
             }
@@ -811,19 +702,18 @@ void *streamCTRL_scan(
             {
                 int PReadMode = 1;
 
-                if(PReadMode == 0)
+                if (PReadMode == 0)
                 {
                     // popen option
                     {
-                        int slen = snprintf(command, STRINGMAXLEN_COMMAND,
-                                            "/bin/fuser %s/%s.im.shm 2>/dev/null", SHAREDSHMDIR,
-                                            streaminfo[sindexscan1].sname);
-                        if(slen < 1)
+                        int slen = snprintf(command, STRINGMAXLEN_COMMAND, "/bin/fuser %s/%s.im.shm 2>/dev/null",
+                                            SHAREDSHMDIR, streaminfo[sindexscan1].sname);
+                        if (slen < 1)
                         {
                             PRINT_ERROR("snprintf wrote <1 char");
                             abort(); // can't handle this error any other way
                         }
-                        if(slen >= STRINGMAXLEN_COMMAND)
+                        if (slen >= STRINGMAXLEN_COMMAND)
                         {
                             PRINT_ERROR("snprintf string truncation");
                             abort(); // can't handle this error any other way
@@ -831,7 +721,7 @@ void *streamCTRL_scan(
                     }
 
                     fp = popen(command, "r");
-                    if(fp == NULL)
+                    if (fp == NULL)
                     {
                         streaminfo[sindexscan1].streamOpenPID_status = 2; // failed
                     }
@@ -839,7 +729,7 @@ void *streamCTRL_scan(
                     {
                         streaminfo[sindexscan1].streamOpenPID_status = 1;
 
-                        if(fgets(plistoutline, STRINGMAXLEN_LINE - 1, fp) == NULL)
+                        if (fgets(plistoutline, STRINGMAXLEN_LINE - 1, fp) == NULL)
                         {
                             sprintf(plistoutline, " ");
                         }
@@ -850,39 +740,37 @@ void *streamCTRL_scan(
                 {
                     // filesystem option
                     char plistfname[STRINGMAXLEN_FULLFILENAME];
-                    WRITE_FULLFILENAME(plistfname, "%s/%s.shmplist", SHAREDSHMDIR,
-                                       streaminfo[sindexscan1].sname);
+                    WRITE_FULLFILENAME(plistfname, "%s/%s.shmplist", SHAREDSHMDIR, streaminfo[sindexscan1].sname);
 
                     {
-                        int slen = snprintf(command, STRINGMAXLEN_COMMAND,
-                                            "/bin/fuser %s/%s.im.shm 2>/dev/null > %s", SHAREDSHMDIR,
-                                            streaminfo[sindexscan1].sname, plistfname);
-                        if(slen < 1)
+                        int slen = snprintf(command, STRINGMAXLEN_COMMAND, "/bin/fuser %s/%s.im.shm 2>/dev/null > %s",
+                                            SHAREDSHMDIR, streaminfo[sindexscan1].sname, plistfname);
+                        if (slen < 1)
                         {
                             PRINT_ERROR("snprintf wrote <1 char");
                             abort(); // can't handle this error any other way
                         }
-                        if(slen >= STRINGMAXLEN_COMMAND)
+                        if (slen >= STRINGMAXLEN_COMMAND)
                         {
                             PRINT_ERROR("snprintf string truncation");
                             abort(); // can't handle this error any other way
                         }
                     }
 
-                    if(system(command) == -1)
+                    if (system(command) == -1)
                     {
                         perror("Command system() failed");
                         exit(EXIT_FAILURE);
                     }
 
                     fp = fopen(plistfname, "r");
-                    if(fp == NULL)
+                    if (fp == NULL)
                     {
                         streaminfo[sindexscan1].streamOpenPID_status = 2;
                     }
                     else
                     {
-                        if(fgets(plistoutline, STRINGMAXLEN_LINE - 1, fp) == NULL)
+                        if (fgets(plistoutline, STRINGMAXLEN_LINE - 1, fp) == NULL)
                         {
                             sprintf(plistoutline, " ");
                         }
@@ -891,19 +779,18 @@ void *streamCTRL_scan(
                     }
                 }
 
-
-                if(streaminfo[sindexscan1].streamOpenPID_status != 2)
+                if (streaminfo[sindexscan1].streamOpenPID_status != 2)
                 {
                     char *pch;
 
                     pch = strtok(plistoutline, " ");
 
-                    while(pch != NULL)
+                    while (pch != NULL)
                     {
-                        if(NBpid < streamOpenNBpid_MAX)
+                        if (NBpid < streamOpenNBpid_MAX)
                         {
                             streaminfo[sindexscan1].streamOpenPID[NBpid] = atoi(pch);
-                            if(getpgid(streaminfo[sindexscan1].streamOpenPID[NBpid]) >= 0)
+                            if (getpgid(streaminfo[sindexscan1].streamOpenPID[NBpid]) >= 0)
                             {
                                 NBpid++;
                             }
@@ -917,18 +804,17 @@ void *streamCTRL_scan(
                 // Get PID names
                 int pidIndex;
                 int cnt1 = 0;
-                for(pidIndex = 0; pidIndex < streaminfo[sindexscan1].streamOpenPID_cnt;
-                        pidIndex++)
+                for (pidIndex = 0; pidIndex < streaminfo[sindexscan1].streamOpenPID_cnt; pidIndex++)
                 {
                     pid_t pid = streaminfo[sindexscan1].streamOpenPID[pidIndex];
-                    if((getpgid(pid) >= 0) && (pid != getpid()))
+                    if ((getpgid(pid) >= 0) && (pid != getpid()))
                     {
-                        char *pname = (char *) calloc(1024, sizeof(char));
+                        char *pname = (char *)calloc(1024, sizeof(char));
                         get_process_name_by_pid(pid, pname);
 
-                        if(PIDname_array[pid] == NULL)
+                        if (PIDname_array[pid] == NULL)
                         {
-                            PIDname_array[pid] = (char *) malloc(sizeof(char) * (PIDnameStringLen + 1));
+                            PIDname_array[pid] = (char *)malloc(sizeof(char) * (PIDnameStringLen + 1));
                         }
                         strncpy(PIDname_array[pid], pname, PIDnameStringLen);
                         free(pname);
@@ -946,40 +832,24 @@ void *streamCTRL_scan(
         streaminfoproc->NBstream = NBsindex;
         streaminfoproc->loopcnt++;
 
-
         usleep(streaminfoproc->twaitus);
 
-        scancnt ++;
+        scancnt++;
     }
 
-
-
     return NULL;
 }
 
-
-
-
-
-
-
-
-static int streamCTRL_print_inode(
-    ino_t inode,
-    ino_t *upstreaminode,
-    int NBupstreaminode,
-    int downstreamindex
-)
+static int streamCTRL_print_inode(ino_t inode, ino_t *upstreaminode, int NBupstreaminode, int downstreamindex)
 {
     int Dispinode_NBchar = 9;
     int is_upstream = 0;
     int is_downstream = 0;
     int upstreamindex = 0;
 
-
-    for(int i = 0; i < NBupstreaminode; i++)
+    for (int i = 0; i < NBupstreaminode; i++)
     {
-        if(inode == upstreaminode[i])
+        if (inode == upstreaminode[i])
         {
             is_upstream = 1;
             upstreamindex = i;
@@ -987,21 +857,20 @@ static int streamCTRL_print_inode(
         }
     }
 
-    if(downstreamindex < NO_DOWNSTREAM_INDEX)
+    if (downstreamindex < NO_DOWNSTREAM_INDEX)
     {
         is_downstream = 1;
     }
 
-
-    if(is_upstream || is_downstream)
+    if (is_upstream || is_downstream)
     {
         int colorcode = 3;
-        if(upstreamindex > 0)
+        if (upstreamindex > 0)
         {
             colorcode = 7;
         }
 
-        if(is_upstream)
+        if (is_upstream)
         {
             //attron(COLOR_PAIR(colorcode));
             screenprint_setcolor(colorcode);
@@ -1016,10 +885,10 @@ static int streamCTRL_print_inode(
 
         TUI_printfw("-");
 
-        if(is_downstream)
+        if (is_downstream)
         {
             int colorcode = 3;
-            if(downstreamindex > 0)
+            if (downstreamindex > 0)
             {
                 colorcode = 7;
             }
@@ -1037,71 +906,58 @@ static int streamCTRL_print_inode(
     }
     else
     {
-        TUI_printfw("%*d", Dispinode_NBchar, (int) inode);
+        TUI_printfw("%*d", Dispinode_NBchar, (int)inode);
     }
 
     return Dispinode_NBchar;
 }
 
-
-
-
-
-
 /** @brief print PID with highlighting
  *
  */
-static int streamCTRL_print_procpid(
-    int DispPID_NBchar,
-    pid_t procpid,
-    pid_t *upstreamproc,
-    int NBupstreamproc,
-    uint32_t mode
-)
+static int streamCTRL_print_procpid(int DispPID_NBchar, pid_t procpid, pid_t *upstreamproc, int NBupstreamproc,
+                                    uint32_t mode)
 {
     //int DispPID_NBchar = 8;
     int activitycolorcode = 0;
     int is_upstream = 0;
     int upstreamindex = 0;
 
-
-    if(mode & PRINT_PID_FORCE_NOUPSTREAM)
+    if (mode & PRINT_PID_FORCE_NOUPSTREAM)
     {
         is_upstream = 0;
     }
     else
     {
-        for(int i = 0; i < NBupstreamproc; i++)
+        for (int i = 0; i < NBupstreamproc; i++)
         {
-            if(procpid == upstreamproc[i])
+            if (procpid == upstreamproc[i])
             {
                 is_upstream = 1;
                 upstreamindex = i;
                 break;
             }
         }
-
     }
 
-
-    if(procpid > 0)
+    if (procpid > 0)
     {
-        if(getpgid(procpid) >= 0)   // check if pid active
+        if (getpgid(procpid) >= 0) // check if pid active
         {
             activitycolorcode = 2;
         }
         else
         {
-            if(procpid > 0)
+            if (procpid > 0)
             {
                 activitycolorcode = 4;
             }
         }
     }
 
-    if(is_upstream == 1)
+    if (is_upstream == 1)
     {
-        if(activitycolorcode != 2)
+        if (activitycolorcode != 2)
         {
             screenprint_setreverse();
             //attron(A_REVERSE);
@@ -1112,17 +968,13 @@ static int streamCTRL_print_procpid(
         }
     }
 
-
-
-
-    if(activitycolorcode > 0)
+    if (activitycolorcode > 0)
     {
         screenprint_setcolor(activitycolorcode);
         //attron(COLOR_PAIR(activitycolorcode));
     }
 
-
-    if(is_upstream)
+    if (is_upstream)
     {
         char upstreamstring[DispPID_NBchar + 1];
         sprintf(upstreamstring, "%2d >>", upstreamindex);
@@ -1130,38 +982,26 @@ static int streamCTRL_print_procpid(
     }
     else
     {
-        TUI_printfw("%*d", DispPID_NBchar, (int) procpid);
+        TUI_printfw("%*d", DispPID_NBchar, (int)procpid);
     }
 
-
-    if(activitycolorcode > 0)
+    if (activitycolorcode > 0)
     {
         screenprint_unsetcolor(activitycolorcode);
         //attroff(COLOR_PAIR(activitycolorcode));
     }
 
-
-    if((activitycolorcode != 2) && (is_upstream == 1))
+    if ((activitycolorcode != 2) && (is_upstream == 1))
     {
         screenprint_unsetreverse();
         //attroff(A_REVERSE);
     }
 
-
     return DispPID_NBchar;
 }
 
-
-
-
-
-static errno_t streamCTRL_print_SPTRACE_details(
-    IMAGE *streamCTRLimages,
-    imageID ID,
-    pid_t *upstreamproc,
-    int NBupstreamproc,
-    uint32_t print_pid_mode
-)
+static errno_t streamCTRL_print_SPTRACE_details(IMAGE *streamCTRLimages, imageID ID, pid_t *upstreamproc,
+                                                int NBupstreamproc, uint32_t print_pid_mode)
 {
     /*
        	int             triggermode;
@@ -1183,26 +1023,19 @@ static errno_t streamCTRL_print_SPTRACE_details(
     int Disp_type_NBchar = 8;
     int Disp_trigstat_NBchar = 12;
 
-
     // suppress unused parameter warning
-    (void) print_pid_mode;
+    (void)print_pid_mode;
 
     TUI_newline();
-    TUI_printfw("   %*s %*s %*s",
-                Disp_inode_NBchar, "inode",
-                Disp_sname_NBchar, "stream",
-                Disp_cnt0_NBchar, "cnt0",
-                Disp_PID_NBchar, "PID",
-                Disp_type_NBchar, "type"
-               );
+    TUI_printfw("   %*s %*s %*s", Disp_inode_NBchar, "inode", Disp_sname_NBchar, "stream", Disp_cnt0_NBchar, "cnt0",
+                Disp_PID_NBchar, "PID", Disp_type_NBchar, "type");
     TUI_newline();
 
-
-    for(int spti = 0; spti < streamCTRLimages[ID].md[0].NBproctrace; spti++)
+    for (int spti = 0; spti < streamCTRLimages[ID].md[0].NBproctrace; spti++)
     {
         ino_t inode = streamCTRLimages[ID].streamproctrace[spti].trigger_inode;
-        int   sem   = streamCTRLimages[ID].streamproctrace[spti].trigsemindex;
-        pid_t pid   = streamCTRLimages[ID].streamproctrace[spti].procwrite_PID;
+        int sem = streamCTRLimages[ID].streamproctrace[spti].trigsemindex;
+        pid_t pid = streamCTRLimages[ID].streamproctrace[spti].procwrite_PID;
 
         uint64_t cnt0 = streamCTRLimages[ID].streamproctrace[spti].cnt0;
 
@@ -1210,22 +1043,21 @@ static errno_t streamCTRL_print_SPTRACE_details(
 
         TUI_printfw(" %*lu", Disp_inode_NBchar, inode);
 
-
         // look for ID corresponding to inode
         int IDscan = 0;
         int IDfound = -1;
-        while((IDfound == -1) && (IDscan < streamNBID_MAX))
+        while ((IDfound == -1) && (IDscan < streamNBID_MAX))
         {
-            if(streamCTRLimages[IDscan].used == 1)
+            if (streamCTRLimages[IDscan].used == 1)
             {
-                if(streamCTRLimages[IDscan].md[0].inode == inode)
+                if (streamCTRLimages[IDscan].md[0].inode == inode)
                 {
                     IDfound = IDscan;
                 }
             }
             IDscan++;
         }
-        if(IDfound == -1)
+        if (IDfound == -1)
         {
             TUI_printfw(" %*s", Disp_sname_NBchar, "???");
         }
@@ -1237,90 +1069,80 @@ static errno_t streamCTRL_print_SPTRACE_details(
         TUI_printfw(" %*llu", Disp_cnt0_NBchar, cnt0);
         TUI_printfw(" ");
 
-        Disp_PID_NBchar = streamCTRL_print_procpid(8, pid, upstreamproc, NBupstreamproc,
-                          PRINT_PID_FORCE_NOUPSTREAM);
-
+        Disp_PID_NBchar = streamCTRL_print_procpid(8, pid, upstreamproc, NBupstreamproc, PRINT_PID_FORCE_NOUPSTREAM);
 
         TUI_printfw(" ");
 
-        switch(streamCTRLimages[ID].streamproctrace[spti].triggermode)
+        switch (streamCTRLimages[ID].streamproctrace[spti].triggermode)
         {
-            case PROCESSINFO_TRIGGERMODE_IMMEDIATE:
-                TUI_printfw("%d%*s",  streamCTRLimages[ID].streamproctrace[spti].triggermode,
-                            Disp_type_NBchar - 1, "IMME");
-                break;
+        case PROCESSINFO_TRIGGERMODE_IMMEDIATE:
+            TUI_printfw("%d%*s", streamCTRLimages[ID].streamproctrace[spti].triggermode, Disp_type_NBchar - 1, "IMME");
+            break;
 
-            case PROCESSINFO_TRIGGERMODE_CNT0:
-                TUI_printfw("%d%*s",  streamCTRLimages[ID].streamproctrace[spti].triggermode,
-                            Disp_type_NBchar - 1, "CNT0");
-                break;
+        case PROCESSINFO_TRIGGERMODE_CNT0:
+            TUI_printfw("%d%*s", streamCTRLimages[ID].streamproctrace[spti].triggermode, Disp_type_NBchar - 1, "CNT0");
+            break;
 
-            case PROCESSINFO_TRIGGERMODE_CNT1:
-                TUI_printfw("%d%*s", streamCTRLimages[ID].streamproctrace[spti].triggermode,
-                            Disp_type_NBchar - 1, "CNT1");
-                break;
+        case PROCESSINFO_TRIGGERMODE_CNT1:
+            TUI_printfw("%d%*s", streamCTRLimages[ID].streamproctrace[spti].triggermode, Disp_type_NBchar - 1, "CNT1");
+            break;
 
-            case PROCESSINFO_TRIGGERMODE_SEMAPHORE:
-                TUI_printfw("%d%*s", streamCTRLimages[ID].streamproctrace[spti].triggermode,
-                            Disp_type_NBchar - 4, "SM");
-                TUI_printfw(" %2d", sem);
-                break;
+        case PROCESSINFO_TRIGGERMODE_SEMAPHORE:
+            TUI_printfw("%d%*s", streamCTRLimages[ID].streamproctrace[spti].triggermode, Disp_type_NBchar - 4, "SM");
+            TUI_printfw(" %2d", sem);
+            break;
 
-            case PROCESSINFO_TRIGGERMODE_DELAY:
-                TUI_printfw("%d%*s", streamCTRLimages[ID].streamproctrace[spti].triggermode,
-                            Disp_type_NBchar - 1, "DELA");
-                break;
+        case PROCESSINFO_TRIGGERMODE_DELAY:
+            TUI_printfw("%d%*s", streamCTRLimages[ID].streamproctrace[spti].triggermode, Disp_type_NBchar - 1, "DELA");
+            break;
 
-            default:
-                TUI_printfw("%d%*s", streamCTRLimages[ID].streamproctrace[spti].triggermode,
-                            Disp_type_NBchar - 1, "UNKN");
-                break;
+        default:
+            TUI_printfw("%d%*s", streamCTRLimages[ID].streamproctrace[spti].triggermode, Disp_type_NBchar - 1, "UNKN");
+            break;
         }
         TUI_printfw(" ");
 
         int print_timing = 0;
-        switch(streamCTRLimages[ID].streamproctrace[spti].triggerstatus)
+        switch (streamCTRLimages[ID].streamproctrace[spti].triggerstatus)
         {
-            case PROCESSINFO_TRIGGERSTATUS_WAITING:
-                TUI_printfw("%*s", Disp_trigstat_NBchar, "WAITING");
-                break;
+        case PROCESSINFO_TRIGGERSTATUS_WAITING:
+            TUI_printfw("%*s", Disp_trigstat_NBchar, "WAITING");
+            break;
 
-            case PROCESSINFO_TRIGGERSTATUS_RECEIVED:
-                screenprint_setcolor(2);
-                //attron(COLOR_PAIR(2));
-                TUI_printfw("%*s", Disp_trigstat_NBchar, "RECEIVED");
-                screenprint_unsetcolor(2);
-                //attroff(COLOR_PAIR(2));
-                print_timing = 1;
-                break;
+        case PROCESSINFO_TRIGGERSTATUS_RECEIVED:
+            screenprint_setcolor(2);
+            //attron(COLOR_PAIR(2));
+            TUI_printfw("%*s", Disp_trigstat_NBchar, "RECEIVED");
+            screenprint_unsetcolor(2);
+            //attroff(COLOR_PAIR(2));
+            print_timing = 1;
+            break;
 
-            case PROCESSINFO_TRIGGERSTATUS_TIMEDOUT:
-                //attron(COLOR_PAIR(3));
-                screenprint_setcolor(3);
-                TUI_printfw("%*s", Disp_trigstat_NBchar, "TIMEOUT");
-                //attroff(COLOR_PAIR(3));
-                screenprint_unsetcolor(3);
-                print_timing = 1;
-                break;
+        case PROCESSINFO_TRIGGERSTATUS_TIMEDOUT:
+            //attron(COLOR_PAIR(3));
+            screenprint_setcolor(3);
+            TUI_printfw("%*s", Disp_trigstat_NBchar, "TIMEOUT");
+            //attroff(COLOR_PAIR(3));
+            screenprint_unsetcolor(3);
+            print_timing = 1;
+            break;
 
-            default :
-                TUI_printfw("%*s", Disp_trigstat_NBchar, "unknown");
-                break;
+        default:
+            TUI_printfw("%*s", Disp_trigstat_NBchar, "unknown");
+            break;
         }
 
         // trigger time
-        if(print_timing == 1)
+        if (print_timing == 1)
         {
-            TUI_printfw(" at %ld.%09ld s",
-                        streamCTRLimages[ID].streamproctrace[spti].ts_procstart.tv_sec,
+            TUI_printfw(" at %ld.%09ld s", streamCTRLimages[ID].streamproctrace[spti].ts_procstart.tv_sec,
                         streamCTRLimages[ID].streamproctrace[spti].ts_procstart.tv_nsec);
 
             struct timespec tnow;
             clock_gettime(CLOCK_REALTIME, &tnow);
             struct timespec tdiff;
 
-            tdiff = timespec_diff(streamCTRLimages[ID].streamproctrace[spti].ts_procstart,
-                                  tnow);
+            tdiff = timespec_diff(streamCTRLimages[ID].streamproctrace[spti].ts_procstart, tnow);
             double tdiffv = 1.0 * tdiff.tv_sec + 1.0e-9 * tdiff.tv_nsec;
 
             TUI_printfw("  %12.3f us ago", tdiffv * 1.0e6);
@@ -1329,14 +1151,9 @@ static errno_t streamCTRL_print_SPTRACE_details(
         TUI_newline();
     }
 
-
     return RETURN_SUCCESS;
 }
 
-
-
-
-
 /**
  * @brief Control screen for stream structures
  *
@@ -1351,46 +1168,39 @@ errno_t streamCTRL_CTRLscreen()
     STREAMINFO *streaminfo;
     STREAMINFOPROC streaminfoproc;
 
-    long sindex;  // scan index
-    long dindex;  // display index
+    long sindex;           // scan index
+    long dindex;           // display index
     long doffsetindex = 0; // offset index if more entries than can be displayed
 
     long ssindex[streamNBID_MAX]; // sorted index array
 
     float frequ = 32.0; // Hz
-    char  monstring[200];
-
-
+    char monstring[200];
 
     int SORTING = 0;
     int SORT_TOGGLE = 0;
 
-
     DEBUG_TRACEPOINT("function start ");
 
-
     pthread_t threadscan;
 
-
     // display
     int DispName_NBchar = 36;
     int DispSize_NBchar = 20;
     int Dispcnt0_NBchar = 10;
-    int Dispfreq_NBchar =  8;
-    int DispPID_NBchar  =  8;
+    int Dispfreq_NBchar = 8;
+    int DispPID_NBchar = 8;
 
     // create PID name table
     char **PIDname_array;
     int PIDmax;
 
-
-
     PIDmax = get_PIDmax();
 
     DEBUG_TRACEPOINT("PID max = %d ", PIDmax);
 
-    PIDname_array = (char **)malloc(sizeof(char *)*PIDmax);
-    for(int pidi = 0; pidi < PIDmax; pidi++)
+    PIDname_array = (char **)malloc(sizeof(char *) * PIDmax);
+    for (int pidi = 0; pidi < PIDmax; pidi++)
     {
         PIDname_array[pidi] = NULL;
     }
@@ -1399,9 +1209,9 @@ errno_t streamCTRL_CTRLscreen()
     streaminfoproc.loopcnt = 0;
     streaminfoproc.fuserUpdate = 0;
 
-    streaminfo = (STREAMINFO *) malloc(sizeof(STREAMINFO) * streamNBID_MAX);
+    streaminfo = (STREAMINFO *)malloc(sizeof(STREAMINFO) * streamNBID_MAX);
     streaminfoproc.sinfo = streaminfo;
-    for(int sindex = 0; sindex < streamNBID_MAX; sindex++)
+    for (int sindex = 0; sindex < streamNBID_MAX; sindex++)
     {
         streaminfo[sindex].updatevalue = 0.0;
         streaminfo[sindex].updatevalue_frozen = 0.0;
@@ -1410,113 +1220,91 @@ errno_t streamCTRL_CTRLscreen()
     }
     streaminfoproc.PIDtable = PIDname_array;
 
-
-    IMAGE *streamCTRLimages = (IMAGE *) malloc(sizeof(IMAGE) * streamNBID_MAX);
-    for(imageID imID = 0; imID < streamNBID_MAX; imID++)
+    IMAGE *streamCTRLimages = (IMAGE *)malloc(sizeof(IMAGE) * streamNBID_MAX);
+    for (imageID imID = 0; imID < streamNBID_MAX; imID++)
     {
-        streamCTRLimages[imID].used    = 0;
-        streamCTRLimages[imID].shmfd   = -1;
+        streamCTRLimages[imID].used = 0;
+        streamCTRLimages[imID].shmfd = -1;
         streamCTRLimages[imID].memsize = 0;
-        streamCTRLimages[imID].semptr  = NULL;
-        streamCTRLimages[imID].semlog  = NULL;
+        streamCTRLimages[imID].semptr = NULL;
+        streamCTRLimages[imID].semlog = NULL;
     }
 
     struct streamCTRLarg_struct streamCTRLdata;
     streamCTRLdata.streaminfoproc = &streaminfoproc;
-    streamCTRLdata.images         = streamCTRLimages;
-
-
-
+    streamCTRLdata.images = streamCTRLimages;
 
     // catch signals (CTRL-C etc)
     //
     set_signal_catch();
 
-
     // default: use ncurses
     TUI_set_screenprintmode(SCREENPRINT_NCURSES);
 
-    if(getenv("MILK_TUIPRINT_STDIO"))
+    if (getenv("MILK_TUIPRINT_STDIO"))
     {
         // use stdio instead of ncurses
         TUI_set_screenprintmode(SCREENPRINT_STDIO);
     }
 
-    if(getenv("MILK_TUIPRINT_NONE"))
+    if (getenv("MILK_TUIPRINT_NONE"))
     {
         TUI_set_screenprintmode(SCREENPRINT_NONE);
     }
 
-
-
     DEBUG_TRACEPOINT("Initialize terminal");
     TUI_init_terminal(&wrow, &wcol);
 
-
-
-
     int NBsindex = 0;
     int loopOK = 1;
     long long loopcnt = 0;
 
-
     int dindexSelected = 0;
 
     int DisplayMode = DISPLAY_MODE_SEMVAL;
 
-
     struct tm *uttime_lastScan;
     time_t rawtime;
     int fuserScan = 0;
 
     streaminfoproc.filter = 0;
     streaminfoproc.NBstream = 0;
-    streaminfoproc.twaitus = 50000; // 20 Hz
+    streaminfoproc.twaitus = 50000;  // 20 Hz
     streaminfoproc.fuserUpdate0 = 1; //update on first instance
 
     // inodes that are upstream of current selection
     int NBupstreaminodeMAX = 100;
     ino_t *upstreaminode;
     int NBupstreaminode = 0;
-    upstreaminode = (ino_t *) malloc(sizeof(ino_t) * NBupstreaminodeMAX);
-
+    upstreaminode = (ino_t *)malloc(sizeof(ino_t) * NBupstreaminodeMAX);
 
     // processes that are upstream of current selection
     int NBupstreamprocMAX = 100;
     pid_t *upstreamproc;
     int NBupstreamproc = 0;
-    upstreamproc = (pid_t *) malloc(sizeof(pid_t) * NBupstreamprocMAX);
-
+    upstreamproc = (pid_t *)malloc(sizeof(pid_t) * NBupstreamprocMAX);
 
     clear();
     DEBUG_TRACEPOINT(" ");
 
-
-
-
-
     // redirect stderr to /dev/null
 
     int backstderr;
     int newstderr;
     char newstderrfname[STRINGMAXLEN_FULLFILENAME];
 
-
     fflush(stderr);
     backstderr = dup(STDERR_FILENO);
-    WRITE_FULLFILENAME(newstderrfname, "%s/stderr.cli.%d.txt", SHAREDSHMDIR,
-                       CLIPID);
+    WRITE_FULLFILENAME(newstderrfname, "%s/stderr.cli.%d.txt", SHAREDSHMDIR, CLIPID);
     //sprintf(newstderrfname, "%s/stderr.cli.%d.txt", SHAREDSHMDIR, CLIPID);
     umask(0);
     newstderr = open(newstderrfname, O_WRONLY | O_CREAT, FILEMODE);
     dup2(newstderr, STDERR_FILENO);
     close(newstderr);
 
-
-
     DEBUG_TRACEPOINT("Start scan thread");
     streaminfoproc.loop = 1;
-    pthread_create(&threadscan, NULL, streamCTRL_scan, (void *) &streamCTRLdata);
+    pthread_create(&threadscan, NULL, streamCTRL_scan, (void *)&streamCTRLdata);
 
     DEBUG_TRACEPOINT("Scan thread started");
 
@@ -1525,20 +1313,18 @@ errno_t streamCTRL_CTRLscreen()
 
     loopcnt = 0;
 
-
     DEBUG_TRACEPOINT("get terminal size");
     TUI_init_terminal(&wrow, &wcol);
-//        TUI_get_terminal_size(&wrow, &wcol);
+    //        TUI_get_terminal_size(&wrow, &wcol);
 
     ino_t inodeselected = 0;
     int DisplayDetailLevel = 0;
-    while(loopOK == 1)
+    while (loopOK == 1)
     {
 
         int NBsinfodisp = wrow - 7;
 
-
-        if(streaminfoproc.loopcnt == 1)
+        if (streaminfoproc.loopcnt == 1)
         {
             SORTING = 2;
             SORT_TOGGLE = 1;
@@ -1558,224 +1344,210 @@ errno_t streamCTRL_CTRLscreen()
 
         DEBUG_TRACEPOINT("Process input character");
         //int selectedOK = 0; // goes to 1 if at least one process is selected
-        switch(ch)
+        switch (ch)
         {
-            case 'x':     // Exit control screen
-                loopOK = 0;
-                break;
-
-
-            case KEY_UP:
-                dindexSelected --;
-                if(dindexSelected < 0)
-                {
-                    dindexSelected = 0;
-                }
-                break;
-
-            case KEY_DOWN:
-                dindexSelected ++;
-                if(dindexSelected > NBsindex - 1)
-                {
-                    dindexSelected = NBsindex - 1;
-                }
-                break;
-
-            case KEY_PPAGE:
-                dindexSelected -= 10;
-                if(dindexSelected < 0)
-                {
-                    dindexSelected = 0;
-                }
-                break;
+        case 'x': // Exit control screen
+            loopOK = 0;
+            break;
 
-            case KEY_LEFT:
-                DisplayDetailLevel = 0;
-                break;
+        case KEY_UP:
+            dindexSelected--;
+            if (dindexSelected < 0)
+            {
+                dindexSelected = 0;
+            }
+            break;
 
-            case KEY_RIGHT:
-                DisplayDetailLevel = 1;
-                break;
+        case KEY_DOWN:
+            dindexSelected++;
+            if (dindexSelected > NBsindex - 1)
+            {
+                dindexSelected = NBsindex - 1;
+            }
+            break;
 
+        case KEY_PPAGE:
+            dindexSelected -= 10;
+            if (dindexSelected < 0)
+            {
+                dindexSelected = 0;
+            }
+            break;
 
-            case KEY_NPAGE:
-                dindexSelected += 10;
-                if(dindexSelected > NBsindex - 1)
-                {
-                    dindexSelected = NBsindex - 1;
-                }
-                break;
+        case KEY_LEFT:
+            DisplayDetailLevel = 0;
+            break;
 
+        case KEY_RIGHT:
+            DisplayDetailLevel = 1;
+            break;
 
+        case KEY_NPAGE:
+            dindexSelected += 10;
+            if (dindexSelected > NBsindex - 1)
+            {
+                dindexSelected = NBsindex - 1;
+            }
+            break;
 
             // ============ SCREENS
 
-            case 'h': // help
-                DisplayMode = DISPLAY_MODE_HELP;
-                break;
-
-            case KEY_F(2): // semvals
-                DisplayMode = DISPLAY_MODE_SEMVAL;
-                break;
-
-            case KEY_F(3): // write PIDs
-                DisplayMode = DISPLAY_MODE_WRITE;
-                break;
+        case 'h': // help
+            DisplayMode = DISPLAY_MODE_HELP;
+            break;
 
-            case KEY_F(4): // read PIDs
-                DisplayMode = DISPLAY_MODE_READ;
-                break;
+        case KEY_F(2): // semvals
+            DisplayMode = DISPLAY_MODE_SEMVAL;
+            break;
 
-            case KEY_F(5): // read PIDs
-                DisplayMode = DISPLAY_MODE_SPTRACE;
-                break;
+        case KEY_F(3): // write PIDs
+            DisplayMode = DISPLAY_MODE_WRITE;
+            break;
 
-            case KEY_F(6): // open files
-                if((DisplayMode == DISPLAY_MODE_FUSER) || (streaminfoproc.fuserUpdate0 == 1))
-                {
-                    streaminfoproc.fuserUpdate = 1;
-                    time(&rawtime);
-                    uttime_lastScan = gmtime(&rawtime);
-                    fuserScan = 1;
-                    streaminfoproc.sindexscan = 0;
-                }
+        case KEY_F(4): // read PIDs
+            DisplayMode = DISPLAY_MODE_READ;
+            break;
 
-                DisplayMode = DISPLAY_MODE_FUSER;
-                //erase();
-                //TUI_printfw("SCANNING PROCESSES AND FILESYSTEM: PLEASE WAIT ...\n");
-                //refresh();
-                break;
+        case KEY_F(5): // read PIDs
+            DisplayMode = DISPLAY_MODE_SPTRACE;
+            break;
 
+        case KEY_F(6): // open files
+            if ((DisplayMode == DISPLAY_MODE_FUSER) || (streaminfoproc.fuserUpdate0 == 1))
+            {
+                streaminfoproc.fuserUpdate = 1;
+                time(&rawtime);
+                uttime_lastScan = gmtime(&rawtime);
+                fuserScan = 1;
+                streaminfoproc.sindexscan = 0;
+            }
 
+            DisplayMode = DISPLAY_MODE_FUSER;
+            //erase();
+            //TUI_printfw("SCANNING PROCESSES AND FILESYSTEM: PLEASE WAIT ...\n");
+            //refresh();
+            break;
 
             // ============ ACTIONS
 
-            case 'R': // remove stream
-                DEBUG_TRACEPOINT(" ");
-                sindex = ssindex[dindexSelected];
-
-                ImageStreamIO_destroyIm(&streamCTRLimages[streaminfo[sindex].ID]);
-
-
-                DEBUG_TRACEPOINT("%d", dindexSelected);
-                break;
+        case 'R': // remove stream
+            DEBUG_TRACEPOINT(" ");
+            sindex = ssindex[dindexSelected];
 
+            ImageStreamIO_destroyIm(&streamCTRLimages[streaminfo[sindex].ID]);
 
+            DEBUG_TRACEPOINT("%d", dindexSelected);
+            break;
 
             // ============ SCANNING
 
-            case '{': // slower scan update
-                streaminfoproc.twaitus = (int)(1.2 * streaminfoproc.twaitus);
-                if(streaminfoproc.twaitus > 1000000)
-                {
-                    streaminfoproc.twaitus = 1000000;
-                }
-                break;
+        case '{': // slower scan update
+            streaminfoproc.twaitus = (int)(1.2 * streaminfoproc.twaitus);
+            if (streaminfoproc.twaitus > 1000000)
+            {
+                streaminfoproc.twaitus = 1000000;
+            }
+            break;
 
-            case '}': // faster scan update
-                streaminfoproc.twaitus = (int)(0.83333333333333333333 * streaminfoproc.twaitus);
-                if(streaminfoproc.twaitus < 1000)
-                {
-                    streaminfoproc.twaitus = 1000;
-                }
-                break;
+        case '}': // faster scan update
+            streaminfoproc.twaitus = (int)(0.83333333333333333333 * streaminfoproc.twaitus);
+            if (streaminfoproc.twaitus < 1000)
+            {
+                streaminfoproc.twaitus = 1000;
+            }
+            break;
 
-            case 'o': // output next scan to file
-                streaminfoproc.WriteFlistToFile = 1;
-                break;
+        case 'o': // output next scan to file
+            streaminfoproc.WriteFlistToFile = 1;
+            break;
 
             // ============ DISPLAY
 
-            case '-': // slower display update
-                frequ *= 0.5;
-                if(frequ < 1.0)
-                {
-                    frequ = 1.0;
-                }
-                if(frequ > 64.0)
-                {
-                    frequ = 64.0;
-                }
-                break;
-
+        case '-': // slower display update
+            frequ *= 0.5;
+            if (frequ < 1.0)
+            {
+                frequ = 1.0;
+            }
+            if (frequ > 64.0)
+            {
+                frequ = 64.0;
+            }
+            break;
 
-            case '+': // faster display update
-                frequ *= 2.0;
-                if(frequ < 1.0)
-                {
-                    frequ = 1.0;
-                }
-                if(frequ > 64.0)
-                {
-                    frequ = 64.0;
-                }
-                break;
+        case '+': // faster display update
+            frequ *= 2.0;
+            if (frequ < 1.0)
+            {
+                frequ = 1.0;
+            }
+            if (frequ > 64.0)
+            {
+                frequ = 64.0;
+            }
+            break;
 
-            case '1': // sorting by stream name
-                SORTING = 1;
-                break;
+        case '1': // sorting by stream name
+            SORTING = 1;
+            break;
 
-            case '2': // sorting by update freq (default)
-                SORTING = 2;
-                SORT_TOGGLE = 1;
-                break;
+        case '2': // sorting by update freq (default)
+            SORTING = 2;
+            SORT_TOGGLE = 1;
+            break;
 
-            case '3': // sort by number of processes accessing
-                SORTING = 3;
-                SORT_TOGGLE = 1;
-                break;
+        case '3': // sort by number of processes accessing
+            SORTING = 3;
+            SORT_TOGGLE = 1;
+            break;
 
+        case 'f': // stream name filter toggle
+            if (streaminfoproc.filter == 0)
+            {
+                streaminfoproc.filter = 1;
+            }
+            else
+            {
+                streaminfoproc.filter = 0;
+            }
+            break;
 
-            case 'f': // stream name filter toggle
-                if(streaminfoproc.filter == 0)
+        case 'F': // set stream name filter string
+            TUI_exit();
+            EXECUTE_SYSTEM_COMMAND("clear");
+            printf("Enter string: ");
+            fflush(stdout);
+            stringindex = 0;
+            while (((c = getchar()) != '\n') && (stringindex < STRINGLENMAX - 2))
+            {
+                streaminfoproc.namefilter[stringindex] = c;
+                if (c == 127) // delete key
                 {
-                    streaminfoproc.filter = 1;
+                    putchar(0x8);
+                    putchar(' ');
+                    putchar(0x8);
+                    stringindex--;
                 }
                 else
                 {
-                    streaminfoproc.filter = 0;
+                    //printf("[%d]", (int) c);
+                    putchar(c); // echo on screen
+                    stringindex++;
                 }
-                break;
-
-            case 'F': // set stream name filter string
-                TUI_exit();
-                EXECUTE_SYSTEM_COMMAND("clear");
-                printf("Enter string: ");
-                fflush(stdout);
-                stringindex = 0;
-                while(((c = getchar()) != '\n') && (stringindex < STRINGLENMAX - 2))
-                {
-                    streaminfoproc.namefilter[stringindex] = c;
-                    if(c == 127)   // delete key
-                    {
-                        putchar(0x8);
-                        putchar(' ');
-                        putchar(0x8);
-                        stringindex --;
-                    }
-                    else
-                    {
-                        //printf("[%d]", (int) c);
-                        putchar(c);  // echo on screen
-                        stringindex++;
-                    }
-                }
-                printf("string entered\n");
-                streaminfoproc.namefilter[stringindex] = '\0';
-                TUI_init_terminal(&wrow, &wcol);
-                break;
-
-
-
+            }
+            printf("string entered\n");
+            streaminfoproc.namefilter[stringindex] = '\0';
+            TUI_init_terminal(&wrow, &wcol);
+            break;
         }
 
         DEBUG_TRACEPOINT("Input character processed");
 
-        if(dindexSelected < 0)
+        if (dindexSelected < 0)
         {
             dindexSelected = 0;
         }
-        if(dindexSelected > NBsindex - 1)
+        if (dindexSelected > NBsindex - 1)
         {
             dindexSelected = NBsindex - 1;
         }
@@ -1785,19 +1557,16 @@ errno_t streamCTRL_CTRLscreen()
 
         //attron(A_BOLD);
         screenprint_setbold();
-        sprintf(monstring,
-                "[%d x %d] [PID %d] STREAM MONITOR: PRESS (x) TO STOP, (h) FOR HELP",
-                wrow, wcol,  getpid());
+        sprintf(monstring, "[%d x %d] [PID %d] STREAM MONITOR: PRESS (x) TO STOP, (h) FOR HELP", wrow, wcol, getpid());
         //streamCTRL__print_header(monstring, '-');
         DEBUG_TRACEPOINT("Print header");
         TUI_print_header(monstring, '-');
         //attroff(A_BOLD);
         screenprint_unsetbold();
 
-
         DEBUG_TRACEPOINT("Start display");
 
-        if(DisplayMode == DISPLAY_MODE_HELP)   // help
+        if (DisplayMode == DISPLAY_MODE_HELP) // help
         {
             //int attrval = A_BOLD;
 
@@ -1811,7 +1580,6 @@ errno_t streamCTRL_CTRLscreen()
             TUI_printfw("    Exit");
             TUI_newline();
 
-
             TUI_newline();
             TUI_printfw("============ SCREENS");
             TUI_newline();
@@ -1904,7 +1672,6 @@ errno_t streamCTRL_CTRLscreen()
             TUI_printfw("    output next scan to file");
             TUI_newline();
 
-
             TUI_newline();
             TUI_printfw("============ DISPLAY");
             TUI_newline();
@@ -1965,14 +1732,13 @@ errno_t streamCTRL_CTRLscreen()
             TUI_printfw("    Toggle apply match string to stream");
             TUI_newline();
 
-
             TUI_newline();
             TUI_newline();
         }
         else
         {
             DEBUG_TRACEPOINT(" ");
-            if(DisplayMode == DISPLAY_MODE_HELP)
+            if (DisplayMode == DISPLAY_MODE_HELP)
             {
                 screenprint_setreverse();
                 TUI_printfw("[h] Help");
@@ -1984,7 +1750,7 @@ errno_t streamCTRL_CTRLscreen()
             }
             TUI_printfw("   ");
 
-            if(DisplayMode == DISPLAY_MODE_SEMVAL)
+            if (DisplayMode == DISPLAY_MODE_SEMVAL)
             {
                 screenprint_setreverse();
                 TUI_printfw("[F2] sem values");
@@ -1996,7 +1762,7 @@ errno_t streamCTRL_CTRLscreen()
             }
             TUI_printfw("   ");
 
-            if(DisplayMode == DISPLAY_MODE_WRITE)
+            if (DisplayMode == DISPLAY_MODE_WRITE)
             {
                 screenprint_setreverse();
                 TUI_printfw("[F3] write PIDs");
@@ -2008,7 +1774,7 @@ errno_t streamCTRL_CTRLscreen()
             }
             TUI_printfw("   ");
 
-            if(DisplayMode == DISPLAY_MODE_READ)
+            if (DisplayMode == DISPLAY_MODE_READ)
             {
                 screenprint_setreverse();
                 TUI_printfw("[F4] read PIDs");
@@ -2020,7 +1786,7 @@ errno_t streamCTRL_CTRLscreen()
             }
             TUI_printfw("   ");
 
-            if(DisplayMode == DISPLAY_MODE_SPTRACE)
+            if (DisplayMode == DISPLAY_MODE_SPTRACE)
             {
                 screenprint_setreverse();
                 TUI_printfw("[F5] process traces");
@@ -2032,7 +1798,7 @@ errno_t streamCTRL_CTRLscreen()
             }
             TUI_printfw("   ");
 
-            if(DisplayMode == DISPLAY_MODE_FUSER)
+            if (DisplayMode == DISPLAY_MODE_FUSER)
             {
                 screenprint_setreverse();
                 TUI_printfw("[F6] access");
@@ -2045,31 +1811,24 @@ errno_t streamCTRL_CTRLscreen()
             TUI_printfw("   ");
             TUI_newline();
 
+            TUI_printfw("PIDmax = %d    Update frequ = %2d Hz  fscan=%5.2f Hz ( %5.2f Hz %5.2f %% busy ) ", PIDmax,
+                        (int)(frequ + 0.5), 1.0 / streaminfoproc.dtscan, 1000000.0 / streaminfoproc.twaitus,
+                        100.0 * (streaminfoproc.dtscan - 1.0e-6 * streaminfoproc.twaitus) / streaminfoproc.dtscan);
 
-            TUI_printfw("PIDmax = %d    Update frequ = %2d Hz  fscan=%5.2f Hz ( %5.2f Hz %5.2f %% busy ) ",
-                        PIDmax,
-                        (int)(frequ + 0.5),
-                        1.0 / streaminfoproc.dtscan,
-                        1000000.0 / streaminfoproc.twaitus,
-                        100.0 * (streaminfoproc.dtscan - 1.0e-6 * streaminfoproc.twaitus) /
-                        streaminfoproc.dtscan
-                       );
-
-            if(streaminfoproc.fuserUpdate == 1)
+            if (streaminfoproc.fuserUpdate == 1)
             {
                 //attron(COLOR_PAIR(9));
                 screenprint_setcolor(9);
-                TUI_printfw("fuser scan ongoing  %4d  / %4d   ", streaminfoproc.sindexscan,
-                            NBsindex);
+                TUI_printfw("fuser scan ongoing  %4d  / %4d   ", streaminfoproc.sindexscan, NBsindex);
                 //attroff(COLOR_PAIR(9));
                 screenprint_unsetcolor(9);
             }
-            if(DisplayMode == DISPLAY_MODE_FUSER)
+            if (DisplayMode == DISPLAY_MODE_FUSER)
             {
-                if(fuserScan == 1)
+                if (fuserScan == 1)
                 {
                     TUI_printfw("Last scan on  %02d:%02d:%02d  - Press F6 again to re-scan    C-c to stop scan",
-                                uttime_lastScan->tm_hour, uttime_lastScan->tm_min,  uttime_lastScan->tm_sec);
+                                uttime_lastScan->tm_hour, uttime_lastScan->tm_min, uttime_lastScan->tm_sec);
                     TUI_newline();
                 }
                 else
@@ -2085,22 +1844,20 @@ errno_t streamCTRL_CTRLscreen()
 
             int lastindex;
             lastindex = doffsetindex + NBsinfodisp;
-            if(lastindex > NBsindex - 1)
+            if (lastindex > NBsindex - 1)
             {
                 lastindex = NBsindex - 1;
             }
 
-            if(lastindex < 0)
+            if (lastindex < 0)
             {
                 lastindex = 0;
             }
 
-            TUI_printfw("%4d streams    Currently displaying %4d-%4d   Selected %d  ID = %d  inode = %d",
-                        NBsindex,
-                        doffsetindex, lastindex, dindexSelected, ssindex[dindexSelected],
-                        (int) inodeselected);
+            TUI_printfw("%4d streams    Currently displaying %4d-%4d   Selected %d  ID = %d  inode = %d", NBsindex,
+                        doffsetindex, lastindex, dindexSelected, ssindex[dindexSelected], (int)inodeselected);
 
-            if(streaminfoproc.filter == 1)
+            if (streaminfoproc.filter == 1)
             {
                 //attron(COLOR_PAIR(9));
                 screenprint_setcolor(9);
@@ -2111,92 +1868,74 @@ errno_t streamCTRL_CTRLscreen()
 
             TUI_newline();
 
-
-
             attron(A_BOLD);
 
-            TUI_printfw("%*s  %-*s  %-*s  %*s   %*s %*s %*s %8s",
-                        9, "inode",
-                        DispName_NBchar, "name",
-                        DispSize_NBchar, "type",
-                        Dispcnt0_NBchar, "cnt0",
-                        DispPID_NBchar,  "creaPID",
-                        DispPID_NBchar,  "ownPID",
-                        Dispfreq_NBchar, "   frequ ",
-                        "#sem"
-                       );
-
-            switch(DisplayMode)
+            TUI_printfw("%*s  %-*s  %-*s  %*s   %*s %*s %*s %8s", 9, "inode", DispName_NBchar, "name", DispSize_NBchar,
+                        "type", Dispcnt0_NBchar, "cnt0", DispPID_NBchar, "creaPID", DispPID_NBchar, "ownPID",
+                        Dispfreq_NBchar, "   frequ ", "#sem");
+
+            switch (DisplayMode)
             {
-                case DISPLAY_MODE_SEMVAL:
-                    TUI_printfw("     Semaphore values ....");
-                    TUI_newline();
-                    break;
+            case DISPLAY_MODE_SEMVAL:
+                TUI_printfw("     Semaphore values ....");
+                TUI_newline();
+                break;
 
-                case DISPLAY_MODE_WRITE:
-                    TUI_printfw("     write PIDs ....");
-                    TUI_newline();
-                    break;
+            case DISPLAY_MODE_WRITE:
+                TUI_printfw("     write PIDs ....");
+                TUI_newline();
+                break;
 
-                case DISPLAY_MODE_READ:
-                    TUI_printfw("     read PIDs ....");
-                    TUI_newline();
-                    break;
+            case DISPLAY_MODE_READ:
+                TUI_printfw("     read PIDs ....");
+                TUI_newline();
+                break;
 
-                case DISPLAY_MODE_SPTRACE:
-                    TUI_printfw("     stream process traces:   \"(INODE TYPE/SEM PID)>\"");
-                    TUI_newline();
-                    break;
+            case DISPLAY_MODE_SPTRACE:
+                TUI_printfw("     stream process traces:   \"(INODE TYPE/SEM PID)>\"");
+                TUI_newline();
+                break;
 
-                case DISPLAY_MODE_FUSER:
-                    TUI_printfw("     connected processes");
-                    TUI_newline();
-                    break;
+            case DISPLAY_MODE_FUSER:
+                TUI_printfw("     connected processes");
+                TUI_newline();
+                break;
 
-                default:
-                    TUI_newline();
-                    break;
+            default:
+                TUI_newline();
+                break;
             }
 
-
             screenprint_unsetbold();
             //attroff(A_BOLD);
 
-
-
             DEBUG_TRACEPOINT(" ");
 
-
-
-
-
             // SORT
 
             // default : no sorting
-            for(dindex = 0; dindex < NBsindex; dindex++)
+            for (dindex = 0; dindex < NBsindex; dindex++)
             {
                 ssindex[dindex] = dindex;
             }
 
-
             DEBUG_TRACEPOINT(" ");
 
-            if(SORTING == 1)   // alphabetical sorting
+            if (SORTING == 1) // alphabetical sorting
             {
                 long *larray;
-                larray = (long *) malloc(sizeof(long) * NBsindex);
-                for(sindex = 0; sindex < NBsindex; sindex++)
+                larray = (long *)malloc(sizeof(long) * NBsindex);
+                for (sindex = 0; sindex < NBsindex; sindex++)
                 {
                     larray[sindex] = sindex;
                 }
 
                 int sindex0, sindex1;
-                for(sindex0 = 0; sindex0 < NBsindex - 1; sindex0++)
+                for (sindex0 = 0; sindex0 < NBsindex - 1; sindex0++)
                 {
-                    for(sindex1 = sindex0 + 1; sindex1 < NBsindex; sindex1++)
+                    for (sindex1 = sindex0 + 1; sindex1 < NBsindex; sindex1++)
                     {
-                        if(strcmp(streaminfo[larray[sindex0]].sname,
-                                  streaminfo[larray[sindex1]].sname) > 0)
+                        if (strcmp(streaminfo[larray[sindex0]].sname, streaminfo[larray[sindex1]].sname) > 0)
                         {
                             int tmpindex = larray[sindex0];
                             larray[sindex0] = larray[sindex1];
@@ -2205,7 +1944,7 @@ errno_t streamCTRL_CTRLscreen()
                     }
                 }
 
-                for(dindex = 0; dindex < NBsindex; dindex++)
+                for (dindex = 0; dindex < NBsindex; dindex++)
                 {
                     ssindex[dindex] = larray[dindex];
                 }
@@ -2214,48 +1953,43 @@ errno_t streamCTRL_CTRLscreen()
 
             DEBUG_TRACEPOINT(" ");
 
-
-
-            if((SORTING == 2) || (SORTING == 3))   // recent update and process access
+            if ((SORTING == 2) || (SORTING == 3)) // recent update and process access
             {
                 long *larray;
                 double *varray;
-                larray = (long *) malloc(sizeof(long) * NBsindex);
-                varray = (double *) malloc(sizeof(double) * NBsindex);
+                larray = (long *)malloc(sizeof(long) * NBsindex);
+                varray = (double *)malloc(sizeof(double) * NBsindex);
 
-                if(SORT_TOGGLE == 1)
+                if (SORT_TOGGLE == 1)
                 {
-                    for(sindex = 0; sindex < NBsindex; sindex++)
+                    for (sindex = 0; sindex < NBsindex; sindex++)
                     {
                         streaminfo[sindex].updatevalue_frozen = streaminfo[sindex].updatevalue;
                     }
 
-                    if(SORTING == 3)
+                    if (SORTING == 3)
                     {
-                        for(sindex = 0; sindex < NBsindex; sindex++)
+                        for (sindex = 0; sindex < NBsindex; sindex++)
                         {
-                            streaminfo[sindex].updatevalue_frozen += 10000.0 *
-                                    streaminfo[sindex].streamOpenPID_cnt1;
+                            streaminfo[sindex].updatevalue_frozen += 10000.0 * streaminfo[sindex].streamOpenPID_cnt1;
                         }
                     }
 
                     SORT_TOGGLE = 0;
                 }
 
-
-
-                for(sindex = 0; sindex < NBsindex; sindex++)
+                for (sindex = 0; sindex < NBsindex; sindex++)
                 {
                     larray[sindex] = sindex;
                     varray[sindex] = streaminfo[sindex].updatevalue_frozen;
                 }
 
-                if(NBsindex > 1)
+                if (NBsindex > 1)
                 {
                     quick_sort2l(varray, larray, NBsindex);
                 }
 
-                for(dindex = 0; dindex < NBsindex; dindex++)
+                for (dindex = 0; dindex < NBsindex; dindex++)
                 {
                     ssindex[NBsindex - dindex - 1] = larray[dindex];
                 }
@@ -2264,50 +1998,44 @@ errno_t streamCTRL_CTRLscreen()
                 free(varray);
             }
 
-
             DEBUG_TRACEPOINT(" ");
 
             // compute doffsetindex
 
-            while(dindexSelected - doffsetindex > NBsinfodisp - 5)   // scroll down
+            while (dindexSelected - doffsetindex > NBsinfodisp - 5) // scroll down
             {
-                doffsetindex ++;
+                doffsetindex++;
             }
 
-            while(dindexSelected - doffsetindex < NBsinfodisp - 10)   // scroll up
+            while (dindexSelected - doffsetindex < NBsinfodisp - 10) // scroll up
             {
-                doffsetindex --;
+                doffsetindex--;
             }
 
-            if(doffsetindex < 0)
+            if (doffsetindex < 0)
             {
                 doffsetindex = 0;
             }
 
-
-
             // DISPLAY
 
             int DisplayFlag = 0;
 
             int print_pid_mode = PRINT_PID_DEFAULT;
-            for(dindex = 0; dindex < NBsindex; dindex++)
+            for (dindex = 0; dindex < NBsindex; dindex++)
             {
                 imageID ID;
                 sindex = ssindex[dindex];
                 ID = streaminfo[sindex].ID;
 
-                while((streamCTRLimages[streaminfo[sindex].ID].used == 0)
-                        && (dindex < NBsindex))
+                while ((streamCTRLimages[streaminfo[sindex].ID].used == 0) && (dindex < NBsindex))
                 {
                     // skip this entry, as it is no longer in use
-                    dindex ++;
+                    dindex++;
                     sindex = ssindex[dindex];
                     ID = streaminfo[sindex].ID;
                 }
 
-
-
                 int downstreammin = NO_DOWNSTREAM_INDEX; // minumum downstream index
                 // looks for inodeselected in the list of upstream inodes
                 // picks the smallest corresponding index
@@ -2316,7 +2044,7 @@ errno_t streamCTRL_CTRLscreen()
 
                 DEBUG_TRACEPOINT(" ");
 
-                if((dindex > doffsetindex - 1) && (dindex < NBsinfodisp - 1 + doffsetindex))
+                if ((dindex > doffsetindex - 1) && (dindex < NBsinfodisp - 1 + doffsetindex))
                 {
                     DisplayFlag = 1;
                 }
@@ -2325,9 +2053,9 @@ errno_t streamCTRL_CTRLscreen()
                     DisplayFlag = 0;
                 }
 
-                if(DisplayDetailLevel == 1)
+                if (DisplayDetailLevel == 1)
                 {
-                    if(dindex == dindexSelected)
+                    if (dindex == dindexSelected)
                     {
                         DisplayFlag = 1;
                     }
@@ -2339,28 +2067,26 @@ errno_t streamCTRL_CTRLscreen()
 
                 DEBUG_TRACEPOINT(" ");
 
-                if(dindex == dindexSelected)
+                if (dindex == dindexSelected)
                 {
-                    DEBUG_TRACEPOINT("dindex %ld %d", dindex,
-                                     streamCTRLimages[streaminfo[sindex].ID].used);
+                    DEBUG_TRACEPOINT("dindex %ld %d", dindex, streamCTRLimages[streaminfo[sindex].ID].used);
 
                     // currently selected inode
                     inodeselected = streamCTRLimages[streaminfo[sindex].ID].md[0].inode;
 
-                    DEBUG_TRACEPOINT("inode %lu %s", inodeselected,
-                                     streamCTRLimages[streaminfo[sindex].ID].md[0].name);
+                    DEBUG_TRACEPOINT("inode %lu %s", inodeselected, streamCTRLimages[streaminfo[sindex].ID].md[0].name);
 
                     // identify upstream inodes
                     NBupstreaminode = 0;
-                    for(int spti = 0; spti < streamCTRLimages[ID].md[0].NBproctrace; spti++)
+                    for (int spti = 0; spti < streamCTRLimages[ID].md[0].NBproctrace; spti++)
                     {
-                        if(NBupstreaminode < NBupstreaminodeMAX)
+                        if (NBupstreaminode < NBupstreaminodeMAX)
                         {
                             ino_t inode = streamCTRLimages[ID].streamproctrace[spti].trigger_inode;
-                            if(inode != 0)
+                            if (inode != 0)
                             {
                                 upstreaminode[NBupstreaminode] = inode;
-                                NBupstreaminode ++;
+                                NBupstreaminode++;
                             }
                         }
                     }
@@ -2370,70 +2096,63 @@ errno_t streamCTRL_CTRLscreen()
                     // identify upstream processes
                     print_pid_mode = PRINT_PID_FORCE_NOUPSTREAM;
                     NBupstreamproc = 0;
-                    for(int spti = 0; spti < streamCTRLimages[ID].md[0].NBproctrace; spti++)
+                    for (int spti = 0; spti < streamCTRLimages[ID].md[0].NBproctrace; spti++)
                     {
-                        if(NBupstreamproc < NBupstreamprocMAX)
+                        if (NBupstreamproc < NBupstreamprocMAX)
                         {
                             ino_t procpid = streamCTRLimages[ID].streamproctrace[spti].procwrite_PID;
-                            if(procpid > 0)
+                            if (procpid > 0)
                             {
                                 upstreamproc[NBupstreamproc] = procpid;
-                                NBupstreamproc ++;
+                                NBupstreamproc++;
                             }
                         }
 
                         DEBUG_TRACEPOINT(" ");
                     }
-
                 }
                 else
                 {
                     DEBUG_TRACEPOINT(" ");
                     print_pid_mode = PRINT_PID_DEFAULT;
 
-                    for(int spti = 0; spti < streamCTRLimages[ID].md[0].NBproctrace; spti++)
+                    for (int spti = 0; spti < streamCTRLimages[ID].md[0].NBproctrace; spti++)
                     {
                         ino_t inode = streamCTRLimages[ID].streamproctrace[spti].trigger_inode;
-                        if(inode == inodeselected)
+                        if (inode == inodeselected)
                         {
-                            if(spti < downstreammin)
+                            if (spti < downstreammin)
                             {
                                 downstreammin = spti;
                             }
                         }
                     }
                     DEBUG_TRACEPOINT(" ");
-
                 }
 
-
-
-
                 DEBUG_TRACEPOINT(" ");
 
-
                 char string[200];
 
-                if(DisplayFlag == 1)
+                if (DisplayFlag == 1)
                 {
                     // print file inode
-                    streamCTRL_print_inode(streamCTRLimages[ID].md[0].inode, upstreaminode,
-                                           NBupstreaminode, downstreammin);
+                    streamCTRL_print_inode(streamCTRLimages[ID].md[0].inode, upstreaminode, NBupstreaminode,
+                                           downstreammin);
                     TUI_printfw(" ");
                 }
 
-                if((dindex == dindexSelected) && (DisplayDetailLevel == 0))
+                if ((dindex == dindexSelected) && (DisplayDetailLevel == 0))
                 {
                     //attron(A_REVERSE);
                     screenprint_setreverse();
                 }
 
-
                 DEBUG_TRACEPOINT(" ");
 
-                if(DisplayFlag == 1)
+                if (DisplayFlag == 1)
                 {
-                    if(streaminfo[sindex].SymLink == 1)
+                    if (streaminfo[sindex].SymLink == 1)
                     {
                         char namestring[stringmaxlen];
 
@@ -2448,8 +2167,7 @@ errno_t streamCTRL_CTRLscreen()
                     }
                     else
                     {
-                        TUI_printfw("%-*.*s", DispName_NBchar, DispName_NBchar,
-                                    streaminfo[sindex].sname);
+                        TUI_printfw("%-*.*s", DispName_NBchar, DispName_NBchar, streaminfo[sindex].sname);
                     }
 
                     /*if((int) strlen(streaminfo[sindex].sname) > DispName_NBchar)
@@ -2464,81 +2182,77 @@ errno_t streamCTRL_CTRLscreen()
                     }*/
                 }
 
-
-
                 DEBUG_TRACEPOINT(" ");
 
-
-
-                if((DisplayMode < DISPLAY_MODE_FUSER) && (DisplayFlag == 1))
+                if ((DisplayMode < DISPLAY_MODE_FUSER) && (DisplayFlag == 1))
                 {
                     char str[STRINGMAXLEN_DEFAULT];
                     char str1[STRINGMAXLEN_DEFAULT];
                     int j;
 
-                    if(streamCTRLimages[streaminfo[sindex].ID].md == NULL)
+                    if (streamCTRLimages[streaminfo[sindex].ID].md == NULL)
                     {
                         sprintf(string, " ???");
                     }
                     else
                     {
-                        if(streaminfo[sindex].datatype == _DATATYPE_UINT8)
+                        if (streaminfo[sindex].datatype == _DATATYPE_UINT8)
                         {
                             sprintf(string, " UI8");
                         }
-                        if(streaminfo[sindex].datatype == _DATATYPE_INT8)
+                        if (streaminfo[sindex].datatype == _DATATYPE_INT8)
                         {
                             sprintf(string, "  I8");
                         }
 
-                        if(streaminfo[sindex].datatype == _DATATYPE_UINT16)
+                        if (streaminfo[sindex].datatype == _DATATYPE_UINT16)
                         {
                             sprintf(string, "UI16");
                         }
-                        if(streaminfo[sindex].datatype == _DATATYPE_INT16)
+                        if (streaminfo[sindex].datatype == _DATATYPE_INT16)
                         {
                             sprintf(string, " I16");
                         }
 
-                        if(streaminfo[sindex].datatype == _DATATYPE_UINT32)
+                        if (streaminfo[sindex].datatype == _DATATYPE_UINT32)
                         {
                             sprintf(string, "UI32");
                         }
-                        if(streaminfo[sindex].datatype == _DATATYPE_INT32)
+                        if (streaminfo[sindex].datatype == _DATATYPE_INT32)
                         {
                             sprintf(string, " I32");
                         }
 
-                        if(streaminfo[sindex].datatype == _DATATYPE_UINT64)
+                        if (streaminfo[sindex].datatype == _DATATYPE_UINT64)
                         {
                             sprintf(string, "UI64");
                         }
-                        if(streaminfo[sindex].datatype == _DATATYPE_INT64)
+                        if (streaminfo[sindex].datatype == _DATATYPE_INT64)
                         {
                             sprintf(string, " I64");
                         }
 
-                        if(streaminfo[sindex].datatype == _DATATYPE_HALF)
+                        if (streaminfo[sindex].datatype == _DATATYPE_HALF)
                         {
                             sprintf(string, " HLF");
                         }
 
-                        if(streaminfo[sindex].datatype == _DATATYPE_FLOAT)
+                        if (streaminfo[sindex].datatype == _DATATYPE_FLOAT)
                         {
                             sprintf(string, " FLT");
                         }
 
-                        if(streaminfo[sindex].datatype == _DATATYPE_DOUBLE)
+                        if (streaminfo[sindex].datatype == _DATATYPE_DOUBLE)
                         {
                             sprintf(string, " DBL");
                         }
 
-                        if(streaminfo[sindex].datatype == _DATATYPE_COMPLEX_FLOAT)
+                        if (streaminfo[sindex].datatype == _DATATYPE_COMPLEX_FLOAT)
                         {
                             sprintf(string, "CFLT");
                         }
 
-                        if(streaminfo[sindex].datatype == _DATATYPE_COMPLEX_DOUBLE)
+                        if (streaminfo[sindex].datatype == _DATATYPE_COMPLEX_DOUBLE)
                         {
                             sprintf(string, "CDBL");
                         }
@@ -2546,25 +2260,25 @@ errno_t streamCTRL_CTRLscreen()
                     TUI_printfw(string);
 
                     DEBUG_TRACEPOINT(" ");
-                    if(streamCTRLimages[streaminfo[sindex].ID].md == NULL)
+                    if (streamCTRLimages[streaminfo[sindex].ID].md == NULL)
                     {
                         sprintf(str, "???");
                     }
                     else
                     {
-                        sprintf(str, " [%3ld", (long) streamCTRLimages[ID].md[0].size[0]);
+                        sprintf(str, " [%3ld", (long)streamCTRLimages[ID].md[0].size[0]);
 
-                        for(j = 1; j < streamCTRLimages[ID].md[0].naxis; j++)
+                        for (j = 1; j < streamCTRLimages[ID].md[0].naxis; j++)
                         {
                             {
                                 int slen = snprintf(str1, STRINGMAXLEN_DEFAULT, "%sx%3ld", str,
-                                                    (long) streamCTRLimages[ID].md[0].size[j]);
-                                if(slen < 1)
+                                                    (long)streamCTRLimages[ID].md[0].size[j]);
+                                if (slen < 1)
                                 {
                                     PRINT_ERROR("snprintf wrote <1 char");
                                     abort(); // can't handle this error any other way
                                 }
-                                if(slen >= STRINGMAXLEN_DEFAULT)
+                                if (slen >= STRINGMAXLEN_DEFAULT)
                                 {
                                     PRINT_ERROR("snprintf string truncation");
                                     abort(); // can't handle this error any other way
@@ -2574,12 +2288,12 @@ errno_t streamCTRL_CTRLscreen()
                         }
                         {
                             int slen = snprintf(str1, STRINGMAXLEN_DEFAULT, "%s]", str);
-                            if(slen < 1)
+                            if (slen < 1)
                             {
                                 PRINT_ERROR("snprintf wrote <1 char");
                                 abort(); // can't handle this error any other way
                             }
-                            if(slen >= STRINGMAXLEN_DEFAULT)
+                            if (slen >= STRINGMAXLEN_DEFAULT)
                             {
                                 PRINT_ERROR("snprintf string truncation");
                                 abort(); // can't handle this error any other way
@@ -2591,11 +2305,10 @@ errno_t streamCTRL_CTRLscreen()
 
                     DEBUG_TRACEPOINT(" ");
 
-
                     sprintf(string, "%-*.*s ", DispSize_NBchar, DispSize_NBchar, str);
                     TUI_printfw(string);
 
-                    if(streamCTRLimages[streaminfo[sindex].ID].md == NULL)
+                    if (streamCTRLimages[streaminfo[sindex].ID].md == NULL)
                     {
                         sprintf(string, "???");
                     }
@@ -2604,7 +2317,7 @@ errno_t streamCTRL_CTRLscreen()
 
                         sprintf(string, " %*ld ", Dispcnt0_NBchar, streamCTRLimages[ID].md[0].cnt0);
                     }
-                    if(streaminfo[sindex].deltacnt0 == 0)
+                    if (streaminfo[sindex].deltacnt0 == 0)
                     {
                         TUI_printfw(string);
                     }
@@ -2617,10 +2330,9 @@ errno_t streamCTRL_CTRLscreen()
                         screenprint_unsetcolor(2);
                     }
 
-
                     // creatorPID
                     // ownerPID
-                    if(streamCTRLimages[streaminfo[sindex].ID].md == NULL)
+                    if (streamCTRLimages[streaminfo[sindex].ID].md == NULL)
                     {
                         sprintf(string, "???");
                     }
@@ -2638,11 +2350,9 @@ errno_t streamCTRL_CTRLscreen()
                         TUI_printfw(" ");
                     }
 
-
-
                     // stream update frequency
                     //
-                    if(streamCTRLimages[streaminfo[sindex].ID].md == NULL)
+                    if (streamCTRLimages[streaminfo[sindex].ID].md == NULL)
                     {
                         sprintf(string, "???");
                     }
@@ -2651,21 +2361,20 @@ errno_t streamCTRL_CTRLscreen()
                         sprintf(string, " %*.2f Hz", Dispfreq_NBchar, streaminfo[sindex].updatevalue);
                     }
                     TUI_printfw(string);
-
                 }
 
                 DEBUG_TRACEPOINT(" ");
 
-                if(streamCTRLimages[streaminfo[sindex].ID].md != NULL)
+                if (streamCTRLimages[streaminfo[sindex].ID].md != NULL)
                 {
-                    if((DisplayMode == DISPLAY_MODE_SEMVAL) && (DisplayFlag == 1))   // sem vals
+                    if ((DisplayMode == DISPLAY_MODE_SEMVAL) && (DisplayFlag == 1)) // sem vals
                     {
 
                         sprintf(string, " %3d sems ", streamCTRLimages[ID].md[0].sem);
                         TUI_printfw(string);
 
                         int s;
-                        for(s = 0; s < streamCTRLimages[ID].md[0].sem; s++)
+                        for (s = 0; s < streamCTRLimages[ID].md[0].sem; s++)
                         {
                             int semval;
                             sem_getvalue(streamCTRLimages[ID].semptr[s], &semval);
@@ -2676,16 +2385,15 @@ errno_t streamCTRL_CTRLscreen()
                 }
 
                 DEBUG_TRACEPOINT(" ");
-                if(streamCTRLimages[streaminfo[sindex].ID].md != NULL)
+                if (streamCTRLimages[streaminfo[sindex].ID].md != NULL)
                 {
-                    if((DisplayMode == DISPLAY_MODE_WRITE)
-                            && (DisplayFlag == 1))   // sem write PIDs
+                    if ((DisplayMode == DISPLAY_MODE_WRITE) && (DisplayFlag == 1)) // sem write PIDs
                     {
                         sprintf(string, " %3d sems ", streamCTRLimages[ID].md[0].sem);
                         TUI_printfw(string);
 
                         int s;
-                        for(s = 0; s < streamCTRLimages[ID].md[0].sem; s++)
+                        for (s = 0; s < streamCTRLimages[ID].md[0].sem; s++)
                         {
                             pid_t pid = streamCTRLimages[ID].semWritePID[s];
                             streamCTRL_print_procpid(8, pid, upstreamproc, NBupstreamproc, print_pid_mode);
@@ -2696,16 +2404,15 @@ errno_t streamCTRL_CTRLscreen()
 
                 DEBUG_TRACEPOINT(" ");
 
-
-                if(streamCTRLimages[streaminfo[sindex].ID].md != NULL)
+                if (streamCTRLimages[streaminfo[sindex].ID].md != NULL)
                 {
-                    if((DisplayMode == DISPLAY_MODE_READ) && (DisplayFlag == 1))   // sem read PIDs
+                    if ((DisplayMode == DISPLAY_MODE_READ) && (DisplayFlag == 1)) // sem read PIDs
                     {
                         sprintf(string, " %3d sems ", streamCTRLimages[ID].md[0].sem);
                         TUI_printfw(string);
 
                         int s;
-                        for(s = 0; s < streamCTRLimages[ID].md[0].sem; s++)
+                        for (s = 0; s < streamCTRLimages[ID].md[0].sem; s++)
                         {
                             pid_t pid = streamCTRLimages[ID].semReadPID[s];
                             streamCTRL_print_procpid(8, pid, upstreamproc, NBupstreamproc, print_pid_mode);
@@ -2714,121 +2421,109 @@ errno_t streamCTRL_CTRLscreen()
                     }
                 }
 
-
-
-                if(streamCTRLimages[streaminfo[sindex].ID].md != NULL)
+                if (streamCTRLimages[streaminfo[sindex].ID].md != NULL)
                 {
-                    if((DisplayMode == DISPLAY_MODE_SPTRACE)
-                            && (DisplayFlag == 1))   // sem read PIDs
+                    if ((DisplayMode == DISPLAY_MODE_SPTRACE) && (DisplayFlag == 1)) // sem read PIDs
                     {
                         sprintf(string, " %2d ", streamCTRLimages[ID].md[0].NBproctrace);
                         TUI_printfw(string);
 
-                        for(int spti = 0; spti < streamCTRLimages[ID].md[0].NBproctrace; spti++)
+                        for (int spti = 0; spti < streamCTRLimages[ID].md[0].NBproctrace; spti++)
                         {
                             ino_t inode = streamCTRLimages[ID].streamproctrace[spti].trigger_inode;
-                            int   sem   = streamCTRLimages[ID].streamproctrace[spti].trigsemindex;
-                            pid_t pid   = streamCTRLimages[ID].streamproctrace[spti].procwrite_PID;
-
+                            int sem = streamCTRLimages[ID].streamproctrace[spti].trigsemindex;
+                            pid_t pid = streamCTRLimages[ID].streamproctrace[spti].procwrite_PID;
 
-
-
-                            switch(streamCTRLimages[ID].streamproctrace[spti].triggermode)
+                            switch (streamCTRLimages[ID].streamproctrace[spti].triggermode)
                             {
-                                case PROCESSINFO_TRIGGERMODE_IMMEDIATE:
-                                    sprintf(string, "(%7lu IM ", inode);
-                                    break;
+                            case PROCESSINFO_TRIGGERMODE_IMMEDIATE:
+                                sprintf(string, "(%7lu IM ", inode);
+                                break;
 
-                                case PROCESSINFO_TRIGGERMODE_CNT0:
-                                    sprintf(string, "(%7lu C0 ", inode);
-                                    break;
+                            case PROCESSINFO_TRIGGERMODE_CNT0:
+                                sprintf(string, "(%7lu C0 ", inode);
+                                break;
 
-                                case PROCESSINFO_TRIGGERMODE_CNT1:
-                                    sprintf(string, "(%7lu C1 ", inode);
-                                    break;
+                            case PROCESSINFO_TRIGGERMODE_CNT1:
+                                sprintf(string, "(%7lu C1 ", inode);
+                                break;
 
-                                case PROCESSINFO_TRIGGERMODE_SEMAPHORE:
-                                    sprintf(string, "(%7lu %02d ", inode, sem);
-                                    break;
+                            case PROCESSINFO_TRIGGERMODE_SEMAPHORE:
+                                sprintf(string, "(%7lu %02d ", inode, sem);
+                                break;
 
-                                case PROCESSINFO_TRIGGERMODE_DELAY:
-                                    sprintf(string, "(%7lu DL ", inode);
-                                    break;
+                            case PROCESSINFO_TRIGGERMODE_DELAY:
+                                sprintf(string, "(%7lu DL ", inode);
+                                break;
 
-                                default:
-                                    sprintf(string, "(%7lu ?? ", inode);
-                                    break;
+                            default:
+                                sprintf(string, "(%7lu ?? ", inode);
+                                break;
                             }
                             TUI_printfw(string);
                             streamCTRL_print_procpid(8, pid, upstreamproc, NBupstreamproc, print_pid_mode);
                             TUI_printfw(")> ");
                         }
 
-                        if(DisplayDetailLevel == 1)
+                        if (DisplayDetailLevel == 1)
                         {
                             TUI_newline();
-                            streamCTRL_print_SPTRACE_details(streamCTRLimages, ID, upstreamproc,
-                                                             NBupstreamproc, PRINT_PID_DEFAULT);
+                            streamCTRL_print_SPTRACE_details(streamCTRLimages, ID, upstreamproc, NBupstreamproc,
+                                                             PRINT_PID_DEFAULT);
                         }
                     }
                 }
 
-
-
-                if((DisplayMode == DISPLAY_MODE_FUSER)
-                        && (DisplayFlag == 1))   // list processes that are accessing streams
+                if ((DisplayMode == DISPLAY_MODE_FUSER) &&
+                    (DisplayFlag == 1)) // list processes that are accessing streams
                 {
-                    if(streaminfoproc.fuserUpdate == 2)
+                    if (streaminfoproc.fuserUpdate == 2)
                     {
                         streaminfo[sindex].streamOpenPID_status = 0; // not scanned
                     }
 
-
                     DEBUG_TRACEPOINT(" ");
 
                     int pidIndex;
 
-                    switch(streaminfo[sindex].streamOpenPID_status)
+                    switch (streaminfo[sindex].streamOpenPID_status)
                     {
 
-                        case 1:
-                            streaminfo[sindex].streamOpenPID_cnt1 = 0;
-                            for(pidIndex = 0; pidIndex < streaminfo[sindex].streamOpenPID_cnt ; pidIndex++)
-                            {
-                                pid_t pid = streaminfo[sindex].streamOpenPID[pidIndex];
-                                streamCTRL_print_procpid(8, pid, upstreamproc, NBupstreamproc, print_pid_mode);
+                    case 1:
+                        streaminfo[sindex].streamOpenPID_cnt1 = 0;
+                        for (pidIndex = 0; pidIndex < streaminfo[sindex].streamOpenPID_cnt; pidIndex++)
+                        {
+                            pid_t pid = streaminfo[sindex].streamOpenPID[pidIndex];
+                            streamCTRL_print_procpid(8, pid, upstreamproc, NBupstreamproc, print_pid_mode);
 
-                                if((getpgid(pid) >= 0) && (pid != getpid()))
-                                {
+                            if ((getpgid(pid) >= 0) && (pid != getpid()))
+                            {
 
-                                    sprintf(string, ":%-*.*s",
-                                            PIDnameStringLen, PIDnameStringLen, PIDname_array[pid]);
-                                    TUI_printfw(string);
+                                sprintf(string, ":%-*.*s", PIDnameStringLen, PIDnameStringLen, PIDname_array[pid]);
+                                TUI_printfw(string);
 
-                                    streaminfo[sindex].streamOpenPID_cnt1 ++;
-                                }
+                                streaminfo[sindex].streamOpenPID_cnt1++;
                             }
-                            break;
-
-                        case 2:
-                            sprintf(string, "FAILED");
-                            TUI_printfw(string);
-                            break;
+                        }
+                        break;
 
-                        default:
-                            sprintf(string, "NOT SCANNED");
-                            TUI_printfw(string);
-                            break;
+                    case 2:
+                        sprintf(string, "FAILED");
+                        TUI_printfw(string);
+                        break;
 
+                    default:
+                        sprintf(string, "NOT SCANNED");
+                        TUI_printfw(string);
+                        break;
                     }
-
                 }
 
                 DEBUG_TRACEPOINT(" ");
 
-                if(DisplayFlag == 1)
+                if (DisplayFlag == 1)
                 {
-                    if(dindex == dindexSelected)
+                    if (dindex == dindexSelected)
                     {
                         screenprint_unsetreverse();
                         //attroff(A_REVERSE);
@@ -2840,35 +2535,31 @@ errno_t streamCTRL_CTRLscreen()
                     TUI_newline();
                 }
 
-
                 DEBUG_TRACEPOINT(" ");
 
-                if(streaminfoproc.fuserUpdate == 1)
+                if (streaminfoproc.fuserUpdate == 1)
                 {
                     //      refresh();
-                    if(data.signal_INT == 1)   // stop scan
+                    if (data.signal_INT == 1) // stop scan
                     {
-                        streaminfoproc.fuserUpdate = 2;     // complete loop without scan
-                        data.signal_INT = 0; // reset
+                        streaminfoproc.fuserUpdate = 2; // complete loop without scan
+                        data.signal_INT = 0;            // reset
                     }
                 }
 
                 DEBUG_TRACEPOINT(" ");
             }
-
         }
 
         DEBUG_TRACEPOINT(" ");
 
-
         refresh();
 
         DEBUG_TRACEPOINT(" ");
 
         loopcnt++;
-        if((data.signal_TERM == 1) || (data.signal_INT == 1) || (data.signal_ABRT == 1)
-                || (data.signal_BUS == 1) || (data.signal_SEGV == 1) || (data.signal_HUP == 1)
-                || (data.signal_PIPE == 1))
+        if ((data.signal_TERM == 1) || (data.signal_INT == 1) || (data.signal_ABRT == 1) || (data.signal_BUS == 1) ||
+            (data.signal_SEGV == 1) || (data.signal_HUP == 1) || (data.signal_PIPE == 1))
         {
             loopOK = 0;
         }
@@ -2876,24 +2567,23 @@ errno_t streamCTRL_CTRLscreen()
         DEBUG_TRACEPOINT(" ");
     }
 
-
     endwin();
 
     streaminfoproc.loop = 0;
     pthread_join(threadscan, NULL);
 
-    for(int pidi = 0; pidi < PIDmax; pidi++)
+    for (int pidi = 0; pidi < PIDmax; pidi++)
     {
-        if(PIDname_array[pidi] != NULL)
+        if (PIDname_array[pidi] != NULL)
         {
             free(PIDname_array[pidi]);
         }
     }
     free(PIDname_array);
 
-    for(imageID ID = 0; ID < streamNBID_MAX; ID++)
+    for (imageID ID = 0; ID < streamNBID_MAX; ID++)
     {
-        if(streamCTRLimages[ID].used == 1)
+        if (streamCTRLimages[ID].used == 1)
         {
             ImageStreamIO_closeIm(&streamCTRLimages[ID]);
         }
@@ -2904,7 +2594,6 @@ errno_t streamCTRL_CTRLscreen()
     free(upstreaminode);
     free(upstreamproc);
 
-
     fflush(stderr);
     dup2(backstderr, STDERR_FILENO);
     close(backstderr);
@@ -2913,7 +2602,5 @@ errno_t streamCTRL_CTRLscreen()
 
     DEBUG_TRACEPOINT(" ");
 
-
-
     return EXIT_SUCCESS;
 }
diff --git a/src/CommandLineInterface/streamCTRL_TUI.h b/src/CommandLineInterface/streamCTRL_TUI.h
index 75333a68..a09c96f9 100644
--- a/src/CommandLineInterface/streamCTRL_TUI.h
+++ b/src/CommandLineInterface/streamCTRL_TUI.h
@@ -11,7 +11,6 @@
 #ifndef _STREAMCTRL_H
 #define _STREAMCTRL_H
 
-
 /* =============================================================================================== */
 /* =============================================================================================== */
 /*                                        HEADER FILES                                             */
@@ -19,8 +18,7 @@
 /* =============================================================================================== */
 
 #include <stdint.h>
-#include <unistd.h>    // getpid()
-
+#include <unistd.h> // getpid()
 
 /* =============================================================================================== */
 /* =============================================================================================== */
@@ -28,7 +26,7 @@
 /* =============================================================================================== */
 /* =============================================================================================== */
 
-#define STRINGLENMAX  32
+#define STRINGLENMAX 32
 
 #define streamNBID_MAX 10000
 #define streamOpenNBpid_MAX 100
@@ -37,27 +35,23 @@
 
 #define PIDnameStringLen 12
 
-
-
 /* =============================================================================================== */
 /* =============================================================================================== */
 /*                                  GLOBAL DATA DECLARATION                                        */
 /* =============================================================================================== */
 /* =============================================================================================== */
 
-
-
 typedef struct
 {
-    char sname[STRINGMAXLEN_STREAMINFO_NAME];      // stream name
+    char sname[STRINGMAXLEN_STREAMINFO_NAME]; // stream name
     int SymLink;
-    char linkname[STRINGMAXLEN_STREAMINFO_NAME];   // if stream is sym link, resolve link name
+    char linkname[STRINGMAXLEN_STREAMINFO_NAME]; // if stream is sym link, resolve link name
 
     imageID ID;
 
     pid_t streamOpenPID[streamOpenNBpid_MAX];
     int streamOpenPID_cnt;
-    int streamOpenPID_cnt1;                       // number of processes accessing stream
+    int streamOpenPID_cnt1; // number of processes accessing stream
     int streamOpenPID_status;
 
     int datatype;
@@ -70,17 +64,15 @@ typedef struct
 
 } STREAMINFO;
 
-
-
 typedef struct
 {
-    int twaitus; // sleep time between scans
+    int twaitus;   // sleep time between scans
     double dtscan; // measured time interval between scans [s]
 
-    int loop;   // 1 : loop     0 : exit
+    int loop; // 1 : loop     0 : exit
     long loopcnt;
 
-    int filter;           // 1 if applying filter to name
+    int filter; // 1 if applying filter to name
     char namefilter[STRINGLENMAX];
 
     int WriteFlistToFile; // 1 if output to file
@@ -94,44 +86,31 @@ typedef struct
 
 } STREAMINFOPROC;
 
-
-
-
-
-
 /* =============================================================================================== */
 /* =============================================================================================== */
 /*                                    FUNCTIONS SOURCE CODE                                        */
 /* =============================================================================================== */
 /* =============================================================================================== */
 
-
-
-
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
 
-
-
-/**
+    /**
  * INITIALIZE ncurses
  *
  */
 
-int get_process_name_by_pid(const int pid, char *pname);
+    int get_process_name_by_pid(const int pid, char *pname);
 
-int streamCTRL_CatchSignals();
+    int streamCTRL_CatchSignals();
 
-int find_streams(
-    STREAMINFO *streaminfo,
-    int filter,
-    const char *namefilter
-);
+    int find_streams(STREAMINFO *streaminfo, int filter, const char *namefilter);
 
-void *streamCTRL_scan(void *thptr);
+    void *streamCTRL_scan(void *thptr);
 
-/**
+    /**
  * ## Purpose
  *
  * Control screen for stream structures
@@ -143,13 +122,11 @@ void *streamCTRL_scan(void *thptr);
  *
  */
 
-errno_t streamCTRL_CTRLscreen();
-
-
-long image_ID_from_images(IMAGE *images, const char *name);
+    errno_t streamCTRL_CTRLscreen();
 
-long image_get_first_ID_available_from_images(IMAGE *images);
+    long image_ID_from_images(IMAGE *images, const char *name);
 
+    long image_get_first_ID_available_from_images(IMAGE *images);
 
 #ifdef __cplusplus
 }
diff --git a/src/CommandLineInterface/timeutils.c b/src/CommandLineInterface/timeutils.c
index 7a1cbe44..58684063 100644
--- a/src/CommandLineInterface/timeutils.c
+++ b/src/CommandLineInterface/timeutils.c
@@ -2,18 +2,13 @@
  * @file timeutils.c
  */
 
-#include <time.h>
 #include "CommandLineInterface/CLIcore.h"
+#include <time.h>
 
 #define CLOCK_MILK CLOCK_TAI
 // handles leap seconds better than CLOCK_REALTIME
 
-
-
-errno_t mkUTtimestring_nanosec(
-    char *timestring,
-    struct timespec tnow
-)
+errno_t mkUTtimestring_nanosec(char *timestring, struct timespec tnow)
 {
     struct tm *uttime;
     time_t tvsec0;
@@ -21,24 +16,13 @@ errno_t mkUTtimestring_nanosec(
     tvsec0 = tnow.tv_sec;
     uttime = gmtime(&tvsec0);
 
-    sprintf(timestring,
-            "%04d-%02d-%02dT%02d:%02d:%02d.%09ldZ",
-            1900 + uttime->tm_year,
-            1 + uttime->tm_mon,
-            uttime->tm_mday,
-            uttime->tm_hour,
-            uttime->tm_min,
-            uttime->tm_sec,
-            tnow.tv_nsec
-           );
+    sprintf(timestring, "%04d-%02d-%02dT%02d:%02d:%02d.%09ldZ", 1900 + uttime->tm_year, 1 + uttime->tm_mon,
+            uttime->tm_mday, uttime->tm_hour, uttime->tm_min, uttime->tm_sec, tnow.tv_nsec);
 
     return RETURN_SUCCESS;
 }
 
-
-errno_t mkUTtimestring_nanosec_now(
-    char *timestring
-)
+errno_t mkUTtimestring_nanosec_now(char *timestring)
 {
     struct timespec tnow;
 
@@ -48,45 +32,21 @@ errno_t mkUTtimestring_nanosec_now(
     return RETURN_SUCCESS;
 }
 
-
-
-
-
-
-
-
-errno_t mkUTtimestring_microsec(
-    char *timestring,
-    struct timespec tnow
-)
+errno_t mkUTtimestring_microsec(char *timestring, struct timespec tnow)
 {
     struct tm *uttime;
     time_t tvsec0;
 
-
     tvsec0 = tnow.tv_sec;
     uttime = gmtime(&tvsec0);
 
-    sprintf(timestring,
-            "%04d-%02d-%02dT%02d:%02d:%02d.%06ldZ",
-            1900 + uttime->tm_year,
-            1 + uttime->tm_mon,
-            uttime->tm_mday,
-            uttime->tm_hour,
-            uttime->tm_min,
-            uttime->tm_sec,
-            (long)(tnow.tv_nsec / 1000)
-           );
-
+    sprintf(timestring, "%04d-%02d-%02dT%02d:%02d:%02d.%06ldZ", 1900 + uttime->tm_year, 1 + uttime->tm_mon,
+            uttime->tm_mday, uttime->tm_hour, uttime->tm_min, uttime->tm_sec, (long)(tnow.tv_nsec / 1000));
 
     return RETURN_SUCCESS;
 }
 
-
-
-errno_t mkUTtimestring_microsec_now(
-    char *timestring
-)
+errno_t mkUTtimestring_microsec_now(char *timestring)
 {
     struct timespec tnow;
 
@@ -96,15 +56,7 @@ errno_t mkUTtimestring_microsec_now(
     return RETURN_SUCCESS;
 }
 
-
-
-
-
-
-errno_t mkUTtimestring_millisec(
-    char *timestring,
-    struct timespec tnow
-)
+errno_t mkUTtimestring_millisec(char *timestring, struct timespec tnow)
 {
     struct tm *uttime;
     time_t tvsec0;
@@ -112,25 +64,13 @@ errno_t mkUTtimestring_millisec(
     tvsec0 = tnow.tv_sec;
     uttime = gmtime(&tvsec0);
 
-    sprintf(timestring,
-            "%04d-%02d-%02dT%02d:%02d:%02d.%03ldZ",
-            1900 + uttime->tm_year,
-            1 + uttime->tm_mon,
-            uttime->tm_mday,
-            uttime->tm_hour,
-            uttime->tm_min,
-            uttime->tm_sec,
-            (long)(tnow.tv_nsec / 1000000)
-           );
-
+    sprintf(timestring, "%04d-%02d-%02dT%02d:%02d:%02d.%03ldZ", 1900 + uttime->tm_year, 1 + uttime->tm_mon,
+            uttime->tm_mday, uttime->tm_hour, uttime->tm_min, uttime->tm_sec, (long)(tnow.tv_nsec / 1000000));
 
     return RETURN_SUCCESS;
 }
 
-
-errno_t mkUTtimestring_millisec_now(
-    char *timestring
-)
+errno_t mkUTtimestring_millisec_now(char *timestring)
 {
     struct timespec tnow;
 
@@ -140,42 +80,21 @@ errno_t mkUTtimestring_millisec_now(
     return RETURN_SUCCESS;
 }
 
-
-
-
-
-
-
-errno_t mkUTtimestring_sec(
-    char *timestring,
-    struct timespec tnow
-)
+errno_t mkUTtimestring_sec(char *timestring, struct timespec tnow)
 {
     struct tm *uttime;
     time_t tvsec0;
 
-
     tvsec0 = tnow.tv_sec;
     uttime = gmtime(&tvsec0);
 
-    sprintf(timestring,
-            "%04d-%02d-%02dT%02d:%02d:%02dZ",
-            1900 + uttime->tm_year,
-            1 + uttime->tm_mon,
-            uttime->tm_mday,
-            uttime->tm_hour,
-            uttime->tm_min,
-            uttime->tm_sec
-           );
-
+    sprintf(timestring, "%04d-%02d-%02dT%02d:%02d:%02dZ", 1900 + uttime->tm_year, 1 + uttime->tm_mon, uttime->tm_mday,
+            uttime->tm_hour, uttime->tm_min, uttime->tm_sec);
 
     return RETURN_SUCCESS;
 }
 
-
-errno_t mkUTtimestring_sec_now(
-    char *timestring
-)
+errno_t mkUTtimestring_sec_now(char *timestring)
 {
     struct timespec tnow;
 
@@ -185,25 +104,11 @@ errno_t mkUTtimestring_sec_now(
     return RETURN_SUCCESS;
 }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 struct timespec timespec_diff(struct timespec start, struct timespec end)
 {
     struct timespec temp;
 
-    if((end.tv_nsec - start.tv_nsec) < 0)
+    if ((end.tv_nsec - start.tv_nsec) < 0)
     {
         temp.tv_sec = end.tv_sec - start.tv_sec - 1;
         temp.tv_nsec = 1000000000 + end.tv_nsec - start.tv_nsec;
@@ -216,14 +121,12 @@ struct timespec timespec_diff(struct timespec start, struct timespec end)
     return temp;
 }
 
-
-
 double timespec_diff_double(struct timespec start, struct timespec end)
 {
     struct timespec temp;
     double val;
 
-    if((end.tv_nsec - start.tv_nsec) < 0)
+    if ((end.tv_nsec - start.tv_nsec) < 0)
     {
         temp.tv_sec = end.tv_sec - start.tv_sec - 1;
         temp.tv_nsec = 1000000000 + end.tv_nsec - start.tv_nsec;
@@ -240,24 +143,20 @@ double timespec_diff_double(struct timespec start, struct timespec end)
     return val;
 }
 
-
 /**
  * @brief Returns time string in form of HH:MM:SS.SS
  *
  * @param timedouble Unix time
  * @return char*
  */
-char *timedouble_to_UTC_timeofdaystring(
-    double timedouble
-)
+char *timedouble_to_UTC_timeofdaystring(double timedouble)
 {
     char *tstring = malloc(12);
 
-
-    time_t timet = (time_t) timedouble;
+    time_t timet = (time_t)timedouble;
     struct tm *timetm = gmtime(&timet);
 
-    float sec = 1.0 * timetm->tm_sec + timedouble - (long) timedouble;
+    float sec = 1.0 * timetm->tm_sec + timedouble - (long)timedouble;
 
     printf("TIME double     : %lf\n", timedouble);
 
@@ -266,23 +165,10 @@ char *timedouble_to_UTC_timeofdaystring(
     double tdoublenow = 1.0 * tsnow.tv_sec + 1.0e-9 * tsnow.tv_nsec;
     printf("TIME double NOW : %lf\n", tdoublenow);
 
+    printf("DATE: %04d-%02d-%02d  %02d:%02d:%02d  %05.2f\n", 1900 + timetm->tm_year, 1 + timetm->tm_mon,
+           1 + timetm->tm_mday, timetm->tm_hour, timetm->tm_min, timetm->tm_sec, sec);
 
-    printf("DATE: %04d-%02d-%02d  %02d:%02d:%02d  %05.2f\n",
-           1900 + timetm->tm_year,
-           1 + timetm->tm_mon,
-           1 + timetm->tm_mday,
-           timetm->tm_hour,
-           timetm->tm_min,
-           timetm->tm_sec,
-           sec
-          );
-
-    sprintf(tstring,
-            "%02d:%02d:%05.2f",
-            timetm->tm_hour,
-            timetm->tm_min,
-            sec
-           );
+    sprintf(tstring, "%02d:%02d:%05.2f", timetm->tm_hour, timetm->tm_min, sec);
 
     return tstring;
-}
\ No newline at end of file
+}
diff --git a/src/CommandLineInterface/timeutils.h b/src/CommandLineInterface/timeutils.h
index ac866b11..6e2e1996 100644
--- a/src/CommandLineInterface/timeutils.h
+++ b/src/CommandLineInterface/timeutils.h
@@ -14,17 +14,8 @@ errno_t mkUTtimestring_millisec_now(char *timestring);
 errno_t mkUTtimestring_sec(char *timestring, struct timespec tnow);
 errno_t mkUTtimestring_sec_now(char *timestring);
 
+struct timespec timespec_diff(struct timespec start, struct timespec end);
 
-struct timespec timespec_diff(
-    struct timespec start,
-    struct timespec end
-);
+double timespec_diff_double(struct timespec start, struct timespec end);
 
-double timespec_diff_double(
-    struct timespec start,
-    struct timespec end
-);
-
-char *timedouble_to_UTC_timeofdaystring(
-    double timedouble
-);
\ No newline at end of file
+char *timedouble_to_UTC_timeofdaystring(double timedouble);
diff --git a/src/config.h.in b/src/config.h.in
index d6f98617..fec0ab05 100644
--- a/src/config.h.in
+++ b/src/config.h.in
@@ -1,2 +1 @@
 #include "@PROJECT_NAME@_config.h"
-
diff --git a/src/milk_module_example/create_example_image.c b/src/milk_module_example/create_example_image.c
index 1df025e2..39f3dcd6 100644
--- a/src/milk_module_example/create_example_image.c
+++ b/src/milk_module_example/create_example_image.c
@@ -5,31 +5,21 @@
  *
  */
 
-
 #include "CommandLineInterface/CLIcore.h"
 
 // required for create_2Dimage_ID
 #include "COREMOD_memory/COREMOD_memory.h"
 
-
-
 // ==========================================
 // Forward declaration(s)
 // ==========================================
 
-errno_t milk_module_example__create_image_with_value(
-    const char *restrict imname,
-    double value
-);
-
-
+errno_t milk_module_example__create_image_with_value(const char *restrict imname, double value);
 
 // ==========================================
 // Command line interface wrapper function(s)
 // ==========================================
 
-
-
 /** @brief Example CLI function
  *
  * Command Line Interface (CLI) wrapper to function\n
@@ -58,16 +48,11 @@ errno_t milk_module_example__create_image_with_value(
  */
 static errno_t milk_module_example__create_image_with_value__cli()
 {
-    if(0
-            + CLI_checkarg(1, CLIARG_STR_NOT_IMG)
-            + CLI_checkarg(2, CLIARG_FLOAT)
-            == 0)
+    if (0 + CLI_checkarg(1, CLIARG_STR_NOT_IMG) + CLI_checkarg(2, CLIARG_FLOAT) == 0)
     {
         // If arguments meet requirements, command is executed
         //
-        milk_module_example__create_image_with_value(
-            data.cmdargtoken[1].val.string,
-            data.cmdargtoken[2].val.numf);
+        milk_module_example__create_image_with_value(data.cmdargtoken[1].val.string, data.cmdargtoken[2].val.numf);
 
         return CLICMD_SUCCESS;
     }
@@ -78,12 +63,6 @@ static errno_t milk_module_example__create_image_with_value__cli()
     }
 }
 
-
-
-
-
-
-
 // ==========================================
 // Register CLI command(s)
 // ==========================================
@@ -91,31 +70,20 @@ static errno_t milk_module_example__create_image_with_value__cli()
 errno_t create_example_image_addCLIcmd()
 {
 
-    RegisterCLIcommand(
-        "createim",                                                                    // function call name from CLI
-        __FILE__,                                                                      // this file, used to track where function comes from
-        milk_module_example__create_image_with_value__cli,                             // function to call
-        "creates image with specified value",                                          // short description
-        "<image> <value>",                                                             // arguments
-        "createim im1 3.5",                                                            // example use
-        "milk_module_example__create_image_with_value(char *imname, double value)");   // source code call
+    RegisterCLIcommand("createim", // function call name from CLI
+                       __FILE__,   // this file, used to track where function comes from
+                       milk_module_example__create_image_with_value__cli,                           // function to call
+                       "creates image with specified value",                                        // short description
+                       "<image> <value>",                                                           // arguments
+                       "createim im1 3.5",                                                          // example use
+                       "milk_module_example__create_image_with_value(char *imname, double value)"); // source code call
 
     return RETURN_SUCCESS;
 }
 
-
-
-
-
-
-
-
 // By convention, function name starts with <modulename>__
 //
-errno_t milk_module_example__create_image_with_value(
-    const char *restrict imname,
-    double value
-)
+errno_t milk_module_example__create_image_with_value(const char *restrict imname, double value)
 {
     uint32_t xsize = 128; // by convention, pixel index variables are uint32_t type
     uint32_t ysize = 256;
@@ -130,15 +98,10 @@ errno_t milk_module_example__create_image_with_value(
     imageID ID = create_2Dimage_ID(imname, xsize, ysize);
 
     // set each pixel to value
-    for(uint64_t ii = 0; ii < xysize; ii++)
+    for (uint64_t ii = 0; ii < xysize; ii++)
     {
         data.image[ID].array.F[ii] = value;
     }
 
     return RETURN_SUCCESS;
 }
-
-
-
-
-
diff --git a/src/milk_module_example/create_example_image.h b/src/milk_module_example/create_example_image.h
index be9e3db7..67334237 100644
--- a/src/milk_module_example/create_example_image.h
+++ b/src/milk_module_example/create_example_image.h
@@ -6,12 +6,8 @@
 #ifndef _CREATE_EXAMPLE_IMAGE_H
 #define CREATE_EXAMPLE_IMAGE_H
 
-
 errno_t create_example_image_addCLIcmd();
 
-errno_t milk_module_example__create_image_with_value(
-    char *imname,
-    double value
-);
+errno_t milk_module_example__create_image_with_value(char *imname, double value);
 
 #endif
diff --git a/src/milk_module_example/examplefunc1.c b/src/milk_module_example/examplefunc1.c
index e54f7a4c..70096ee6 100644
--- a/src/milk_module_example/examplefunc1.c
+++ b/src/milk_module_example/examplefunc1.c
@@ -9,14 +9,12 @@
 
 #include "CommandLineInterface/CLIcore.h"
 
-
 // Local variables pointers
 // Within this translation unit, these point to the variables values
 static char *inimname;
 // float point variable should be double. single precision float not supported
 static double *scoeff;
 
-
 // List of arguments to function
 // { CLItype, tag, description, initial value, flag, fptype, fpflag}
 //
@@ -24,32 +22,15 @@ static double *scoeff;
 // series of words separated by dot "."
 // For example: .input.xsize (note that first dot is optional)
 //
-static CLICMDARGDEF farg[] =
-{
-    {
-        CLIARG_IMG, ".in_name", "input image", "im1",
-        CLIARG_VISIBLE_DEFAULT,
-        (void **) &inimname, NULL
-    },
-    {
-        // hidden argument is not part of CLI call, FPFLAG ignored
-        CLIARG_FLOAT, ".scaling", "scaling coefficient", "1.0",
-        CLIARG_HIDDEN_DEFAULT,
-        (void **) &scoeff, NULL
-    }
-};
-
+static CLICMDARGDEF farg[] = {
+    {CLIARG_IMG, ".in_name", "input image", "im1", CLIARG_VISIBLE_DEFAULT, (void **)&inimname, NULL},
+    {// hidden argument is not part of CLI call, FPFLAG ignored
+     CLIARG_FLOAT, ".scaling", "scaling coefficient", "1.0", CLIARG_HIDDEN_DEFAULT, (void **)&scoeff, NULL}};
 
 // CLI function initialization data
-static CLICMDDATA CLIcmddata =
-{
-    "imsum1",                  // keyword to call function in CLI
-    "compute total of image example1", // description of what the function does
-    CLICMD_FIELDS_NOFPS
-};
-
-
-
+static CLICMDDATA CLIcmddata = {"imsum1",                          // keyword to call function in CLI
+                                "compute total of image example1", // description of what the function does
+                                CLICMD_FIELDS_NOFPS};
 
 /**
  * @brief Detailed help
@@ -58,22 +39,14 @@ static CLICMDDATA CLIcmddata =
  */
 static errno_t help_function()
 {
-    printf(
-        "Example function demonstrating basic CLI interface\n"
-        "Adds pixel values of an image with a global scaling parameter\n"
-        "Input is image, output is scalar\n"
-        "This function does not support fps or procinfo\n"
-    );
+    printf("Example function demonstrating basic CLI interface\n"
+           "Adds pixel values of an image with a global scaling parameter\n"
+           "Input is image, output is scalar\n"
+           "This function does not support fps or procinfo\n");
 
     return RETURN_SUCCESS;
 }
 
-
-
-
-
-
-
 /** @brief Compute function code
  *
  * Can be made non-static and called from outside this translation unit(TU)
@@ -82,9 +55,7 @@ static errno_t help_function()
  * Functions should return error code of type errno_t (= int).
  * On success, return value is RETURN_SUCCESS (=0).
  */
-static errno_t example_compute_2Dimage_total(
-    IMGID  img,
-    double scalingcoeff)
+static errno_t example_compute_2Dimage_total(IMGID img, double scalingcoeff)
 {
     // entering function, updating trace accordingly
     DEBUG_TRACE_FSTART();
@@ -92,18 +63,15 @@ static errno_t example_compute_2Dimage_total(
     // Resolve image if not already resolved
     resolveIMGID(&img, ERRMODE_ABORT);
 
-
     // If function fails and error cannot be recovered from, use :
 
     // abort();
 
-
     // If error, return from function with error code and have
     // caller handle it :
 
     // FUNC_RETURN_FAILURE("error description");
 
-
     // If calling other milk function, use following macro
     // to test and handle possible error return :
 
@@ -114,24 +82,19 @@ static errno_t example_compute_2Dimage_total(
     uint_fast64_t xysize = xsize * ysize;
 
     double total = 0.0;
-    for(uint_fast64_t ii = 0; ii < xysize; ii++)
+    for (uint_fast64_t ii = 0; ii < xysize; ii++)
     {
         total += img.im->array.F[ii];
     }
     total *= scalingcoeff;
 
-    printf("image %s total = %lf (scaling coeff %lf)\n",
-           img.im->name,
-           total,
-           scalingcoeff);
+    printf("image %s total = %lf (scaling coeff %lf)\n", img.im->name, total, scalingcoeff);
 
     // normal successful return from function :
     DEBUG_TRACE_FEXIT();
     return RETURN_SUCCESS;
 }
 
-
-
 /**
  * @brief Wrapper function, used by all CLI calls
  *
@@ -144,28 +107,21 @@ static errno_t compute_function()
 {
     DEBUG_TRACE_FSTART();
 
-    example_compute_2Dimage_total(
-        makeIMGID(inimname),
-        *scoeff
-    );
+    example_compute_2Dimage_total(makeIMGID(inimname), *scoeff);
 
     DEBUG_TRACE_FEXIT();
     return RETURN_SUCCESS;
 }
 
-
-
-
-
 INSERT_STD_CLIfunction
 
-
-/** @brief Register CLI command
+    /** @brief Register CLI command
  *
  * Adds function to list of CLI commands.
  * Called by main module initialization function init_module_CLI().
  */
-errno_t CLIADDCMD_milk_module_example__simplefunc()
+    errno_t
+    CLIADDCMD_milk_module_example__simplefunc()
 {
     INSERT_STD_CLIREGISTERFUNC
 
diff --git a/src/milk_module_example/examplefunc2_FPS.c b/src/milk_module_example/examplefunc2_FPS.c
index 8d9bda16..757498a5 100644
--- a/src/milk_module_example/examplefunc2_FPS.c
+++ b/src/milk_module_example/examplefunc2_FPS.c
@@ -9,7 +9,6 @@
 
 #include "CommandLineInterface/CLIcore.h"
 
-
 // Local variables pointers
 
 //static LOCVAR_INIMG inim;
@@ -18,34 +17,14 @@ static char *inimname;
 
 static double *scoeff;
 
-
 // List of arguments to function
-static CLICMDARGDEF farg[] =
-{
-//    FARG_INPUTIM(inim),
-    {
-        CLIARG_IMG, ".in_name", "input image", "im1",
-        CLIARG_VISIBLE_DEFAULT,
-        (void **) &inimname, NULL
-    },
-    {
-        // argument is not part of CLI call, FPFLAG ignored
-        CLIARG_FLOAT, ".scaling", "scaling coefficient", "1.0",
-        CLIARG_HIDDEN_DEFAULT,
-        (void **) &scoeff, NULL
-    }
-};
-
-
-static CLICMDDATA CLIcmddata =
-{
-    "imsum2",
-    "compute total of image example2, FPS-compatible",
-    CLICMD_FIELDS_DEFAULTS
-};
-
-
+static CLICMDARGDEF farg[] = {
+    //    FARG_INPUTIM(inim),
+    {CLIARG_IMG, ".in_name", "input image", "im1", CLIARG_VISIBLE_DEFAULT, (void **)&inimname, NULL},
+    {// argument is not part of CLI call, FPFLAG ignored
+     CLIARG_FLOAT, ".scaling", "scaling coefficient", "1.0", CLIARG_HIDDEN_DEFAULT, (void **)&scoeff, NULL}};
 
+static CLICMDDATA CLIcmddata = {"imsum2", "compute total of image example2, FPS-compatible", CLICMD_FIELDS_DEFAULTS};
 
 static errno_t help_function()
 {
@@ -54,9 +33,6 @@ static errno_t help_function()
     return RETURN_SUCCESS;
 }
 
-
-
-
 /**
  * @brief Sum pixel values
  *
@@ -64,10 +40,7 @@ static errno_t help_function()
  * @param scalingcoeff
  * @return errno_t
  */
-static errno_t example_compute_2Dimage_total(
-    IMGID  img,
-    double  scalingcoeff
-)
+static errno_t example_compute_2Dimage_total(IMGID img, double scalingcoeff)
 {
     DEBUG_TRACE_FSTART();
 
@@ -78,23 +51,18 @@ static errno_t example_compute_2Dimage_total(
     uint64_t xysize = xsize * ysize;
 
     double total = 0.0;
-    for(uint64_t ii = 0; ii < xysize; ii++)
+    for (uint64_t ii = 0; ii < xysize; ii++)
     {
         total += img.im->array.F[ii];
     }
     total *= scalingcoeff;
 
-    printf("image %s total = %lf (scaling coeff %lf)\n",
-           img.im->name,
-           total,
-           scalingcoeff);
+    printf("image %s total = %lf (scaling coeff %lf)\n", img.im->name, total, scalingcoeff);
 
     DEBUG_TRACE_FEXIT();
     return RETURN_SUCCESS;
 }
 
-
-
 /**
  * @brief Wrapper function, used by all CLI calls
  *
@@ -104,32 +72,23 @@ static errno_t compute_function()
 {
     DEBUG_TRACE_FSTART();
 
-//    IMGID img = makeIMGID(inimname);
+    //    IMGID img = makeIMGID(inimname);
     //inim.name);
 
     INSERT_STD_PROCINFO_COMPUTEFUNC_START
 
-
-    example_compute_2Dimage_total(
-        makeIMGID(inimname),
-        *scoeff
-    );
+    example_compute_2Dimage_total(makeIMGID(inimname), *scoeff);
 
     INSERT_STD_PROCINFO_COMPUTEFUNC_END
 
-
-
     DEBUG_TRACE_FEXIT();
     return RETURN_SUCCESS;
 }
 
-
-
 INSERT_STD_FPSCLIfunctions
 
-
-
-errno_t CLIADDCMD_milk_module_example__simplefunc_FPS()
+    errno_t
+    CLIADDCMD_milk_module_example__simplefunc_FPS()
 {
     INSERT_STD_CLIREGISTERFUNC
 
diff --git a/src/milk_module_example/examplefunc3_updatestreamloop.c b/src/milk_module_example/examplefunc3_updatestreamloop.c
index 159d0652..dfa50b49 100644
--- a/src/milk_module_example/examplefunc3_updatestreamloop.c
+++ b/src/milk_module_example/examplefunc3_updatestreamloop.c
@@ -5,42 +5,20 @@
  * Example 3
  */
 
-
 #include "CommandLineInterface/CLIcore.h"
 
 #include "COREMOD_memory/COREMOD_memory.h"
 
-
 // variables local to this translation unit
 static char *inimname;
 
+static CLICMDARGDEF farg[] = {
+    {CLIARG_IMG, ".in_sname", "input stream", "ims1", CLIARG_VISIBLE_DEFAULT, (void **)&inimname, NULL}};
 
-static CLICMDARGDEF farg[] =
-{
-    {
-        CLIARG_IMG,  ".in_sname", "input stream", "ims1",
-        CLIARG_VISIBLE_DEFAULT,
-        (void **) &inimname, NULL
-    }
-};
-
-static CLICMDDATA CLIcmddata =
-{
-    "streamupdate",
-    "update stream",
-    CLICMD_FIELDS_DEFAULTS
-};
-
-
+static CLICMDDATA CLIcmddata = {"streamupdate", "update stream", CLICMD_FIELDS_DEFAULTS};
 
 // detailed help
-static errno_t help_function()
-{
-    return RETURN_SUCCESS;
-}
-
-
-
+static errno_t help_function() { return RETURN_SUCCESS; }
 
 // Wrapper function, used by all CLI calls
 static errno_t compute_function()
@@ -58,13 +36,11 @@ static errno_t compute_function()
     return RETURN_SUCCESS;
 }
 
-
-
-
 INSERT_STD_FPSCLIfunctions
 
-// Register function in CLI
-errno_t CLIADDCMD_milk_module_example__updatestreamloop()
+    // Register function in CLI
+    errno_t
+    CLIADDCMD_milk_module_example__updatestreamloop()
 {
     INSERT_STD_CLIREGISTERFUNC
 
diff --git a/src/milk_module_example/examplefunc4_streamprocess.c b/src/milk_module_example/examplefunc4_streamprocess.c
index c3fc9fbf..51fdc3dd 100644
--- a/src/milk_module_example/examplefunc4_streamprocess.c
+++ b/src/milk_module_example/examplefunc4_streamprocess.c
@@ -6,7 +6,6 @@
  * Function has input stream and output stream.
  */
 
-
 #include "CommandLineInterface/CLIcore.h"
 
 // required for create_2Dimage_ID()
@@ -18,8 +17,6 @@
 // required for timespec_diff
 //#include "CommandLineInterface/timeutils.h"
 
-
-
 // Local variables pointers
 
 static char *inimname;
@@ -32,46 +29,21 @@ static long fpi_cntindex = -1;
 static uint32_t *cntindexmax;
 static long fpi_cntindexmax = -1;
 
-static int64_t  *ex0mode;
+static int64_t *ex0mode;
 static long fpi_ex0mode = -1;
 
-static int64_t  *ex1mode;
+static int64_t *ex1mode;
 static long fpi_ex1mode = -1;
 
-
-
-static CLICMDARGDEF farg[] =
-{
-    {
-        CLIARG_IMG, ".in_name", "input image", "im1",
-        CLIARG_VISIBLE_DEFAULT,
-        (void **) &inimname, NULL
-    },
-    {
-        CLIARG_IMG, ".out_name", "output image", "out1",
-        CLIARG_VISIBLE_DEFAULT,
-        (void **) &outimname, NULL
-    },
-    {
-        CLIARG_UINT32, ".cntindex", "counter index", "5",
-        CLIARG_HIDDEN_DEFAULT,
-        (void **) &cntindex, &fpi_cntindex
-    },
-    {
-        CLIARG_UINT32, ".cntindexmax", "counter index max value", "100",
-        CLIARG_HIDDEN_DEFAULT,
-        (void **) &cntindexmax, &fpi_cntindexmax
-    },
-    {
-        CLIARG_ONOFF, ".option.ex0mode", "toggle0", "0",
-        CLIARG_HIDDEN_DEFAULT, (void **) &ex0mode, &fpi_ex0mode
-    },
-    {
-        CLIARG_ONOFF, ".option.ex1mode", "toggle1 conditional on toggle0", "0",
-        CLIARG_HIDDEN_DEFAULT, (void **) &ex1mode, &fpi_ex1mode
-    }
-};
-
+static CLICMDARGDEF farg[] = {
+    {CLIARG_IMG, ".in_name", "input image", "im1", CLIARG_VISIBLE_DEFAULT, (void **)&inimname, NULL},
+    {CLIARG_IMG, ".out_name", "output image", "out1", CLIARG_VISIBLE_DEFAULT, (void **)&outimname, NULL},
+    {CLIARG_UINT32, ".cntindex", "counter index", "5", CLIARG_HIDDEN_DEFAULT, (void **)&cntindex, &fpi_cntindex},
+    {CLIARG_UINT32, ".cntindexmax", "counter index max value", "100", CLIARG_HIDDEN_DEFAULT, (void **)&cntindexmax,
+     &fpi_cntindexmax},
+    {CLIARG_ONOFF, ".option.ex0mode", "toggle0", "0", CLIARG_HIDDEN_DEFAULT, (void **)&ex0mode, &fpi_ex0mode},
+    {CLIARG_ONOFF, ".option.ex1mode", "toggle1 conditional on toggle0", "0", CLIARG_HIDDEN_DEFAULT, (void **)&ex1mode,
+     &fpi_ex1mode}};
 
 // Optional custom configuration setup
 // Runs once at conf startup
@@ -86,7 +58,7 @@ static errno_t customCONFsetup()
     // increment counter at every configuration check
     *cntindex = *cntindex + 1;
 
-    if(*cntindex >= *cntindexmax)
+    if (*cntindex >= *cntindexmax)
     {
         *cntindex = 0;
     }
@@ -94,10 +66,6 @@ static errno_t customCONFsetup()
     return RETURN_SUCCESS;
 }
 
-
-
-
-
 // Optional custom configuration checks
 // Runs at every configuration check loop iteration
 //
@@ -108,14 +76,14 @@ static errno_t customCONFsetup()
 //
 static errno_t customCONFcheck()
 {
-    if(data.fpsptr != NULL)
+    if (data.fpsptr != NULL)
     {
-        if(data.fpsptr->parray[fpi_ex0mode].fpflag & FPFLAG_ONOFF)     // ON state
+        if (data.fpsptr->parray[fpi_ex0mode].fpflag & FPFLAG_ONOFF) // ON state
         {
             data.fpsptr->parray[fpi_ex1mode].fpflag |= FPFLAG_USED;
             data.fpsptr->parray[fpi_ex1mode].fpflag |= FPFLAG_VISIBLE;
         }
-        else     // OFF state
+        else // OFF state
         {
             data.fpsptr->parray[fpi_ex1mode].fpflag &= ~FPFLAG_USED;
             data.fpsptr->parray[fpi_ex1mode].fpflag &= ~FPFLAG_VISIBLE;
@@ -124,7 +92,7 @@ static errno_t customCONFcheck()
         // increment counter at every configuration check
         *cntindex = *cntindex + 1;
 
-        if(*cntindex >= *cntindexmax)
+        if (*cntindex >= *cntindexmax)
         {
             *cntindex = 0;
         }
@@ -133,40 +101,21 @@ static errno_t customCONFcheck()
     return RETURN_SUCCESS;
 }
 
-
-
-
-static CLICMDDATA CLIcmddata =
-{
-    "streamprocess",
-    "process input stream to output stream",
-    CLICMD_FIELDS_DEFAULTS
-};
-
-
-
+static CLICMDDATA CLIcmddata = {"streamprocess", "process input stream to output stream", CLICMD_FIELDS_DEFAULTS};
 
 // detailed help
-static errno_t help_function()
-{
-    return RETURN_SUCCESS;
-}
-
-
-
+static errno_t help_function() { return RETURN_SUCCESS; }
 
 static errno_t streamprocess(IMGID inimg, IMGID outimg)
 {
     // custom stream process function code
 
-    (void) inimg;
-    (void) outimg;
+    (void)inimg;
+    (void)outimg;
 
     return RETURN_SUCCESS;
 }
 
-
-
 static errno_t compute_function()
 {
     DEBUG_TRACE_FSTART();
@@ -180,7 +129,7 @@ static errno_t compute_function()
     INSERT_STD_PROCINFO_COMPUTEFUNC_INIT
 
     // custom initialization
-    if(CLIcmddata.cmdsettings->flags & CLICMDFLAG_PROCINFO)
+    if (CLIcmddata.cmdsettings->flags & CLICMDFLAG_PROCINFO)
     {
         // procinfo is accessible here
     }
@@ -196,13 +145,11 @@ static errno_t compute_function()
     return RETURN_SUCCESS;
 }
 
-
-
-
 INSERT_STD_FPSCLIfunctions
 
-// Register function in CLI
-errno_t CLIADDCMD_milk_module_example__streamprocess()
+    // Register function in CLI
+    errno_t
+    CLIADDCMD_milk_module_example__streamprocess()
 {
     CLIcmddata.FPS_customCONFsetup = customCONFsetup;
     CLIcmddata.FPS_customCONFcheck = customCONFcheck;
@@ -210,5 +157,3 @@ errno_t CLIADDCMD_milk_module_example__streamprocess()
 
     return RETURN_SUCCESS;
 }
-
-
diff --git a/src/milk_module_example/examples/00_CommandLineInterface_basics/02_Loading_modules b/src/milk_module_example/examples/00_CommandLineInterface_basics/02_Loading_modules
index 895e7e3b..71df8e24 100644
--- a/src/milk_module_example/examples/00_CommandLineInterface_basics/02_Loading_modules
+++ b/src/milk_module_example/examples/00_CommandLineInterface_basics/02_Loading_modules
@@ -1,7 +1,7 @@
 examplestring="Loading modules"
 
 exampleDescription="
-Modules can be loaded at runtime from the CLI, 
+Modules can be loaded at runtime from the CLI,
 or by using the MILKCLI_ADD_LIBS environment
 variable.
 "
diff --git a/src/milk_module_example/examples/01_FunctionParameterStructure/00_FPSintro b/src/milk_module_example/examples/01_FunctionParameterStructure/00_FPSintro
index 52fd3e0c..7002a1c5 100644
--- a/src/milk_module_example/examples/01_FunctionParameterStructure/00_FPSintro
+++ b/src/milk_module_example/examples/01_FunctionParameterStructure/00_FPSintro
@@ -4,9 +4,9 @@ examplestring="Function Parameter Structure (FPS) - intro"
 exampleDescription="
 FPS is a structure holding function parameters, held in shared memory.
 
-FPSs are specific to milk functions. Their content matches the function 
+FPSs are specific to milk functions. Their content matches the function
 set of parameters. They are created and managed by the functions:
-There is no way to add/remove entries in an FPS other than changing the 
+There is no way to add/remove entries in an FPS other than changing the
 source code for the function.
 
 FPSs only exist in shared memory - they do not exist as regular files
diff --git a/src/milk_module_example/examples/01_FunctionParameterStructure/03_milk-fpsCTR b/src/milk_module_example/examples/01_FunctionParameterStructure/03_milk-fpsCTR
index 58bbc669..ceee992d 100644
--- a/src/milk_module_example/examples/01_FunctionParameterStructure/03_milk-fpsCTR
+++ b/src/milk_module_example/examples/01_FunctionParameterStructure/03_milk-fpsCTR
@@ -17,6 +17,6 @@ milk-fpsCTRL
 # Type h for (h)elp
 
 
-# Exit 
+# Exit
 x
 "
diff --git a/src/milk_module_example/examples/02_Managing_Processes/02_triggermode_delay b/src/milk_module_example/examples/02_Managing_Processes/02_triggermode_delay
index 7703c9db..3014fcb0 100644
--- a/src/milk_module_example/examples/02_Managing_Processes/02_triggermode_delay
+++ b/src/milk_module_example/examples/02_Managing_Processes/02_triggermode_delay
@@ -1,7 +1,7 @@
 examplestring="processinfo triggermode delay"
 
 exampleDescription="
-Configuration parameter triggermode_delay controls the time delay 
+Configuration parameter triggermode_delay controls the time delay
 between loop iterations.
 "
 
diff --git a/src/milk_module_example/milk_module_example.c b/src/milk_module_example/milk_module_example.c
index e95fa53e..8c51f7d4 100644
--- a/src/milk_module_example/milk_module_example.c
+++ b/src/milk_module_example/milk_module_example.c
@@ -44,7 +44,6 @@
  *
  */
 
-
 #define _GNU_SOURCE
 
 /* ================================================================== */
@@ -59,11 +58,7 @@
 #define MODULE_SHORTNAME_DEFAULT "modex"
 
 // Module short description
-#define MODULE_DESCRIPTION       "Example module: template for creating new modules"
-
-
-
-
+#define MODULE_DESCRIPTION "Example module: template for creating new modules"
 
 /* ================================================================== */
 /* ================================================================== */
@@ -71,11 +66,8 @@
 /* ================================================================== */
 /* ================================================================== */
 
-
 #include "CommandLineInterface/CLIcore.h"
 
-
-
 //
 // Forward declarations are required to connect CLI calls to functions
 // If functions are in separate .c files, include here the corresponding .h files
@@ -90,9 +82,6 @@
 
 //#include "updatestreamloop_brief.h"
 
-
-
-
 /* ================================================================== */
 /* ================================================================== */
 /*  INITIALIZE LIBRARY                                                */
@@ -104,8 +93,6 @@
 //
 INIT_MODULE_LIB(milk_module_example)
 
-
-
 /**
  * @brief Initialize module CLI
  *
@@ -124,20 +111,11 @@ static errno_t init_module_CLI()
     //	milk_module_example__updatestreamloop_addCLIcmd();
 
     CLIADDCMD_milk_module_example__simplefunc();
-	CLIADDCMD_milk_module_example__simplefunc_FPS();
+    CLIADDCMD_milk_module_example__simplefunc_FPS();
     CLIADDCMD_milk_module_example__updatestreamloop();
     CLIADDCMD_milk_module_example__streamprocess();
 
-
     // optional: add atexit functions here
 
     return RETURN_SUCCESS;
 }
-
-
-
-
-
-
-
-
diff --git a/src/milk_module_example/milk_module_example.h b/src/milk_module_example/milk_module_example.h
index 002654e8..8cc162e5 100644
--- a/src/milk_module_example/milk_module_example.h
+++ b/src/milk_module_example/milk_module_example.h
@@ -6,8 +6,6 @@
  * Do not use this .h file for forward declaration internal to the module.\n
  */
 
-
-
 #ifndef _MILK_MODULE_EXAMPLE_H
 #define _MILK_MODULE_EXAMPLE_H
 
diff --git a/src/milk_module_example/scripts/milk-scriptexample b/src/milk_module_example/scripts/milk-scriptexample
index e952bc65..b1938e68 100755
--- a/src/milk_module_example/scripts/milk-scriptexample
+++ b/src/milk_module_example/scripts/milk-scriptexample
@@ -65,4 +65,3 @@ modex.streamupdate ${streamname}
 listim
 exitCLI
 EOF
-
diff --git a/src/milk_module_example/scripts/milk-semtestspeed b/src/milk_module_example/scripts/milk-semtestspeed
index db8ba60a..5da86841 100755
--- a/src/milk_module_example/scripts/milk-semtestspeed
+++ b/src/milk_module_example/scripts/milk-semtestspeed
@@ -33,4 +33,3 @@ readshmim imB
 mex.streamloop imB imA ${NBLOOP} ${SEMTRIG}
 exitCLI
 EOF
-
diff --git a/src/milk_module_example/scripts/milk-streampoke b/src/milk_module_example/scripts/milk-streampoke
index 54520472..e4fa952b 100755
--- a/src/milk_module_example/scripts/milk-streampoke
+++ b/src/milk_module_example/scripts/milk-streampoke
@@ -13,7 +13,7 @@ Can poke in a loop
 "
 
 # standard configuration
-# 
+#
 source milk-script-std-config
 
 # prerequisites
@@ -65,4 +65,3 @@ modex.streamupdate ${streamname}
 listim
 exitCLI
 EOF
-
diff --git a/src/milk_module_example/scripts/milk-test-simplefunc b/src/milk_module_example/scripts/milk-test-simplefunc
index 4c1df52e..14259f3f 100755
--- a/src/milk_module_example/scripts/milk-test-simplefunc
+++ b/src/milk_module_example/scripts/milk-test-simplefunc
@@ -46,4 +46,3 @@ modex.simplefunc .
 
 exitCLI
 EOF
-
diff --git a/src/milk_module_example/scripts/milk-tutorial b/src/milk_module_example/scripts/milk-tutorial
index 18b5b729..a7d8ba39 100755
--- a/src/milk_module_example/scripts/milk-tutorial
+++ b/src/milk_module_example/scripts/milk-tutorial
@@ -57,7 +57,7 @@ echo "Use arrow keys to navigate and select example script."
 echo ""
 echo "All examples will run in tmux session ${TMUXSESSIONNAME}"
 echo ""
-echo "$(tput bold)====== DO THIS NOW =======" 
+echo "$(tput bold)====== DO THIS NOW ======="
 echo "Run \"tmux a -t ${TMUXSESSIONNAME}\" in a separate terminal to view examples$(tput sgr0)"
 echo
 read -s -p "When done, press [ENTER] to proceed to navigator, [CTRL-C] to exit"
@@ -73,15 +73,15 @@ function ProbeUserRunExample {
     for (( i=0; i<$nbCLIcmd; i++ )); do
         CLIline=${CLIinarray[$i]}
         if [ -n "$CLIline" ]; then # only process non-empty lines
-        if [[ $CLIline == \#* ]]; then
-            # this is a comment, just print it in green
-            echo "$(tput setaf 2)${CLIline} $(tput sgr0)"
-        else
-            echo "$(tput bold)$(tput setaf 3)${CLIline} $(tput sgr0)"
-            read -p "   [ENTER] to run this command "
-            tmux send-keys -t ${TMUXSESSIONNAME} "${CLIline}" C-m
-            echo ""
-        fi
+            if [[ $CLIline == \#* ]]; then
+                # this is a comment, just print it in green
+                echo "$(tput setaf 2)${CLIline} $(tput sgr0)"
+            else
+                echo "$(tput bold)$(tput setaf 3)${CLIline} $(tput sgr0)"
+                read -p "   [ENTER] to run this command "
+                tmux send-keys -t ${TMUXSESSIONNAME} "${CLIline}" C-m
+                echo ""
+            fi
         fi
     done
 }
@@ -94,32 +94,32 @@ ExampleDir="/home/oguyon/src/milk/src/milk_module_example/examples/"
 loopOK=1
 while [ ${loopOK} = 1 ]; do
 
-#EXAMPLEFILE=$(cd $ExampleDir; nnn -c -o -p '-')
-EXAMPLEFILE=$(cd $ExampleDir; nnn -c -o -p '-')
-
-echo "selected : $EXAMPLEFILE in $ExampleDir"
-if [ -f "$EXAMPLEFILE" ]; then
-    ExampleDir="$(dirname "$EXAMPLEFILE")"
-    source $EXAMPLEFILE
-
-    clear
-    tput bold; echo "Example ${examplestring}"; tput sgr0
-    echo
-    echo "$exampleDescription"
-    echo
-    ProbeUserRunExample
-else
-    echo "ERROR: File does not exist, could not run test"
-fi
-
-echo -n "[ENTER] return to menu or (q)uit ? "
-read answer
-
-if [ "$answer" != "${answer#[Qq]}" ]; then
-    loopOK=0
-else
-    loopOK=1
-fi
+    #EXAMPLEFILE=$(cd $ExampleDir; nnn -c -o -p '-')
+    EXAMPLEFILE=$(cd $ExampleDir; nnn -c -o -p '-')
+
+    echo "selected : $EXAMPLEFILE in $ExampleDir"
+    if [ -f "$EXAMPLEFILE" ]; then
+        ExampleDir="$(dirname "$EXAMPLEFILE")"
+        source $EXAMPLEFILE
+
+        clear
+        tput bold; echo "Example ${examplestring}"; tput sgr0
+        echo
+        echo "$exampleDescription"
+        echo
+        ProbeUserRunExample
+    else
+        echo "ERROR: File does not exist, could not run test"
+    fi
+
+    echo -n "[ENTER] return to menu or (q)uit ? "
+    read answer
+
+    if [ "$answer" != "${answer#[Qq]}" ]; then
+        loopOK=0
+    else
+        loopOK=1
+    fi
 
 
 done
diff --git a/vscode_submodule_fix.sh b/vscode_submodule_fix.sh
index 1719fdde..7f3359c6 100755
--- a/vscode_submodule_fix.sh
+++ b/vscode_submodule_fix.sh
@@ -4,7 +4,7 @@ git checkout -- .gitmodules
 
 for mod in `find plugins/milk-extra-src -mindepth 1 -maxdepth 1 -type d| grep -v .git`
 do
-cat >> .gitmodules << EOF
+    cat >> .gitmodules << EOF
 [submodule "${mod}"]
 	path = ${mod}
 	url = ""
@@ -12,7 +12,7 @@ EOF
 done
 
 if [ -d "plugins/cacao-src" ]; then
-cat >> .gitmodules << EOF
+    cat >> .gitmodules << EOF
 [submodule "cacao"]
 	path = plugins/cacao-src
 	url = ""
@@ -20,7 +20,7 @@ EOF
 fi
 
 if [ -d "plugins/coffee-src" ]; then
-cat >> .gitmodules << EOF
+    cat >> .gitmodules << EOF
 [submodule "coffee"]
 	path = plugins/coffee-src
 	url = ""