Refactored the time module to use unified code stanards