Several code styles fixes