Code refactoring: moved static properties to the top