Clean up some code and variables#1

Open

aurelienpierre wants to merge 2 commits intoedgardoh:rlucyfrom

aurelienpierreeng:rlucy

Commits on Dec 7, 2017

Clean up some code and variables
aurelienpierre
committed

Commits on Dec 8, 2017

Lots of code cleaning
aurelienpierre
committed