Faces data up
Small refactor