fix code style & naming