Refactored/cleaned time_conversion.py & mapper.py