[Security] simplified code