Cleaner security (7/18)

Cleaner security