Little refatoring.