[Style] Do not define types if not necessary.
[Style] Fixed style in the newly added F3 code.