some code clean up

Signed-off-by: Aaron Chiu <aaronechiu@fb.com>