Marke unbroken
Small Code Cleanups