Rafactoring. Added final and static declaration