Commenting and refactoring work

Signed-off-by: Tobias Lorenz <tobias.lorenz@etas.com>