code cleanup

Signed-off-by: Lars Martin <lars.martin@smb-tec.com>
Merge pull request #128 from BluWings/master

code cleanup