refactoring / enhanced security