Re-factor code TangoTab version-1.6