Fix some coding style problems

Signed-off-by: Gavin Guo <gavin.guo@canonical.com>