Reformatted code
Work on scenario and face. #52