Refatoring a bit before keeping on...
Refatoring a bit before keeping on...