Clean Code and Update security