Refactoring: Add final modifier to util clasess