coding style
Minor error fix
Minor error fix
API fixed