Cleaner security (2/18)

Cleaner security