fix code style in some places