Code cleanup

- also fixed timestamp issue...
Minor fix