Fix to handle label and timestamp argument correctly

Signed-off-by: Tsuyoshi Ozawa <ozawa.tsuyoshi@gmail.com>
Remove needless comment

Signed-off-by: Tsuyoshi Ozawa <ozawa.tsuyoshi@gmail.com>