small layout and code style fix