Code audit

Code audit