Cleaner security (9/18)

Cleaner security