Cleaner security (16/18)

Cleaner security