changed identifier on static classes to final