more lambdas: getting rid of predicates
cleaning code - removing redundancies