Some refact