Back to ndepend

Avoid types too big - Code Smells