Cleaner security (10/18)

Cleaner security