Reformatting, remove unnecessary func