refactor. Use Utils library