* Make class final and remove unnecessary final modifier of static method