Checkout
John Bokma
committed
on 16 May
Cleaned code a bit more.

Related to Issue [MWDAM-2219]