First of several code clean

No optimization here just yet