Testing build, do not use!
A bit of Refractoring
Clean Up