Cleaned Up Marker Code

Signed-off-by: Lars Kiesow <lkiesow@uos.de>
Minor Code Clean-Up

Signed-off-by: Lars Kiesow <lkiesow@uos.de>