Little refact