code style & add elif