Refactored static variables to conform to best practices