[code style] Remove Space from Define
[code style] Review code
Merge branch 'TasolMarkand-remove_space_define' into develop