Utility updated

Minor changes to the utility : applied best practices.