clean up some code in PlainStreetEdge.java
Merge remote-tracking branch 'upstream/master'