Some refac