refactor(security):clean up code
Clean up code for better readability