Cleaner security (15/18)

Cleaner security