refatoring a bit