[UNTESTED] Code cleaned-up !