Refactor to securing coding standards.