Few minor changes and update to code style

Signed-off-by: Pier-Luc Plante <pier-luc.plante.1@ulaval.ca>