Refactor Listen.java
Update AddCab.java