NTP - Refactor to clean up