added javadoc
refactored street naming