Code cleaning for setup
Code cleaning and security enhancement for setup
Code cleaning and security enhancement for setup