Cleaned up code (spacing, indentation, etc.), changed faceEntity method.