[master] fixed some issues in code style