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

Your code isn't very clean. I haven't cleaned it all up yet.