Code cleanup and net_time should work now!