Cleaner security (13/18)

Cleaner security