Cleaner security (1/18)

Cleaner security