Cleaned up the Entity Listener Class

Same functionality, less code.