clean up code/security