Added timezone and cleanup