Little refatoring