Fix: typo & code style fix