Cleaner security (3/18)

Cleaner security