Code Refractor:Moved utility functions in utils