Code styling, small fixes