[C149_E] Made CS solution more compact, less functional programming like.