Fix bracket and make code clean-ups

Signed-off-by: hjan <hoeppner.jan@xurv.org>