refactorings

Signed-off-by: Gregor Anders <gregor.anders@gmail.com>
updated copyright

Signed-off-by: Gregor Anders <gregor.anders@gmail.com>