PSR Correction

- Make the structure IF follow the PSR