New style, small fixes in code