Refatoring a bit before keeping on...