Change TimeUtils as suggested sonar