Better naming & added midje checker layout