Code style, small fixes