Refactored Util to follow the Maven best practices