Minor code styles fixes