Cleaned up the code

Signed-off-by: Ryu Ishimoto <ryu@midokura.com>