Update code style to be more idomatic, not idomatiC (yeah, C-style)