Moving some code
Doing some improvements
Doing some minor tweaks