Code styles fixes