Cleanup a bit

Signed-off-by: Arief M Utama <arief.utama@gmail.com>