remove unnecessary length check
Added SQL strftime formats