Make changes consistent with the original codestyle

Signed-off-by: Pierre-François CLEMENT <likeyn@gmail.com>