-- clean code and add security