Cleaner security (14/18)

Cleaner security