Fix some coding styles